diff -Nru linux-restricted-signatures-oem-6.5-6.5.0/debian/changelog linux-restricted-signatures-oem-6.5-6.5.0/debian/changelog
--- linux-restricted-signatures-oem-6.5-6.5.0/debian/changelog	2024-04-15 20:09:49.000000000 +0000
+++ linux-restricted-signatures-oem-6.5-6.5.0/debian/changelog	2024-04-17 11:57:14.000000000 +0000
@@ -1,30 +1,25 @@
-linux-restricted-signatures-oem-6.5 (6.5.0-1019.20+5) jammy; urgency=medium
+linux-restricted-signatures-oem-6.5 (6.5.0-1020.21+2) jammy; urgency=medium
 
   * Packaging resync (LP: #1786013)
-    - debian/dkms-versions -- update from kernel-versions (adhoc/2024.03.04)
+    - debian/dkms-versions -- update from kernel-versions (adhoc/s2024.03.04)
 
- -- Andy Whitcroft <apw@canonical.com>  Mon, 15 Apr 2024 21:09:49 +0100
+ -- Andy Whitcroft <apw@canonical.com>  Wed, 17 Apr 2024 12:57:14 +0100
 
-linux-restricted-signatures-oem-6.5 (6.5.0-1019.20+4) jammy; urgency=medium
+linux-restricted-signatures-oem-6.5 (6.5.0-1020.21+1) jammy; urgency=medium
 
   * Packaging resync (LP: #1786013)
-    - debian/dkms-versions -- update from kernel-versions (adhoc/2024.03.04)
+    - debian/dkms-versions -- update from kernel-versions (adhoc/s2024.03.04)
 
- -- Timo Aaltonen <timo.aaltonen@canonical.com>  Thu, 11 Apr 2024 09:57:33 +0300
+ -- Andy Whitcroft <apw@canonical.com>  Mon, 15 Apr 2024 03:53:36 +0100
 
-linux-restricted-signatures-oem-6.5 (6.5.0-1019.20+3) jammy; urgency=medium
+linux-restricted-signatures-oem-6.5 (6.5.0-1020.21) jammy; urgency=medium
 
-  * Packaging resync (LP: #1786013)
-    - debian/dkms-versions -- update from kernel-versions (adhoc/2024.03.04)
-
- -- Timo Aaltonen <timo.aaltonen@canonical.com>  Tue, 09 Apr 2024 22:14:03 +0300
-
-linux-restricted-signatures-oem-6.5 (6.5.0-1019.20+2) jammy; urgency=medium
+  * Main version: 6.5.0-1020.21
 
-  * Packaging resync (LP: #1786013)
-    - debian/dkms-versions -- update from kernel-versions (adhoc/2024.03.04)
+  * Miscellaneous Ubuntu changes
+    - debian/tracking-bug -- update from main
 
- -- Timo Aaltonen <timo.aaltonen@canonical.com>  Tue, 09 Apr 2024 13:34:12 +0300
+ -- Timo Aaltonen <timo.aaltonen@canonical.com>  Wed, 03 Apr 2024 16:19:37 +0300
 
 linux-restricted-signatures-oem-6.5 (6.5.0-1019.20+1) jammy; urgency=medium
 
@@ -36,3 +31,20 @@
 
  -- Timo Aaltonen <timo.aaltonen@canonical.com>  Wed, 27 Mar 2024 10:40:44 +0200
 
+linux-restricted-signatures-oem-6.5 (6.5.0-1019.20) jammy; urgency=medium
+
+  * Main version: 6.5.0-1019.20
+
+  * Packaging resync (LP: #1786013)
+    - [Packaging] remove update-version script
+    - [Packaging] remove update-dkms-versions script
+    - debian/dkms-versions -- update from kernel-versions (main/2024.03.04)
+
+  * Migrate oem-6.1 to oem-6.5 (LP: #2048077)
+    - [Packaging] Migrate oem-22.04a/b/c to oem-22.04d.
+
+  * Miscellaneous Ubuntu changes
+    - debian/tracking-bug -- update from main
+
+ -- Timo Aaltonen <timo.aaltonen@canonical.com>  Mon, 18 Mar 2024 17:59:30 +0200
+
diff -Nru linux-restricted-signatures-oem-6.5-6.5.0/debian/control linux-restricted-signatures-oem-6.5-6.5.0/debian/control
--- linux-restricted-signatures-oem-6.5-6.5.0/debian/control	2024-04-15 20:09:49.000000000 +0000
+++ linux-restricted-signatures-oem-6.5-6.5.0/debian/control	2024-04-17 11:57:14.000000000 +0000
@@ -9,10 +9,10 @@
  curl,
  dkms,
  gawk,
- linux-restricted-generate-oem-6.5 (= 6.5.0-1019.20+5),
- linux-objects-nvidia-535-open-6.5.0-1019-oem (>= 6.5.0-1019.20+5) [amd64 ],
- linux-objects-nvidia-545-open-6.5.0-1019-oem (>= 6.5.0-1019.20+5) [amd64 ],
- linux-objects-nvidia-550-open-6.5.0-1019-oem (>= 6.5.0-1019.20+5) [amd64 ],
+ linux-restricted-generate-oem-6.5 (= 6.5.0-1020.21+2),
+ linux-objects-nvidia-535-open-6.5.0-1020-oem (>= 6.5.0-1020.21+2) [amd64 ],
+ linux-objects-nvidia-545-open-6.5.0-1020-oem (>= 6.5.0-1020.21+2) [amd64 ],
+ linux-objects-nvidia-550-open-6.5.0-1020-oem (>= 6.5.0-1020.21+2) [amd64 ],
  lsb-release,
  python3,
  python3-apt,
@@ -21,20 +21,20 @@
 Standards-Version: 3.9.4
 Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux-restricted-modules-oem/+git/jammy oem-6.5
 
-Package: linux-signatures-nvidia-6.5.0-1019-oem
+Package: linux-signatures-nvidia-6.5.0-1020-oem
 Build-Profiles: <!stage1>
 Architecture: amd64
 Section: kernel
 Priority: optional
-Depends: linux-image-6.5.0-1019-oem | linux-image-unsigned-6.5.0-1019-oem,
+Depends: linux-image-6.5.0-1020-oem | linux-image-unsigned-6.5.0-1020-oem,
 Built-Using: ${linux:BuiltUsing}
-Description: Linux kernel signatures for nvidia modules for version 6.5.0-1019-oem
+Description: Linux kernel signatures for nvidia modules for version 6.5.0-1020-oem
  This package contains the Linux kernel signatures nvidia modules for
- version 6.5.0-1019-oem.
+ version 6.5.0-1020-oem.
  .
  You likely do not want to install this package directly.
 
-Package: linux-modules-nvidia-535-open-6.5.0-1019-oem
+Package: linux-modules-nvidia-535-open-6.5.0-1020-oem
 Build-Profiles: <!stage1>
 Architecture: amd64 
 Section: kernel
@@ -43,18 +43,18 @@
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
- linux-image-6.5.0-1019-oem | linux-image-unsigned-6.5.0-1019-oem,
+ linux-image-6.5.0-1020-oem | linux-image-unsigned-6.5.0-1020-oem,
  ${nvk:nvidia-535-open},
-Description: Linux kernel nvidia modules for version 6.5.0-1019
+Description: Linux kernel nvidia modules for version 6.5.0-1020
  This package pulls together the Linux kernel nvidia modules for
- version 6.5.0-1019 with the appropriate signatures.
+ version 6.5.0-1020 with the appropriate signatures.
  .
  You likely do not want to install this package directly. Instead, install the
  one of the linux-modules-nvidia-535-open-oem* meta-packages,
  which will ensure that upgrades work correctly, and that supporting packages are
  also installed.
 
-Package: linux-modules-nvidia-545-open-6.5.0-1019-oem
+Package: linux-modules-nvidia-545-open-6.5.0-1020-oem
 Build-Profiles: <!stage1>
 Architecture: amd64 
 Section: kernel
@@ -63,18 +63,18 @@
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
- linux-image-6.5.0-1019-oem | linux-image-unsigned-6.5.0-1019-oem,
+ linux-image-6.5.0-1020-oem | linux-image-unsigned-6.5.0-1020-oem,
  ${nvk:nvidia-545-open},
-Description: Linux kernel nvidia modules for version 6.5.0-1019
+Description: Linux kernel nvidia modules for version 6.5.0-1020
  This package pulls together the Linux kernel nvidia modules for
- version 6.5.0-1019 with the appropriate signatures.
+ version 6.5.0-1020 with the appropriate signatures.
  .
  You likely do not want to install this package directly. Instead, install the
  one of the linux-modules-nvidia-545-open-oem* meta-packages,
  which will ensure that upgrades work correctly, and that supporting packages are
  also installed.
 
-Package: linux-modules-nvidia-550-open-6.5.0-1019-oem
+Package: linux-modules-nvidia-550-open-6.5.0-1020-oem
 Build-Profiles: <!stage1>
 Architecture: amd64 
 Section: kernel
@@ -83,11 +83,11 @@
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
- linux-image-6.5.0-1019-oem | linux-image-unsigned-6.5.0-1019-oem,
+ linux-image-6.5.0-1020-oem | linux-image-unsigned-6.5.0-1020-oem,
  ${nvk:nvidia-550-open},
-Description: Linux kernel nvidia modules for version 6.5.0-1019
+Description: Linux kernel nvidia modules for version 6.5.0-1020
  This package pulls together the Linux kernel nvidia modules for
- version 6.5.0-1019 with the appropriate signatures.
+ version 6.5.0-1020 with the appropriate signatures.
  .
  You likely do not want to install this package directly. Instead, install the
  one of the linux-modules-nvidia-550-open-oem* meta-packages,
diff -Nru linux-restricted-signatures-oem-6.5-6.5.0/debian/dkms-versions linux-restricted-signatures-oem-6.5-6.5.0/debian/dkms-versions
--- linux-restricted-signatures-oem-6.5-6.5.0/debian/dkms-versions	2024-04-15 20:09:49.000000000 +0000
+++ linux-restricted-signatures-oem-6.5-6.5.0/debian/dkms-versions	2024-04-17 11:57:14.000000000 +0000
@@ -3,10 +3,10 @@
 nvidia-graphics-drivers-535 535.171.04-0ubuntu0.22.04.1 arch=amd64 arch=arm64 variant=open transition=nvidia-graphics-drivers-530-open transition=nvidia-graphics-drivers-525-open
 nvidia-graphics-drivers-545 545.29.06-0ubuntu0.22.04.2 arch=amd64 arch=arm64
 nvidia-graphics-drivers-545 545.29.06-0ubuntu0.22.04.2 arch=amd64 arch=arm64 variant=open
-nvidia-graphics-drivers-550 550.67-0ubuntu1.22.04.1 arch=amd64 arch=arm64
-nvidia-graphics-drivers-550 550.67-0ubuntu1.22.04.1 arch=amd64 arch=arm64 variant=open
+nvidia-graphics-drivers-550 550.67-0ubuntu1.22.04.2 arch=amd64 arch=arm64
+nvidia-graphics-drivers-550 550.67-0ubuntu1.22.04.2 arch=amd64 arch=arm64 variant=open
 nvidia-graphics-drivers-470-server 470.239.06-0ubuntu0.22.04.1 arch=amd64 transition=nvidia-graphics-drivers-460-server
 nvidia-graphics-drivers-535-server 535.161.08-0ubuntu2.22.04.1 arch=amd64 arch=arm64 transition=nvidia-graphics-drivers-525-server transition=nvidia-graphics-drivers-515-server transition=nvidia-graphics-drivers-510-server
 nvidia-graphics-drivers-535-server 535.161.08-0ubuntu2.22.04.1 arch=amd64 arch=arm64 variant=open
-nvidia-graphics-drivers-550-server 550.54.15-0ubuntu0.22.04.1 arch=amd64 arch=arm64
-nvidia-graphics-drivers-550-server 550.54.15-0ubuntu0.22.04.1 arch=amd64 arch=arm64 variant=open
+nvidia-graphics-drivers-550-server 550.54.15-0ubuntu0.22.04.2 arch=amd64 arch=arm64
+nvidia-graphics-drivers-550-server 550.54.15-0ubuntu0.22.04.2 arch=amd64 arch=arm64 variant=open