diff -Nru linux-signed-nvidia-6.5-6.5.0/debian/ancillary/linux-generate/debian/changelog linux-signed-nvidia-6.5-6.5.0/debian/ancillary/linux-generate/debian/changelog
--- linux-signed-nvidia-6.5-6.5.0/debian/ancillary/linux-generate/debian/changelog	2024-04-09 04:20:23.000000000 +0000
+++ linux-signed-nvidia-6.5-6.5.0/debian/ancillary/linux-generate/debian/changelog	2024-04-25 22:57:31.000000000 +0000
@@ -1,3 +1,21 @@
+linux-generate-nvidia-6.5 (6.5.0-1018.18) jammy; urgency=medium
+
+  * Main version: 6.5.0-1018.18
+
+  * Packaging resync (LP: #1786013)
+    - [Packaging] debian/tracking-bug -- resync from main package
+
+ -- Ian May <ian.may@canonical.com>  Thu, 25 Apr 2024 17:57:31 -0500
+
+linux-generate-nvidia-6.5 (6.5.0-1016.16) jammy; urgency=medium
+
+  * Main version: 6.5.0-1016.16
+
+  * Packaging resync (LP: #1786013)
+    - [Packaging] debian/tracking-bug -- resync from main package
+
+ -- Ian May <ian.may@canonical.com>  Thu, 18 Apr 2024 16:10:47 -0500
+
 linux-generate-nvidia-6.5 (6.5.0-1015.15) jammy; urgency=medium
 
   * Main version: 6.5.0-1015.15
@@ -26,21 +44,3 @@
 
  -- Ian May <ian.may@canonical.com>  Thu, 15 Feb 2024 16:49:15 -0600
 
-linux-generate-nvidia-6.5 (6.5.0-1012.12) jammy; urgency=medium
-
-  * Master version: 6.5.0-1012.12
-
-  * Miscellaneous Ubuntu changes
-    - debian/tracking-bug -- update from master
-
- -- Ian May <ian.may@canonical.com>  Wed, 14 Feb 2024 14:37:25 -0600
-
-linux-generate-nvidia-6.5 (6.5.0-1011.11) jammy; urgency=medium
-
-  * Master version: 6.5.0-1011.11
-
-  * Miscellaneous Ubuntu changes
-    - debian/tracking-bug -- update from master
-
- -- Ian May <ian.may@canonical.com>  Wed, 17 Jan 2024 10:56:39 -0600
-
diff -Nru linux-signed-nvidia-6.5-6.5.0/debian/ancillary/linux-generate/debian/control.common linux-signed-nvidia-6.5-6.5.0/debian/ancillary/linux-generate/debian/control.common
--- linux-signed-nvidia-6.5-6.5.0/debian/ancillary/linux-generate/debian/control.common	2024-04-09 04:20:23.000000000 +0000
+++ linux-signed-nvidia-6.5-6.5.0/debian/ancillary/linux-generate/debian/control.common	2024-04-25 22:57:31.000000000 +0000
@@ -8,12 +8,12 @@
  python3,
  python3-apt,
 Build-Depends-Arch:
- linux-image-unsigned-6.5.0-1015-nvidia (= 6.5.0-1015.15) [amd64 arm64],
- linux-buildinfo-6.5.0-1015-nvidia (= 6.5.0-1015.15) [amd64 arm64],
- linux-image-unsigned-6.5.0-1015-nvidia-64k (= 6.5.0-1015.15) [arm64],
- linux-buildinfo-6.5.0-1015-nvidia-64k (= 6.5.0-1015.15) [arm64],
+ linux-image-unsigned-6.5.0-1018-nvidia (= 6.5.0-1018.18) [amd64 arm64],
+ linux-buildinfo-6.5.0-1018-nvidia (= 6.5.0-1018.18) [amd64 arm64],
+ linux-image-unsigned-6.5.0-1018-nvidia-64k (= 6.5.0-1018.18) [arm64],
+ linux-buildinfo-6.5.0-1018-nvidia-64k (= 6.5.0-1018.18) [arm64],
  ubuntu-core-initramfs [amd64 arm64],
- linux-modules-extra-6.5.0-1015-nvidia (= 6.5.0-1015.15) [amd64 arm64] ,
+ linux-modules-extra-6.5.0-1018-nvidia (= 6.5.0-1018.18) [amd64 arm64] ,
  sbsigntool [amd64 arm64],
  openssl,
 Standards-Version: 3.9.4
diff -Nru linux-signed-nvidia-6.5-6.5.0/debian/ancillary/linux-generate/debian/files.json linux-signed-nvidia-6.5-6.5.0/debian/ancillary/linux-generate/debian/files.json
--- linux-signed-nvidia-6.5-6.5.0/debian/ancillary/linux-generate/debian/files.json	2024-04-09 04:20:23.000000000 +0000
+++ linux-signed-nvidia-6.5-6.5.0/debian/ancillary/linux-generate/debian/files.json	2024-04-25 22:57:31.000000000 +0000
@@ -3,32 +3,32 @@
     "files": [
       {
         "arch": "amd64",
-        "file": "/boot/kernel.efi-6.5.0-1015-nvidia",
+        "file": "/boot/kernel.efi-6.5.0-1018-nvidia",
         "sig_type": "efi"
       },
       {
         "arch": "amd64",
-        "file": "/boot/vmlinuz-6.5.0-1015-nvidia",
+        "file": "/boot/vmlinuz-6.5.0-1018-nvidia",
         "sig_type": "efi"
       },
       {
         "arch": "arm64",
-        "file": "/boot/kernel.efi-6.5.0-1015-nvidia",
+        "file": "/boot/kernel.efi-6.5.0-1018-nvidia",
         "sig_type": "efi"
       },
       {
         "arch": "arm64",
-        "file": "/boot/vmlinuz-6.5.0-1015-nvidia",
+        "file": "/boot/vmlinuz-6.5.0-1018-nvidia",
         "sig_type": "efi"
       },
       {
         "arch": "arm64",
-        "file": "/boot/kernel.efi-6.5.0-1015-nvidia-64k",
+        "file": "/boot/kernel.efi-6.5.0-1018-nvidia-64k",
         "sig_type": "efi"
       },
       {
         "arch": "arm64",
-        "file": "/boot/vmlinuz-6.5.0-1015-nvidia-64k",
+        "file": "/boot/vmlinuz-6.5.0-1018-nvidia-64k",
         "sig_type": "efi"
       }
     ]
diff -Nru linux-signed-nvidia-6.5-6.5.0/debian/changelog linux-signed-nvidia-6.5-6.5.0/debian/changelog
--- linux-signed-nvidia-6.5-6.5.0/debian/changelog	2024-04-09 04:20:23.000000000 +0000
+++ linux-signed-nvidia-6.5-6.5.0/debian/changelog	2024-04-25 22:57:31.000000000 +0000
@@ -1,3 +1,21 @@
+linux-signed-nvidia-6.5 (6.5.0-1018.18) jammy; urgency=medium
+
+  * Main version: 6.5.0-1018.18
+
+  * Packaging resync (LP: #1786013)
+    - [Packaging] debian/tracking-bug -- resync from main package
+
+ -- Ian May <ian.may@canonical.com>  Thu, 25 Apr 2024 17:57:31 -0500
+
+linux-signed-nvidia-6.5 (6.5.0-1016.16) jammy; urgency=medium
+
+  * Main version: 6.5.0-1016.16
+
+  * Packaging resync (LP: #1786013)
+    - [Packaging] debian/tracking-bug -- resync from main package
+
+ -- Ian May <ian.may@canonical.com>  Thu, 18 Apr 2024 16:10:47 -0500
+
 linux-signed-nvidia-6.5 (6.5.0-1015.15) jammy; urgency=medium
 
   * Main version: 6.5.0-1015.15
diff -Nru linux-signed-nvidia-6.5-6.5.0/debian/control linux-signed-nvidia-6.5-6.5.0/debian/control
--- linux-signed-nvidia-6.5-6.5.0/debian/control	2024-04-09 04:20:23.000000000 +0000
+++ linux-signed-nvidia-6.5-6.5.0/debian/control	2024-04-25 22:57:31.000000000 +0000
@@ -8,67 +8,67 @@
  python3,
  python3-apt,
 Build-Depends-Arch:
- linux-image-unsigned-6.5.0-1015-nvidia (= 6.5.0-1015.15) [amd64 arm64],
- linux-buildinfo-6.5.0-1015-nvidia (= 6.5.0-1015.15) [amd64 arm64],
- linux-image-unsigned-6.5.0-1015-nvidia-64k (= 6.5.0-1015.15) [arm64],
- linux-buildinfo-6.5.0-1015-nvidia-64k (= 6.5.0-1015.15) [arm64],
+ linux-image-unsigned-6.5.0-1018-nvidia (= 6.5.0-1018.18) [amd64 arm64],
+ linux-buildinfo-6.5.0-1018-nvidia (= 6.5.0-1018.18) [amd64 arm64],
+ linux-image-unsigned-6.5.0-1018-nvidia-64k (= 6.5.0-1018.18) [arm64],
+ linux-buildinfo-6.5.0-1018-nvidia-64k (= 6.5.0-1018.18) [arm64],
  ubuntu-core-initramfs [amd64 arm64] <pkg.linux-generate>,
- linux-generate-nvidia-6.5 (= 6.5.0-1015.15) <!pkg.linux-generate>,
- linux-modules-extra-6.5.0-1015-nvidia (= 6.5.0-1015.15) [amd64 arm64]  <pkg.linux-generate>,
+ linux-generate-nvidia-6.5 (= 6.5.0-1018.18) <!pkg.linux-generate>,
+ linux-modules-extra-6.5.0-1018-nvidia (= 6.5.0-1018.18) [amd64 arm64]  <pkg.linux-generate>,
  sbsigntool [amd64 arm64],
  openssl,
 Standards-Version: 3.9.4
 
-Package: linux-image-6.5.0-1015-nvidia
+Package: linux-image-6.5.0-1018-nvidia
 Architecture: amd64 arm64
 Depends: ${unsigned:Depends}
 Recommends: ${unsigned:Recommends}
 Suggests: ${unsigned:Suggests}
 Conflicts: ${unsigned:Conflicts}
 Provides: ${unsigned:Provides}
-Built-Using: linux-nvidia-6.5 (= 6.5.0-1015.15)
+Built-Using: linux-nvidia-6.5 (= 6.5.0-1018.18)
 Description: Signed kernel image nvidia
  A kernel image for nvidia.  This version of it is signed with
  Canonical's signing key.
 
-Package: linux-image-6.5.0-1015-nvidia-64k
+Package: linux-image-6.5.0-1018-nvidia-64k
 Architecture: arm64
 Depends: ${unsigned:Depends}
 Recommends: ${unsigned:Recommends}
 Suggests: ${unsigned:Suggests}
 Conflicts: ${unsigned:Conflicts}
 Provides: ${unsigned:Provides}
-Built-Using: linux-nvidia-6.5 (= 6.5.0-1015.15)
+Built-Using: linux-nvidia-6.5 (= 6.5.0-1018.18)
 Description: Signed kernel image nvidia-64k
  A kernel image for nvidia-64k.  This version of it is signed with
  Canonical's signing key.
 
-Package: linux-image-uc-6.5.0-1015-nvidia
+Package: linux-image-uc-6.5.0-1018-nvidia
 Architecture: amd64 arm64
-Depends: linux-modules-6.5.0-1015-nvidia, linux-modules-extra-6.5.0-1015-nvidia [amd64 arm64]
-Built-Using: linux-nvidia-6.5 (= 6.5.0-1015.15)
+Depends: linux-modules-6.5.0-1018-nvidia, linux-modules-extra-6.5.0-1018-nvidia [amd64 arm64]
+Built-Using: linux-nvidia-6.5 (= 6.5.0-1018.18)
 Description: Signed kernel image nvidia for Ubuntu Core
  A kernel image for nvidia.  This version of it is signed with
  Canonical's signing key.
 
-Package: linux-image-uc-6.5.0-1015-nvidia-64k
+Package: linux-image-uc-6.5.0-1018-nvidia-64k
 Architecture: arm64
-Depends: linux-modules-6.5.0-1015-nvidia-64k
-Built-Using: linux-nvidia-6.5 (= 6.5.0-1015.15)
+Depends: linux-modules-6.5.0-1018-nvidia-64k
+Built-Using: linux-nvidia-6.5 (= 6.5.0-1018.18)
 Description: Signed kernel image nvidia-64k for Ubuntu Core
  A kernel image for nvidia-64k.  This version of it is signed with
  Canonical's signing key.
 
-Package: linux-image-6.5.0-1015-nvidia-dbgsym
+Package: linux-image-6.5.0-1018-nvidia-dbgsym
 Section: devel
 Architecture: amd64 arm64
-Depends: linux-image-unsigned-6.5.0-1015-nvidia-dbgsym
+Depends: linux-image-unsigned-6.5.0-1018-nvidia-dbgsym
 Description: Signed kernel image nvidia
  A link to the debugging symbols for the nvidia signed kernel.
 
-Package: linux-image-6.5.0-1015-nvidia-64k-dbgsym
+Package: linux-image-6.5.0-1018-nvidia-64k-dbgsym
 Section: devel
 Architecture: arm64
-Depends: linux-image-unsigned-6.5.0-1015-nvidia-64k-dbgsym
+Depends: linux-image-unsigned-6.5.0-1018-nvidia-64k-dbgsym
 Description: Signed kernel image nvidia-64k
  A link to the debugging symbols for the nvidia-64k signed kernel.
diff -Nru linux-signed-nvidia-6.5-6.5.0/debian/tracking-bug linux-signed-nvidia-6.5-6.5.0/debian/tracking-bug
--- linux-signed-nvidia-6.5-6.5.0/debian/tracking-bug	2024-04-09 04:17:04.000000000 +0000
+++ linux-signed-nvidia-6.5-6.5.0/debian/tracking-bug	2024-04-25 22:50:47.000000000 +0000
@@ -1 +1 @@
-2059703 s2024.03.04-1
+2063373 s2024.03.04-4