diff -Nru linux-signed-azure-6.5-6.5.0/debian/ancillary/linux-generate/debian/changelog linux-signed-azure-6.5-6.5.0/debian/ancillary/linux-generate/debian/changelog
--- linux-signed-azure-6.5-6.5.0/debian/ancillary/linux-generate/debian/changelog	2024-04-03 02:10:45.000000000 +0000
+++ linux-signed-azure-6.5-6.5.0/debian/ancillary/linux-generate/debian/changelog	2024-04-30 15:15:20.000000000 +0000
@@ -1,3 +1,21 @@
+linux-generate-azure-6.5 (6.5.0-1021.22~22.04.1) jammy; urgency=medium
+
+  * Main version: 6.5.0-1021.22~22.04.1
+
+  * Packaging resync (LP: #1786013)
+    - [Packaging] debian/tracking-bug -- resync from main package
+
+ -- Tim Gardner <tim.gardner@canonical.com>  Tue, 30 Apr 2024 09:15:20 -0600
+
+linux-generate-azure-6.5 (6.5.0-1020.21~22.04.1) jammy; urgency=medium
+
+  * Main version: 6.5.0-1020.21~22.04.1
+
+  * Packaging resync (LP: #1786013)
+    - [Packaging] debian/tracking-bug -- resync from main package
+
+ -- Tim Gardner <tim.gardner@canonical.com>  Thu, 18 Apr 2024 14:14:41 -0600
+
 linux-generate-azure-6.5 (6.5.0-1019.20~22.04.1) jammy; urgency=medium
 
   * Main version: 6.5.0-1019.20~22.04.1
@@ -25,21 +43,3 @@
 
  -- Tim Gardner <tim.gardner@canonical.com>  Wed, 20 Mar 2024 10:49:15 -0600
 
-linux-generate-azure-6.5 (6.5.0-1017.17~22.04.1) jammy; urgency=medium
-
-  * Master version: 6.5.0-1017.17~22.04.1
-
-  * Miscellaneous Ubuntu changes
-    - debian/tracking-bug -- update from master
-
- -- Tim Gardner <tim.gardner@canonical.com>  Fri, 08 Mar 2024 20:37:00 -0700
-
-linux-generate-azure-6.5 (6.5.0-1016.16~22.04.1) jammy; urgency=medium
-
-  * Master version: 6.5.0-1016.16~22.04.1
-
-  * Miscellaneous Ubuntu changes
-    - debian/tracking-bug -- update from master
-
- -- Tim Gardner <tim.gardner@canonical.com>  Fri, 16 Feb 2024 07:27:20 -0700
-
diff -Nru linux-signed-azure-6.5-6.5.0/debian/ancillary/linux-generate/debian/control.common linux-signed-azure-6.5-6.5.0/debian/ancillary/linux-generate/debian/control.common
--- linux-signed-azure-6.5-6.5.0/debian/ancillary/linux-generate/debian/control.common	2024-04-03 02:10:45.000000000 +0000
+++ linux-signed-azure-6.5-6.5.0/debian/ancillary/linux-generate/debian/control.common	2024-04-30 15:15:20.000000000 +0000
@@ -8,8 +8,8 @@
  python3,
  python3-apt,
 Build-Depends-Arch:
- linux-image-unsigned-6.5.0-1019-azure (= 6.5.0-1019.20~22.04.1) [amd64 arm64],
- linux-buildinfo-6.5.0-1019-azure (= 6.5.0-1019.20~22.04.1) [amd64 arm64],
+ linux-image-unsigned-6.5.0-1021-azure (= 6.5.0-1021.22~22.04.1) [amd64 arm64],
+ linux-buildinfo-6.5.0-1021-azure (= 6.5.0-1021.22~22.04.1) [amd64 arm64],
  ubuntu-core-initramfs [amd64],
  sbsigntool [amd64 arm64],
  openssl,
diff -Nru linux-signed-azure-6.5-6.5.0/debian/ancillary/linux-generate/debian/files.json linux-signed-azure-6.5-6.5.0/debian/ancillary/linux-generate/debian/files.json
--- linux-signed-azure-6.5-6.5.0/debian/ancillary/linux-generate/debian/files.json	2024-04-03 02:10:45.000000000 +0000
+++ linux-signed-azure-6.5-6.5.0/debian/ancillary/linux-generate/debian/files.json	2024-04-30 15:15:20.000000000 +0000
@@ -3,17 +3,17 @@
     "files": [
       {
         "arch": "amd64",
-        "file": "/boot/kernel.efi-6.5.0-1019-azure",
+        "file": "/boot/kernel.efi-6.5.0-1021-azure",
         "sig_type": "efi"
       },
       {
         "arch": "amd64",
-        "file": "/boot/vmlinuz-6.5.0-1019-azure",
+        "file": "/boot/vmlinuz-6.5.0-1021-azure",
         "sig_type": "efi"
       },
       {
         "arch": "arm64",
-        "file": "/boot/vmlinuz-6.5.0-1019-azure",
+        "file": "/boot/vmlinuz-6.5.0-1021-azure",
         "sig_type": "efi"
       }
     ]
diff -Nru linux-signed-azure-6.5-6.5.0/debian/changelog linux-signed-azure-6.5-6.5.0/debian/changelog
--- linux-signed-azure-6.5-6.5.0/debian/changelog	2024-04-03 02:10:45.000000000 +0000
+++ linux-signed-azure-6.5-6.5.0/debian/changelog	2024-04-30 15:15:20.000000000 +0000
@@ -1,3 +1,21 @@
+linux-signed-azure-6.5 (6.5.0-1021.22~22.04.1) jammy; urgency=medium
+
+  * Main version: 6.5.0-1021.22~22.04.1
+
+  * Packaging resync (LP: #1786013)
+    - [Packaging] debian/tracking-bug -- resync from main package
+
+ -- Tim Gardner <tim.gardner@canonical.com>  Tue, 30 Apr 2024 09:15:20 -0600
+
+linux-signed-azure-6.5 (6.5.0-1020.21~22.04.1) jammy; urgency=medium
+
+  * Main version: 6.5.0-1020.21~22.04.1
+
+  * Packaging resync (LP: #1786013)
+    - [Packaging] debian/tracking-bug -- resync from main package
+
+ -- Tim Gardner <tim.gardner@canonical.com>  Thu, 18 Apr 2024 14:14:41 -0600
+
 linux-signed-azure-6.5 (6.5.0-1019.20~22.04.1) jammy; urgency=medium
 
   * Main version: 6.5.0-1019.20~22.04.1
diff -Nru linux-signed-azure-6.5-6.5.0/debian/control linux-signed-azure-6.5-6.5.0/debian/control
--- linux-signed-azure-6.5-6.5.0/debian/control	2024-04-03 02:10:45.000000000 +0000
+++ linux-signed-azure-6.5-6.5.0/debian/control	2024-04-30 15:15:20.000000000 +0000
@@ -8,48 +8,48 @@
  python3,
  python3-apt,
 Build-Depends-Arch:
- linux-image-unsigned-6.5.0-1019-azure (= 6.5.0-1019.20~22.04.1) [amd64 arm64],
- linux-buildinfo-6.5.0-1019-azure (= 6.5.0-1019.20~22.04.1) [amd64 arm64],
+ linux-image-unsigned-6.5.0-1021-azure (= 6.5.0-1021.22~22.04.1) [amd64 arm64],
+ linux-buildinfo-6.5.0-1021-azure (= 6.5.0-1021.22~22.04.1) [amd64 arm64],
  ubuntu-core-initramfs [amd64] <pkg.linux-generate>,
- linux-generate-azure-6.5 (= 6.5.0-1019.20~22.04.1) <!pkg.linux-generate>,
+ linux-generate-azure-6.5 (= 6.5.0-1021.22~22.04.1) <!pkg.linux-generate>,
  sbsigntool [amd64 arm64],
  openssl,
 Standards-Version: 3.9.4
 
-Package: linux-image-6.5.0-1019-azure
+Package: linux-image-6.5.0-1021-azure
 Architecture: amd64 arm64
 Depends: ${unsigned:Depends}
 Recommends: ${unsigned:Recommends}
 Suggests: ${unsigned:Suggests}
 Conflicts: ${unsigned:Conflicts}
 Provides: ${unsigned:Provides}
-Built-Using: linux-azure-6.5 (= 6.5.0-1019.20~22.04.1)
+Built-Using: linux-azure-6.5 (= 6.5.0-1021.22~22.04.1)
 Description: Signed kernel image azure
  A kernel image for azure.  This version of it is signed with
  Canonical's signing key.
 
-Package: linux-image-6.5.0-1019-azure-fde
+Package: linux-image-6.5.0-1021-azure-fde
 Architecture: amd64
 Depends: ${unsigned:Depends}
 Recommends: ${cvm:Recommends}
 Suggests: ${unsigned:Suggests}
 Conflicts: ${cvm:Conflicts}
 Provides: ${unsigned:Provides}
-Built-Using: linux-azure-6.5 (= 6.5.0-1019.20~22.04.1)
+Built-Using: linux-azure-6.5 (= 6.5.0-1021.22~22.04.1)
 Description: Signed kernel image azure for CVM
  A kernel image for azure.  This version of it is signed with
  Canonical's signing key.
 
-Package: linux-image-6.5.0-1019-azure-dbgsym
+Package: linux-image-6.5.0-1021-azure-dbgsym
 Section: devel
 Architecture: amd64 arm64
-Depends: linux-image-unsigned-6.5.0-1019-azure-dbgsym
+Depends: linux-image-unsigned-6.5.0-1021-azure-dbgsym
 Description: Signed kernel image azure
  A link to the debugging symbols for the azure signed kernel.
 
-Package: linux-image-6.5.0-1019-azure-fde-dbgsym
+Package: linux-image-6.5.0-1021-azure-fde-dbgsym
 Section: devel
 Architecture: amd64
-Depends: linux-image-unsigned-6.5.0-1019-azure-dbgsym
+Depends: linux-image-unsigned-6.5.0-1021-azure-dbgsym
 Description: Signed kernel image azure for CVM (debug)
  A link to the debugging symbols for the azure signed kernel.
diff -Nru linux-signed-azure-6.5-6.5.0/debian/tracking-bug linux-signed-azure-6.5-6.5.0/debian/tracking-bug
--- linux-signed-azure-6.5-6.5.0/debian/tracking-bug	2024-04-03 02:07:39.000000000 +0000
+++ linux-signed-azure-6.5-6.5.0/debian/tracking-bug	2024-04-30 15:10:45.000000000 +0000
@@ -1 +1 @@
-2059687 s2024.03.04-1
+2063561 s2024.04.01-1