diff -Nru linux-restricted-signatures-azure-5.4.0/debian/changelog linux-restricted-signatures-azure-5.4.0/debian/changelog
--- linux-restricted-signatures-azure-5.4.0/debian/changelog	2023-06-29 21:33:47.000000000 +0000
+++ linux-restricted-signatures-azure-5.4.0/debian/changelog	2023-07-03 15:05:56.000000000 +0000
@@ -1,48 +1,35 @@
-linux-restricted-signatures-azure (5.4.0-1111.117+2) focal; urgency=medium
+linux-restricted-signatures-azure (5.4.0-1111.117+6) focal; urgency=medium
 
   * Packaging resync (LP: #1786013)
     - debian/dkms-versions -- update from kernel-versions (adhoc/s2023.05.15)
 
- -- Andy Whitcroft <apw@canonical.com>  Thu, 29 Jun 2023 22:33:47 +0100
-
-linux-restricted-signatures-azure (5.4.0-1111.117+1) focal; urgency=medium
+ -- Andy Whitcroft <apw@canonical.com>  Mon, 03 Jul 2023 16:05:56 +0100
 
-  * Packaging resync (LP: #1786013)
-    - debian/dkms-versions -- update from kernel-versions (adhoc/s2023.05.15)
+linux-restricted-signatures-azure (5.4.0-1111.117+5) focal; urgency=medium
 
- -- Andy Whitcroft <apw@canonical.com>  Wed, 28 Jun 2023 21:37:36 +0100
+  * standardise ancillary naming to simplify backporting (LP: #2019299)
+    - [Packaging] convert to v7.6 autogen form
 
-linux-restricted-signatures-azure (5.4.0-1111.117) focal; urgency=medium
+ -- Andy Whitcroft <apw@canonical.com>  Mon, 03 Jul 2023 07:18:31 +0100
 
-  * Master version: 5.4.0-1111.117
+linux-restricted-signatures-azure (5.4.0-1111.117+4) focal; urgency=medium
 
   * standardise ancillary naming to simplify backporting (LP: #2019299)
-    - [Packaging] convert to v7.4 autogen form
-
-  * Miscellaneous Ubuntu changes
-    - debian/tracking-bug -- update from master
-
- -- Tim Gardner <tim.gardner@canonical.com>  Wed, 21 Jun 2023 08:11:50 -0600
+    - [Packaging] convert to v7.5 autogen form
 
-linux-restricted-signatures-azure (5.4.0-1110.116) focal; urgency=medium
+ -- Andy Whitcroft <apw@canonical.com>  Sun, 02 Jul 2023 22:53:23 +0100
 
-  * Master version: 5.4.0-1110.116
+linux-restricted-signatures-azure (5.4.0-1111.117+3) focal; urgency=medium
 
   * Packaging resync (LP: #1786013)
-    - [Packaging] resync git-ubuntu-log
-    - debian/dkms-versions -- update from kernel-versions (main/2023.05.15)
-
-  * Miscellaneous Ubuntu changes
-    - debian/tracking-bug -- update from master
-
- -- Tim Gardner <tim.gardner@canonical.com>  Fri, 02 Jun 2023 12:52:33 -0600
+    - debian/dkms-versions -- update from kernel-versions (adhoc/s2023.05.15)
 
-linux-restricted-signatures-azure (5.4.0-1109.115) focal; urgency=medium
+ -- Andy Whitcroft <apw@canonical.com>  Fri, 30 Jun 2023 23:35:51 +0100
 
-  * Master version: 5.4.0-1109.115
+linux-restricted-signatures-azure (5.4.0-1111.117+2) focal; urgency=medium
 
-  * Miscellaneous Ubuntu changes
-    - debian/tracking-bug -- update from master
+  * Packaging resync (LP: #1786013)
+    - debian/dkms-versions -- update from kernel-versions (adhoc/s2023.05.15)
 
- -- Tim Gardner <tim.gardner@canonical.com>  Mon, 22 May 2023 11:39:10 -0600
+ -- Andy Whitcroft <apw@canonical.com>  Thu, 29 Jun 2023 22:33:47 +0100
 
diff -Nru linux-restricted-signatures-azure-5.4.0/debian/control linux-restricted-signatures-azure-5.4.0/debian/control
--- linux-restricted-signatures-azure-5.4.0/debian/control	2023-06-29 21:33:47.000000000 +0000
+++ linux-restricted-signatures-azure-5.4.0/debian/control	2023-07-03 15:05:56.000000000 +0000
@@ -9,9 +9,9 @@
  curl,
  dkms,
  gawk,
- linux-restricted-generate-azure (= 5.4.0-1111.117+2),
- linux-objects-nvidia-525-open-5.4.0-1111-azure (>= 5.4.0-1111.117+2) [amd64 ],
- linux-objects-nvidia-535-open-5.4.0-1111-azure (>= 5.4.0-1111.117+2) [amd64 ],
+ linux-restricted-generate-azure (= 5.4.0-1111.117+6),
+ linux-objects-nvidia-525-open-5.4.0-1111-azure (>= 5.4.0-1111.117+6) [amd64 ],
+ linux-objects-nvidia-535-open-5.4.0-1111-azure (>= 5.4.0-1111.117+6) [amd64 ],
  lsb-release,
  python3,
  python3-apt,
diff -Nru linux-restricted-signatures-azure-5.4.0/debian/dkms-versions linux-restricted-signatures-azure-5.4.0/debian/dkms-versions
--- linux-restricted-signatures-azure-5.4.0/debian/dkms-versions	2023-06-29 21:33:47.000000000 +0000
+++ linux-restricted-signatures-azure-5.4.0/debian/dkms-versions	2023-07-03 15:05:56.000000000 +0000
@@ -1,10 +1,12 @@
 nvidia-graphics-drivers-390 390.157-0ubuntu0.20.04.1 arch=amd64
 nvidia-graphics-drivers-470 470.199.02-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-465 transition=nvidia-graphics-drivers-460 transition=nvidia-graphics-drivers-455 transition=nvidia-graphics-drivers-450 transition=nvidia-graphics-drivers-440 transition=nvidia-graphics-drivers-435
-nvidia-graphics-drivers-525 525.125.06-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-520 transition=nvidia-graphics-drivers-515 transition=nvidia-graphics-drivers-510 transition=nvidia-graphics-drivers-495
-nvidia-graphics-drivers-535 535.54.03-0ubuntu0.20.04.3 arch=amd64 transition=nvidia-graphics-drivers-530
-nvidia-graphics-drivers-525 525.125.06-0ubuntu0.20.04.1 arch=amd64 variant=open
-nvidia-graphics-drivers-535 535.54.03-0ubuntu0.20.04.3 arch=amd64 variant=open transition=nvidia-graphics-drivers-530-open
+nvidia-graphics-drivers-525 525.125.06-0ubuntu0.20.04.3 arch=amd64 transition=nvidia-graphics-drivers-520 transition=nvidia-graphics-drivers-515 transition=nvidia-graphics-drivers-510 transition=nvidia-graphics-drivers-495
+nvidia-graphics-drivers-525 525.125.06-0ubuntu0.20.04.3 arch=amd64 variant=open
+nvidia-graphics-drivers-535 535.54.03-0ubuntu0.20.04.4 arch=amd64 transition=nvidia-graphics-drivers-530
+nvidia-graphics-drivers-535 535.54.03-0ubuntu0.20.04.4 arch=amd64 variant=open transition=nvidia-graphics-drivers-530-open
 nvidia-graphics-drivers-418-server 418.226.00-0ubuntu0.20.04.2 arch=amd64
 nvidia-graphics-drivers-450-server 450.248.02-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-440-server
 nvidia-graphics-drivers-470-server 470.199.02-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-460-server
-nvidia-graphics-drivers-525-server 525.125.06-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-515-server transition=nvidia-graphics-drivers-510-server
+nvidia-graphics-drivers-525-server 525.125.06-0ubuntu0.20.04.2 arch=amd64 transition=nvidia-graphics-drivers-515-server transition=nvidia-graphics-drivers-510-server
+nvidia-graphics-drivers-535-server 535.54.03-0ubuntu0.20.04.1 arch=amd64
+nvidia-graphics-drivers-535-server 535.54.03-0ubuntu0.20.04.1 arch=amd64 variant=open
diff -Nru linux-restricted-signatures-azure-5.4.0/debian/scripts/generate-rules linux-restricted-signatures-azure-5.4.0/debian/scripts/generate-rules
--- linux-restricted-signatures-azure-5.4.0/debian/scripts/generate-rules	2023-06-28 20:37:36.000000000 +0000
+++ linux-restricted-signatures-azure-5.4.0/debian/scripts/generate-rules	2023-07-03 06:11:45.000000000 +0000
@@ -205,8 +205,8 @@
 	install -d debian/linux-modules-nvidia-${suffix_minus}-\$(src_abi)-${flavour}
 	install -d debian/linux-modules-nvidia-${suffix_minus}-\$(src_abi)-${flavour}/usr/lib/linux/triggers
 	\$(call install_control,linux-modules-nvidia-${suffix_minus}-\$(src_abi)-${flavour},${flavour},open,${suffix_short},postinst postrm); \\
-	stream="${src_genr_version}/${src_abi}-${flavour}/open/nvidia-${suffix_minus}"; \\
-	nvidia=\$\$(basename "\$\$stream"); \\
+	stream="${src_genr_version}/${src_abi}-${flavour}/open/nvidia-${suffix_short}"; \\
+	nvidia="nvidia-${suffix_short}"; \\
 	install -d debian/linux-modules-nvidia-${suffix_minus}-\$(src_abi)-${flavour}/lib/modules/kernel/\$\$nvidia; \\
 	for sig in \$\$stream/*.ko.sig; \\
 	do \\