diff -Nru linux-restricted-signatures-aws-6.5-6.5.0/debian/changelog linux-restricted-signatures-aws-6.5-6.5.0/debian/changelog
--- linux-restricted-signatures-aws-6.5-6.5.0/debian/changelog	2024-04-15 20:07:28.000000000 +0000
+++ linux-restricted-signatures-aws-6.5-6.5.0/debian/changelog	2024-04-17 11:56:30.000000000 +0000
@@ -1,16 +1,25 @@
-linux-restricted-signatures-aws-6.5 (6.5.0-1017.17~22.04.2+2) jammy; urgency=medium
+linux-restricted-signatures-aws-6.5 (6.5.0-1018.18~22.04.1+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:07:28 +0100
+ -- Andy Whitcroft <apw@canonical.com>  Wed, 17 Apr 2024 12:56:30 +0100
 
-linux-restricted-signatures-aws-6.5 (6.5.0-1017.17~22.04.2+1) jammy; urgency=medium
+linux-restricted-signatures-aws-6.5 (6.5.0-1018.18~22.04.1+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)
 
- -- Andy Whitcroft <apw@canonical.com>  Wed, 10 Apr 2024 22:58:59 +0100
+ -- Andy Whitcroft <apw@canonical.com>  Mon, 15 Apr 2024 03:52:03 +0100
+
+linux-restricted-signatures-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:34 -0400
 
 linux-restricted-signatures-aws-6.5 (6.5.0-1017.17~22.04.2) jammy; urgency=medium
 
@@ -34,15 +43,3 @@
 
  -- Philip Cox <philip.cox@canonical.com>  Thu, 21 Mar 2024 08:46:05 -0400
 
-linux-restricted-signatures-aws-6.5 (6.5.0-1016.16~22.04.1) jammy; urgency=medium
-
-  * Master version: 6.5.0-1016.16~22.04.1
-
-  * Packaging resync (LP: #1786013)
-    - debian/dkms-versions -- update from kernel-versions (main/s2024.02.05)
-
-  * Miscellaneous Ubuntu changes
-    - debian/tracking-bug -- update from master
-
- -- Philip Cox <philip.cox@canonical.com>  Wed, 13 Mar 2024 13:23:03 -0400
-
diff -Nru linux-restricted-signatures-aws-6.5-6.5.0/debian/control linux-restricted-signatures-aws-6.5-6.5.0/debian/control
--- linux-restricted-signatures-aws-6.5-6.5.0/debian/control	2024-04-15 20:07:28.000000000 +0000
+++ linux-restricted-signatures-aws-6.5-6.5.0/debian/control	2024-04-17 11:56:30.000000000 +0000
@@ -9,12 +9,12 @@
  curl,
  dkms,
  gawk,
- linux-restricted-generate-aws-6.5 (= 6.5.0-1017.17~22.04.2+2),
- linux-objects-nvidia-535-open-6.5.0-1017-aws (>= 6.5.0-1017.17~22.04.2+2) [amd64 arm64 ],
- linux-objects-nvidia-545-open-6.5.0-1017-aws (>= 6.5.0-1017.17~22.04.2+2) [amd64 arm64 ],
- linux-objects-nvidia-550-open-6.5.0-1017-aws (>= 6.5.0-1017.17~22.04.2+2) [amd64 arm64 ],
- linux-objects-nvidia-535-server-open-6.5.0-1017-aws (>= 6.5.0-1017.17~22.04.2+2) [amd64 arm64 ],
- linux-objects-nvidia-550-server-open-6.5.0-1017-aws (>= 6.5.0-1017.17~22.04.2+2) [amd64 arm64 ],
+ linux-restricted-generate-aws-6.5 (= 6.5.0-1018.18~22.04.1+2),
+ linux-objects-nvidia-535-open-6.5.0-1018-aws (>= 6.5.0-1018.18~22.04.1+2) [amd64 arm64 ],
+ linux-objects-nvidia-545-open-6.5.0-1018-aws (>= 6.5.0-1018.18~22.04.1+2) [amd64 arm64 ],
+ linux-objects-nvidia-550-open-6.5.0-1018-aws (>= 6.5.0-1018.18~22.04.1+2) [amd64 arm64 ],
+ linux-objects-nvidia-535-server-open-6.5.0-1018-aws (>= 6.5.0-1018.18~22.04.1+2) [amd64 arm64 ],
+ linux-objects-nvidia-550-server-open-6.5.0-1018-aws (>= 6.5.0-1018.18~22.04.1+2) [amd64 arm64 ],
  lsb-release,
  python3,
  python3-apt,
@@ -23,20 +23,20 @@
 Standards-Version: 3.9.4
 Vcs-Git: git://git.launchpad.net/~canonical-kernel/ubuntu/+source/linux-restricted-modules-aws/+git/jammy
 
-Package: linux-signatures-nvidia-6.5.0-1017-aws
+Package: linux-signatures-nvidia-6.5.0-1018-aws
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64
 Section: kernel
 Priority: optional
-Depends: linux-image-6.5.0-1017-aws | linux-image-unsigned-6.5.0-1017-aws,
+Depends: linux-image-6.5.0-1018-aws | linux-image-unsigned-6.5.0-1018-aws,
 Built-Using: ${linux:BuiltUsing}
-Description: Linux kernel signatures for nvidia modules for version 6.5.0-1017-aws
+Description: Linux kernel signatures for nvidia modules for version 6.5.0-1018-aws
  This package contains the Linux kernel signatures nvidia modules for
- version 6.5.0-1017-aws.
+ version 6.5.0-1018-aws.
  .
  You likely do not want to install this package directly.
 
-Package: linux-modules-nvidia-535-open-6.5.0-1017-aws
+Package: linux-modules-nvidia-535-open-6.5.0-1018-aws
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64 
 Section: kernel
@@ -45,18 +45,18 @@
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
- linux-image-6.5.0-1017-aws | linux-image-unsigned-6.5.0-1017-aws,
+ linux-image-6.5.0-1018-aws | linux-image-unsigned-6.5.0-1018-aws,
  ${nvk:nvidia-535-open},
-Description: Linux kernel nvidia modules for version 6.5.0-1017
+Description: Linux kernel nvidia modules for version 6.5.0-1018
  This package pulls together the Linux kernel nvidia modules for
- version 6.5.0-1017 with the appropriate signatures.
+ version 6.5.0-1018 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-aws* 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-1017-aws
+Package: linux-modules-nvidia-545-open-6.5.0-1018-aws
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64 
 Section: kernel
@@ -65,18 +65,18 @@
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
- linux-image-6.5.0-1017-aws | linux-image-unsigned-6.5.0-1017-aws,
+ linux-image-6.5.0-1018-aws | linux-image-unsigned-6.5.0-1018-aws,
  ${nvk:nvidia-545-open},
-Description: Linux kernel nvidia modules for version 6.5.0-1017
+Description: Linux kernel nvidia modules for version 6.5.0-1018
  This package pulls together the Linux kernel nvidia modules for
- version 6.5.0-1017 with the appropriate signatures.
+ version 6.5.0-1018 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-aws* 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-1017-aws
+Package: linux-modules-nvidia-550-open-6.5.0-1018-aws
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64 
 Section: kernel
@@ -85,18 +85,18 @@
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
- linux-image-6.5.0-1017-aws | linux-image-unsigned-6.5.0-1017-aws,
+ linux-image-6.5.0-1018-aws | linux-image-unsigned-6.5.0-1018-aws,
  ${nvk:nvidia-550-open},
-Description: Linux kernel nvidia modules for version 6.5.0-1017
+Description: Linux kernel nvidia modules for version 6.5.0-1018
  This package pulls together the Linux kernel nvidia modules for
- version 6.5.0-1017 with the appropriate signatures.
+ version 6.5.0-1018 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-aws* meta-packages,
  which will ensure that upgrades work correctly, and that supporting packages are
  also installed.
 
-Package: linux-modules-nvidia-535-server-open-6.5.0-1017-aws
+Package: linux-modules-nvidia-535-server-open-6.5.0-1018-aws
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64 
 Section: kernel
@@ -105,18 +105,18 @@
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
- linux-image-6.5.0-1017-aws | linux-image-unsigned-6.5.0-1017-aws,
+ linux-image-6.5.0-1018-aws | linux-image-unsigned-6.5.0-1018-aws,
  ${nvk:nvidia-535-server-open},
-Description: Linux kernel nvidia modules for version 6.5.0-1017
+Description: Linux kernel nvidia modules for version 6.5.0-1018
  This package pulls together the Linux kernel nvidia modules for
- version 6.5.0-1017 with the appropriate signatures.
+ version 6.5.0-1018 with the appropriate signatures.
  .
  You likely do not want to install this package directly. Instead, install the
  one of the linux-modules-nvidia-535-server-open-aws* meta-packages,
  which will ensure that upgrades work correctly, and that supporting packages are
  also installed.
 
-Package: linux-modules-nvidia-550-server-open-6.5.0-1017-aws
+Package: linux-modules-nvidia-550-server-open-6.5.0-1018-aws
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64 
 Section: kernel
@@ -125,11 +125,11 @@
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
- linux-image-6.5.0-1017-aws | linux-image-unsigned-6.5.0-1017-aws,
+ linux-image-6.5.0-1018-aws | linux-image-unsigned-6.5.0-1018-aws,
  ${nvk:nvidia-550-server-open},
-Description: Linux kernel nvidia modules for version 6.5.0-1017
+Description: Linux kernel nvidia modules for version 6.5.0-1018
  This package pulls together the Linux kernel nvidia modules for
- version 6.5.0-1017 with the appropriate signatures.
+ version 6.5.0-1018 with the appropriate signatures.
  .
  You likely do not want to install this package directly. Instead, install the
  one of the linux-modules-nvidia-550-server-open-aws* meta-packages,
diff -Nru linux-restricted-signatures-aws-6.5-6.5.0/debian/dkms-versions linux-restricted-signatures-aws-6.5-6.5.0/debian/dkms-versions
--- linux-restricted-signatures-aws-6.5-6.5.0/debian/dkms-versions	2024-04-15 20:07:28.000000000 +0000
+++ linux-restricted-signatures-aws-6.5-6.5.0/debian/dkms-versions	2024-04-17 11:56:30.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