diff -Nru linux-restricted-modules-aws-5.4.0/debian/changelog linux-restricted-modules-aws-5.4.0/debian/changelog
--- linux-restricted-modules-aws-5.4.0/debian/changelog	2022-06-10 13:44:26.000000000 +0000
+++ linux-restricted-modules-aws-5.4.0/debian/changelog	2022-06-24 13:23:52.000000000 +0000
@@ -1,3 +1,11 @@
+linux-restricted-modules-aws (5.4.0-1080.87+1) focal; urgency=medium
+
+  * Packaging resync (LP: #1786013)
+    - debian/dkms-versions -- update from kernel-versions (main/2022.05.30)
+    - update spin to 2022.05.30-5
+
+ -- Andy Whitcroft <apw@canonical.com>  Fri, 24 Jun 2022 14:23:52 +0100
+
 linux-restricted-modules-aws (5.4.0-1080.87) focal; urgency=medium
 
   * Master version: 5.4.0-1080.87
diff -Nru linux-restricted-modules-aws-5.4.0/debian/control linux-restricted-modules-aws-5.4.0/debian/control
--- linux-restricted-modules-aws-5.4.0/debian/control	2022-06-10 13:44:26.000000000 +0000
+++ linux-restricted-modules-aws-5.4.0/debian/control	2022-06-24 13:23:52.000000000 +0000
@@ -52,6 +52,18 @@
 Description: Extra drivers for nvidia-510 for the aws-lts-20.04 flavour
  Install extra signed nvidia-510 modules compatible with the aws-lts-20.04 flavour.
 
+Package: linux-modules-nvidia-515-aws-lts-20.04
+Build-Profiles: <!stage1>
+Architecture: amd64
+Section: kernel
+Provides: ${dkms:nvidia-515-modules}, nvidia-prebuilt-kernel
+Depends:
+ ${misc:Depends},
+ linux-modules-nvidia-515-5.4.0-1080-aws (= ${binary:Version}),
+ ${nvk:nvidia-515},
+Description: Extra drivers for nvidia-515 for the aws-lts-20.04 flavour
+ Install extra signed nvidia-515 modules compatible with the aws-lts-20.04 flavour.
+
 Package: linux-modules-nvidia-465-aws-lts-20.04
 Architecture: amd64
 Section: oldlibs
@@ -129,7 +141,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  linux-image-5.4.0-1080-aws | linux-image-unsigned-5.4.0-1080-aws,
- linux-signatures-nvidia-5.4.0-1080-aws (= 5.4.0-1080.87),
+ linux-signatures-nvidia-5.4.0-1080-aws (= 5.4.0-1080.87+1),
  linux-objects-nvidia-390-5.4.0-1080-aws (= ${binary:Version}),
  ${nvk:nvidia-390},
 Description: Linux kernel nvidia modules for version 5.4.0-1080
@@ -169,7 +181,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  linux-image-5.4.0-1080-aws | linux-image-unsigned-5.4.0-1080-aws,
- linux-signatures-nvidia-5.4.0-1080-aws (= 5.4.0-1080.87),
+ linux-signatures-nvidia-5.4.0-1080-aws (= 5.4.0-1080.87+1),
  linux-objects-nvidia-470-5.4.0-1080-aws (= ${binary:Version}),
  ${nvk:nvidia-470},
 Description: Linux kernel nvidia modules for version 5.4.0-1080
@@ -209,7 +221,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  linux-image-5.4.0-1080-aws | linux-image-unsigned-5.4.0-1080-aws,
- linux-signatures-nvidia-5.4.0-1080-aws (= 5.4.0-1080.87),
+ linux-signatures-nvidia-5.4.0-1080-aws (= 5.4.0-1080.87+1),
  linux-objects-nvidia-510-5.4.0-1080-aws (= ${binary:Version}),
  ${nvk:nvidia-510},
 Description: Linux kernel nvidia modules for version 5.4.0-1080
@@ -220,3 +232,43 @@
  one of the linux-modules-nvidia-510-aws* meta-packages,
  which will ensure that upgrades work correctly, and that supporting packages are
  also installed.
+
+Package: linux-objects-nvidia-515-5.4.0-1080-aws
+Build-Profiles: <!stage1>
+Architecture: amd64
+Section: kernel
+Priority: optional
+Built-Using: ${linux:BuiltUsing}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ binutils,
+Description: Linux kernel nvidia modules for version 5.4.0-1080 (objects)
+ This package contains the Linux kernel nvidia modules for version 5.4.0-1080.
+ .
+ You likely do not want to install this package directly. Instead, install the
+ one of the linux-modules-nvidia-515-aws* meta-packages,
+ which will ensure that upgrades work correctly, and that supporting packages are
+ also installed.
+
+Package: linux-modules-nvidia-515-5.4.0-1080-aws
+Build-Profiles: <!stage1>
+Architecture: amd64
+Section: kernel
+Priority: optional
+Built-Using: ${linux:BuiltUsing}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ linux-image-5.4.0-1080-aws | linux-image-unsigned-5.4.0-1080-aws,
+ linux-signatures-nvidia-5.4.0-1080-aws (= 5.4.0-1080.87+1),
+ linux-objects-nvidia-515-5.4.0-1080-aws (= ${binary:Version}),
+ ${nvk:nvidia-515},
+Description: Linux kernel nvidia modules for version 5.4.0-1080
+ This package pulls together the Linux kernel nvidia modules for
+ version 5.4.0-1080 with the appropriate signatures.
+ .
+ You likely do not want to install this package directly. Instead, install the
+ one of the linux-modules-nvidia-515-aws* meta-packages,
+ which will ensure that upgrades work correctly, and that supporting packages are
+ also installed.
diff -Nru linux-restricted-modules-aws-5.4.0/debian/dkms-versions linux-restricted-modules-aws-5.4.0/debian/dkms-versions
--- linux-restricted-modules-aws-5.4.0/debian/dkms-versions	2022-06-10 13:44:26.000000000 +0000
+++ linux-restricted-modules-aws-5.4.0/debian/dkms-versions	2022-06-24 13:23:52.000000000 +0000
@@ -1,7 +1,9 @@
 nvidia-graphics-drivers-390 390.151-0ubuntu0.20.04.1 arch=amd64
 nvidia-graphics-drivers-470 470.129.06-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-465 transition=nvidia-graphics-drivers-460 transition=nvidia-graphics-drivers-455 transition=nvidia-graphics-drivers-450 transition=nvidia-graphics-drivers-440 transition=nvidia-graphics-drivers-435
 nvidia-graphics-drivers-510 510.73.05-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-495
+nvidia-graphics-drivers-515 515.48.07-0ubuntu0.20.04.2 arch=amd64
 nvidia-graphics-drivers-418-server 418.226.00-0ubuntu0.20.04.2 arch=amd64
 nvidia-graphics-drivers-450-server 450.191.01-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-440-server
 nvidia-graphics-drivers-470-server 470.129.06-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-460-server
 nvidia-graphics-drivers-510-server 510.73.08-0ubuntu0.20.04.1 arch=amd64
+nvidia-graphics-drivers-515-server 515.48.07-0ubuntu0.20.04.1 arch=amd64
diff -Nru linux-restricted-modules-aws-5.4.0/debian/tracking-bug linux-restricted-modules-aws-5.4.0/debian/tracking-bug
--- linux-restricted-modules-aws-5.4.0/debian/tracking-bug	2022-06-10 13:43:04.000000000 +0000
+++ linux-restricted-modules-aws-5.4.0/debian/tracking-bug	2022-06-24 13:23:51.000000000 +0000
@@ -1 +1 @@
-1974356 2022.05.09-5
+1974356 2022.05.30-5