diff -Nru linux-signed-oem-6.5-6.5.0/debian/ancillary/linux-generate/debian/changelog linux-signed-oem-6.5-6.5.0/debian/ancillary/linux-generate/debian/changelog
--- linux-signed-oem-6.5-6.5.0/debian/ancillary/linux-generate/debian/changelog	2024-03-18 16:00:20.000000000 +0000
+++ linux-signed-oem-6.5-6.5.0/debian/ancillary/linux-generate/debian/changelog	2024-04-03 10:27:48.000000000 +0000
@@ -1,3 +1,15 @@
+linux-generate-oem-6.5 (6.5.0-1020.21) jammy; urgency=medium
+
+  * Main version: 6.5.0-1020.21
+
+  * Packaging resync (LP: #1786013)
+    - [Packaging] update variants
+
+  * Miscellaneous Ubuntu changes
+    - debian/tracking-bug -- update from main
+
+ -- Timo Aaltonen <timo.aaltonen@canonical.com>  Wed, 03 Apr 2024 13:27:48 +0300
+
 linux-generate-oem-6.5 (6.5.0-1019.20) jammy; urgency=medium
 
   * Main version: 6.5.0-1019.20
@@ -37,12 +49,3 @@
 
  -- Timo Aaltonen <timo.aaltonen@canonical.com>  Wed, 21 Feb 2024 13:39:24 +0200
 
-linux-generate-oem-6.5 (6.5.0-1015.16) jammy; urgency=medium
-
-  * Master version: 6.5.0-1015.16
-
-  * Miscellaneous Ubuntu changes
-    - debian/tracking-bug -- update from master
-
- -- Timo Aaltonen <timo.aaltonen@canonical.com>  Tue, 13 Feb 2024 13:02:08 +0200
-
diff -Nru linux-signed-oem-6.5-6.5.0/debian/ancillary/linux-generate/debian/control.common linux-signed-oem-6.5-6.5.0/debian/ancillary/linux-generate/debian/control.common
--- linux-signed-oem-6.5-6.5.0/debian/ancillary/linux-generate/debian/control.common	2024-03-18 16:00:20.000000000 +0000
+++ linux-signed-oem-6.5-6.5.0/debian/ancillary/linux-generate/debian/control.common	2024-04-03 10:27:48.000000000 +0000
@@ -8,8 +8,8 @@
  python3,
  python3-apt,
 Build-Depends-Arch:
- linux-image-unsigned-6.5.0-1019-oem (= 6.5.0-1019.20) [amd64],
- linux-buildinfo-6.5.0-1019-oem (= 6.5.0-1019.20) [amd64],
+ linux-image-unsigned-6.5.0-1020-oem (= 6.5.0-1020.21) [amd64],
+ linux-buildinfo-6.5.0-1020-oem (= 6.5.0-1020.21) [amd64],
  ubuntu-core-initramfs [amd64],
  sbsigntool [amd64],
  openssl,
diff -Nru linux-signed-oem-6.5-6.5.0/debian/ancillary/linux-generate/debian/files.json linux-signed-oem-6.5-6.5.0/debian/ancillary/linux-generate/debian/files.json
--- linux-signed-oem-6.5-6.5.0/debian/ancillary/linux-generate/debian/files.json	2024-03-18 16:00:20.000000000 +0000
+++ linux-signed-oem-6.5-6.5.0/debian/ancillary/linux-generate/debian/files.json	2024-04-03 10:27:48.000000000 +0000
@@ -3,12 +3,12 @@
     "files": [
       {
         "arch": "amd64",
-        "file": "/boot/kernel.efi-6.5.0-1019-oem",
+        "file": "/boot/kernel.efi-6.5.0-1020-oem",
         "sig_type": "efi"
       },
       {
         "arch": "amd64",
-        "file": "/boot/vmlinuz-6.5.0-1019-oem",
+        "file": "/boot/vmlinuz-6.5.0-1020-oem",
         "sig_type": "efi"
       }
     ]
diff -Nru linux-signed-oem-6.5-6.5.0/debian/changelog linux-signed-oem-6.5-6.5.0/debian/changelog
--- linux-signed-oem-6.5-6.5.0/debian/changelog	2024-03-18 16:00:20.000000000 +0000
+++ linux-signed-oem-6.5-6.5.0/debian/changelog	2024-04-03 10:27:48.000000000 +0000
@@ -1,3 +1,15 @@
+linux-signed-oem-6.5 (6.5.0-1020.21) jammy; urgency=medium
+
+  * Main version: 6.5.0-1020.21
+
+  * Packaging resync (LP: #1786013)
+    - [Packaging] update variants
+
+  * Miscellaneous Ubuntu changes
+    - debian/tracking-bug -- update from main
+
+ -- Timo Aaltonen <timo.aaltonen@canonical.com>  Wed, 03 Apr 2024 13:27:48 +0300
+
 linux-signed-oem-6.5 (6.5.0-1019.20) jammy; urgency=medium
 
   * Main version: 6.5.0-1019.20
diff -Nru linux-signed-oem-6.5-6.5.0/debian/control linux-signed-oem-6.5-6.5.0/debian/control
--- linux-signed-oem-6.5-6.5.0/debian/control	2024-03-18 16:00:20.000000000 +0000
+++ linux-signed-oem-6.5-6.5.0/debian/control	2024-04-03 10:27:48.000000000 +0000
@@ -8,37 +8,37 @@
  python3,
  python3-apt,
 Build-Depends-Arch:
- linux-image-unsigned-6.5.0-1019-oem (= 6.5.0-1019.20) [amd64],
- linux-buildinfo-6.5.0-1019-oem (= 6.5.0-1019.20) [amd64],
+ linux-image-unsigned-6.5.0-1020-oem (= 6.5.0-1020.21) [amd64],
+ linux-buildinfo-6.5.0-1020-oem (= 6.5.0-1020.21) [amd64],
  ubuntu-core-initramfs [amd64] <pkg.linux-generate>,
- linux-generate-oem-6.5 (= 6.5.0-1019.20) <!pkg.linux-generate>,
+ linux-generate-oem-6.5 (= 6.5.0-1020.21) <!pkg.linux-generate>,
  sbsigntool [amd64],
  openssl,
 Standards-Version: 3.9.4
 
-Package: linux-image-6.5.0-1019-oem
+Package: linux-image-6.5.0-1020-oem
 Architecture: amd64
 Depends: ${unsigned:Depends}
 Recommends: ${unsigned:Recommends}
 Suggests: ${unsigned:Suggests}
 Conflicts: ${unsigned:Conflicts}
 Provides: ${unsigned:Provides}
-Built-Using: linux-oem-6.5 (= 6.5.0-1019.20)
+Built-Using: linux-oem-6.5 (= 6.5.0-1020.21)
 Description: Signed kernel image oem
  A kernel image for oem.  This version of it is signed with
  Canonical's signing key.
 
-Package: linux-image-uc-6.5.0-1019-oem
+Package: linux-image-uc-6.5.0-1020-oem
 Architecture: amd64
-Depends: linux-modules-6.5.0-1019-oem
-Built-Using: linux-oem-6.5 (= 6.5.0-1019.20)
+Depends: linux-modules-6.5.0-1020-oem
+Built-Using: linux-oem-6.5 (= 6.5.0-1020.21)
 Description: Signed kernel image oem for Ubuntu Core
  A kernel image for oem.  This version of it is signed with
  Canonical's signing key.
 
-Package: linux-image-6.5.0-1019-oem-dbgsym
+Package: linux-image-6.5.0-1020-oem-dbgsym
 Section: devel
 Architecture: amd64
-Depends: linux-image-unsigned-6.5.0-1019-oem-dbgsym
+Depends: linux-image-unsigned-6.5.0-1020-oem-dbgsym
 Description: Signed kernel image oem
  A link to the debugging symbols for the oem signed kernel.
diff -Nru linux-signed-oem-6.5-6.5.0/debian/tracking-bug linux-signed-oem-6.5-6.5.0/debian/tracking-bug
--- linux-signed-oem-6.5-6.5.0/debian/tracking-bug	2024-03-18 14:52:51.000000000 +0000
+++ linux-signed-oem-6.5-6.5.0/debian/tracking-bug	2024-04-03 08:15:03.000000000 +0000
@@ -1 +1 @@
-2055583 2024.03.04-1
+2059705 s2024.03.04-1
diff -Nru linux-signed-oem-6.5-6.5.0/debian/variants linux-signed-oem-6.5-6.5.0/debian/variants
--- linux-signed-oem-6.5-6.5.0/debian/variants	2024-03-18 16:00:19.000000000 +0000
+++ linux-signed-oem-6.5-6.5.0/debian/variants	2024-04-03 10:27:46.000000000 +0000
@@ -1 +1,2 @@
+-22.04
 -22.04d