diff -Nru linux-signed-aws-6.5-6.5.0/debian/ancillary/linux-generate/debian/changelog linux-signed-aws-6.5-6.5.0/debian/ancillary/linux-generate/debian/changelog
--- linux-signed-aws-6.5-6.5.0/debian/ancillary/linux-generate/debian/changelog	2024-03-25 18:39:08.000000000 +0000
+++ linux-signed-aws-6.5-6.5.0/debian/ancillary/linux-generate/debian/changelog	2024-04-05 16:09:15.000000000 +0000
@@ -1,3 +1,12 @@
+linux-generate-aws-6.5 (6.5.0-1018.18~22.04.1) jammy; urgency=medium
+
+  * Main version: 6.5.0-1018.18~22.04.1
+
+  * Packaging resync (LP: #1786013)
+    - [Packaging] debian/tracking-bug -- resync from main package
+
+ -- Philip Cox <philip.cox@canonical.com>  Fri, 05 Apr 2024 12:09:15 -0400
+
 linux-generate-aws-6.5 (6.5.0-1017.17~22.04.2) jammy; urgency=medium
 
   * Main version: 6.5.0-1017.17~22.04.2
@@ -34,12 +43,3 @@
 
  -- Philip Cox <philip.cox@canonical.com>  Tue, 20 Feb 2024 14:06:55 -0500
 
-linux-generate-aws-6.5 (6.5.0-1014.14~22.04.1) jammy; urgency=medium
-
-  * Master version: 6.5.0-1014.14~22.04.1
-
-  * Miscellaneous Ubuntu changes
-    - debian/tracking-bug -- update from master
-
- -- Philip Cox <philip.cox@canonical.com>  Thu, 15 Feb 2024 07:09:10 -0500
-
diff -Nru linux-signed-aws-6.5-6.5.0/debian/ancillary/linux-generate/debian/control.common linux-signed-aws-6.5-6.5.0/debian/ancillary/linux-generate/debian/control.common
--- linux-signed-aws-6.5-6.5.0/debian/ancillary/linux-generate/debian/control.common	2024-03-25 18:39:08.000000000 +0000
+++ linux-signed-aws-6.5-6.5.0/debian/ancillary/linux-generate/debian/control.common	2024-04-05 16:09:15.000000000 +0000
@@ -9,6 +9,6 @@
  python3-apt,
 Build-Depends-Arch:
  sbsigntool [amd64 arm64],
- linux-image-unsigned-6.5.0-1017-aws (= 6.5.0-1017.17~22.04.2) [amd64 arm64],
- linux-buildinfo-6.5.0-1017-aws (= 6.5.0-1017.17~22.04.2) [amd64 arm64],
+ linux-image-unsigned-6.5.0-1018-aws (= 6.5.0-1018.18~22.04.1) [amd64 arm64],
+ linux-buildinfo-6.5.0-1018-aws (= 6.5.0-1018.18~22.04.1) [amd64 arm64],
 Standards-Version: 3.9.4
diff -Nru linux-signed-aws-6.5-6.5.0/debian/ancillary/linux-generate/debian/files.json linux-signed-aws-6.5-6.5.0/debian/ancillary/linux-generate/debian/files.json
--- linux-signed-aws-6.5-6.5.0/debian/ancillary/linux-generate/debian/files.json	2024-03-25 18:39:08.000000000 +0000
+++ linux-signed-aws-6.5-6.5.0/debian/ancillary/linux-generate/debian/files.json	2024-04-05 16:09:15.000000000 +0000
@@ -3,12 +3,12 @@
     "files": [
       {
         "sig_type": "efi",
-        "file": "/boot/vmlinuz-6.5.0-1017-aws",
+        "file": "/boot/vmlinuz-6.5.0-1018-aws",
         "arch": "amd64"
       },
       {
         "sig_type": "efi",
-        "file": "/boot/vmlinuz-6.5.0-1017-aws",
+        "file": "/boot/vmlinuz-6.5.0-1018-aws",
         "arch": "arm64"
       }
     ]
diff -Nru linux-signed-aws-6.5-6.5.0/debian/changelog linux-signed-aws-6.5-6.5.0/debian/changelog
--- linux-signed-aws-6.5-6.5.0/debian/changelog	2024-03-25 18:39:08.000000000 +0000
+++ linux-signed-aws-6.5-6.5.0/debian/changelog	2024-04-05 16:09:15.000000000 +0000
@@ -1,3 +1,12 @@
+linux-signed-aws-6.5 (6.5.0-1018.18~22.04.1) jammy; urgency=medium
+
+  * Main version: 6.5.0-1018.18~22.04.1
+
+  * Packaging resync (LP: #1786013)
+    - [Packaging] debian/tracking-bug -- resync from main package
+
+ -- Philip Cox <philip.cox@canonical.com>  Fri, 05 Apr 2024 12:09:15 -0400
+
 linux-signed-aws-6.5 (6.5.0-1017.17~22.04.2) jammy; urgency=medium
 
   * Main version: 6.5.0-1017.17~22.04.2
diff -Nru linux-signed-aws-6.5-6.5.0/debian/control linux-signed-aws-6.5-6.5.0/debian/control
--- linux-signed-aws-6.5-6.5.0/debian/control	2024-03-25 18:39:08.000000000 +0000
+++ linux-signed-aws-6.5-6.5.0/debian/control	2024-04-05 16:09:15.000000000 +0000
@@ -9,26 +9,26 @@
  python3-apt,
 Build-Depends-Arch:
  sbsigntool [amd64 arm64],
- linux-image-unsigned-6.5.0-1017-aws (= 6.5.0-1017.17~22.04.2) [amd64 arm64],
- linux-buildinfo-6.5.0-1017-aws (= 6.5.0-1017.17~22.04.2) [amd64 arm64],
- linux-generate-aws-6.5 (= 6.5.0-1017.17~22.04.2),
+ linux-image-unsigned-6.5.0-1018-aws (= 6.5.0-1018.18~22.04.1) [amd64 arm64],
+ linux-buildinfo-6.5.0-1018-aws (= 6.5.0-1018.18~22.04.1) [amd64 arm64],
+ linux-generate-aws-6.5 (= 6.5.0-1018.18~22.04.1),
 Standards-Version: 3.9.4
 
-Package: linux-image-6.5.0-1017-aws
+Package: linux-image-6.5.0-1018-aws
 Architecture: amd64 arm64
 Depends: ${unsigned:Depends}
 Recommends: ${unsigned:Recommends}
 Suggests: ${unsigned:Suggests}
 Conflicts: ${unsigned:Conflicts}
 Provides: ${unsigned:Provides}
-Built-Using: linux-aws-6.5 (= 6.5.0-1017.17~22.04.2)
+Built-Using: linux-aws-6.5 (= 6.5.0-1018.18~22.04.1)
 Description: Signed kernel image aws
  A kernel image for aws.  This version of it is signed with
  Canonical's signing key.
 
-Package: linux-image-6.5.0-1017-aws-dbgsym
+Package: linux-image-6.5.0-1018-aws-dbgsym
 Section: devel
 Architecture: amd64 arm64
-Depends: linux-image-unsigned-6.5.0-1017-aws-dbgsym
+Depends: linux-image-unsigned-6.5.0-1018-aws-dbgsym
 Description: Signed kernel image aws
  A link to the debugging symbols for the aws signed kernel.
diff -Nru linux-signed-aws-6.5-6.5.0/debian/tracking-bug linux-signed-aws-6.5-6.5.0/debian/tracking-bug
--- linux-signed-aws-6.5-6.5.0/debian/tracking-bug	2024-03-25 17:49:08.000000000 +0000
+++ linux-signed-aws-6.5-6.5.0/debian/tracking-bug	2024-04-05 13:19:14.000000000 +0000
@@ -1 +1 @@
-2055563 2024.03.04-1
+2059685 s2024.03.04-1