diff -Nru linux-restricted-modules-aws-5.11-5.11.0/debian/changelog linux-restricted-modules-aws-5.11-5.11.0/debian/changelog
--- linux-restricted-modules-aws-5.11-5.11.0/debian/changelog	2021-08-12 04:29:26.000000000 +0000
+++ linux-restricted-modules-aws-5.11-5.11.0/debian/changelog	2021-08-18 14:59:25.000000000 +0000
@@ -1,3 +1,10 @@
+linux-restricted-modules-aws-5.11 (5.11.0-1016.17~20.04.1+1) focal; urgency=medium
+
+  * Packaging resync (LP: #1786013)
+    - [Packaging] update variants
+
+ -- Marcelo Henrique Cerri <marcelo.cerri@canonical.com>  Wed, 18 Aug 2021 11:59:25 -0300
+
 linux-restricted-modules-aws-5.11 (5.11.0-1016.17~20.04.1) focal; urgency=medium
 
   * Master version: 5.11.0-1016.17~20.04.1
diff -Nru linux-restricted-modules-aws-5.11-5.11.0/debian/control linux-restricted-modules-aws-5.11-5.11.0/debian/control
--- linux-restricted-modules-aws-5.11-5.11.0/debian/control	2021-08-12 04:29:26.000000000 +0000
+++ linux-restricted-modules-aws-5.11-5.11.0/debian/control	2021-08-18 14:59:25.000000000 +0000
@@ -16,6 +16,90 @@
 Standards-Version: 3.9.4
 Vcs-Git: git://git.launchpad.net/~canonical-kernel/ubuntu/+source/linux-restricted-modules-aws/+git/focal
 
+Package: linux-modules-nvidia-390-aws
+Build-Profiles: <!stage1>
+Architecture: amd64
+Section: kernel
+Provides: ${dkms:nvidia-390-modules}, nvidia-prebuilt-kernel
+Depends:
+ ${misc:Depends},
+ linux-modules-nvidia-390-5.11.0-1016-aws (= ${binary:Version}),
+ ${nvk:nvidia-390},
+Description: Extra drivers for nvidia-390 for the aws flavour
+ Install extra signed nvidia-390 modules compatible with the aws flavour.
+
+Package: linux-modules-nvidia-460-aws
+Build-Profiles: <!stage1>
+Architecture: amd64
+Section: kernel
+Provides: ${dkms:nvidia-460-modules}, nvidia-prebuilt-kernel
+Depends:
+ ${misc:Depends},
+ linux-modules-nvidia-460-5.11.0-1016-aws (= ${binary:Version}),
+ ${nvk:nvidia-460},
+Description: Extra drivers for nvidia-460 for the aws flavour
+ Install extra signed nvidia-460 modules compatible with the aws flavour.
+
+Package: linux-modules-nvidia-470-aws
+Build-Profiles: <!stage1>
+Architecture: amd64
+Section: kernel
+Provides: ${dkms:nvidia-470-modules}, nvidia-prebuilt-kernel
+Depends:
+ ${misc:Depends},
+ linux-modules-nvidia-470-5.11.0-1016-aws (= ${binary:Version}),
+ ${nvk:nvidia-470},
+Description: Extra drivers for nvidia-470 for the aws flavour
+ Install extra signed nvidia-470 modules compatible with the aws flavour.
+
+Package: linux-modules-nvidia-418-server-aws
+Build-Profiles: <!stage1>
+Architecture: amd64
+Section: kernel
+Provides: ${dkms:nvidia-418-server-modules}, nvidia-prebuilt-kernel
+Depends:
+ ${misc:Depends},
+ linux-modules-nvidia-418-server-5.11.0-1016-aws (= ${binary:Version}),
+ ${nvk:nvidia-418-server},
+Description: Extra drivers for nvidia-418-server for the aws flavour
+ Install extra signed nvidia-418-server modules compatible with the aws flavour.
+
+Package: linux-modules-nvidia-450-server-aws
+Build-Profiles: <!stage1>
+Architecture: amd64
+Section: kernel
+Provides: ${dkms:nvidia-450-server-modules}, nvidia-prebuilt-kernel
+Depends:
+ ${misc:Depends},
+ linux-modules-nvidia-450-server-5.11.0-1016-aws (= ${binary:Version}),
+ ${nvk:nvidia-450-server},
+Description: Extra drivers for nvidia-450-server for the aws flavour
+ Install extra signed nvidia-450-server modules compatible with the aws flavour.
+
+Package: linux-modules-nvidia-460-server-aws
+Build-Profiles: <!stage1>
+Architecture: amd64
+Section: kernel
+Provides: ${dkms:nvidia-460-server-modules}, nvidia-prebuilt-kernel
+Depends:
+ ${misc:Depends},
+ linux-modules-nvidia-460-server-5.11.0-1016-aws (= ${binary:Version}),
+ ${nvk:nvidia-460-server},
+Description: Extra drivers for nvidia-460-server for the aws flavour
+ Install extra signed nvidia-460-server modules compatible with the aws flavour.
+
+Package: linux-modules-nvidia-470-server-aws
+Build-Profiles: <!stage1>
+Architecture: amd64
+Section: kernel
+Provides: ${dkms:nvidia-470-server-modules}, nvidia-prebuilt-kernel
+Depends:
+ ${misc:Depends},
+ linux-modules-nvidia-470-server-5.11.0-1016-aws (= ${binary:Version}),
+ ${nvk:nvidia-470-server},
+Description: Extra drivers for nvidia-470-server for the aws flavour
+ Install extra signed nvidia-470-server modules compatible with the aws flavour.
+
 Package: linux-modules-nvidia-390-aws-edge
 Build-Profiles: <!stage1>
 Architecture: amd64
@@ -100,6 +184,48 @@
 Description: Extra drivers for nvidia-470-server for the aws-edge flavour
  Install extra signed nvidia-470-server modules compatible with the aws-edge flavour.
 
+Package: linux-modules-nvidia-455-aws
+Architecture: amd64
+Section: oldlibs
+Depends: linux-modules-nvidia-460-aws
+Description: Extra drivers for nvidia-455 for the aws flavour (dummy transitional package)
+ Transitional package for upgrades of -455 to -460.
+
+Package: linux-modules-nvidia-435-aws
+Architecture: amd64
+Section: oldlibs
+Depends: linux-modules-nvidia-460-aws
+Description: Extra drivers for nvidia-435 for the aws flavour (dummy transitional package)
+ Transitional package for upgrades of -435 to -460.
+
+Package: linux-modules-nvidia-440-aws
+Architecture: amd64
+Section: oldlibs
+Depends: linux-modules-nvidia-460-aws
+Description: Extra drivers for nvidia-440 for the aws flavour (dummy transitional package)
+ Transitional package for upgrades of -440 to -460.
+
+Package: linux-modules-nvidia-450-aws
+Architecture: amd64
+Section: oldlibs
+Depends: linux-modules-nvidia-460-aws
+Description: Extra drivers for nvidia-450 for the aws flavour (dummy transitional package)
+ Transitional package for upgrades of -450 to -460.
+
+Package: linux-modules-nvidia-465-aws
+Architecture: amd64
+Section: oldlibs
+Depends: linux-modules-nvidia-470-aws
+Description: Extra drivers for nvidia-465 for the aws flavour (dummy transitional package)
+ Transitional package for upgrades of -465 to -470.
+
+Package: linux-modules-nvidia-440-server-aws
+Architecture: amd64
+Section: oldlibs
+Depends: linux-modules-nvidia-450-server-aws
+Description: Extra drivers for nvidia-440-server for the aws flavour (dummy transitional package)
+ Transitional package for upgrades of -440-server to -450-server.
+
 Package: linux-modules-nvidia-455-aws-edge
 Architecture: amd64
 Section: oldlibs
@@ -170,7 +296,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  linux-image-5.11.0-1016-aws | linux-image-unsigned-5.11.0-1016-aws,
- linux-signatures-nvidia-5.11.0-1016-aws (= 5.11.0-1016.17~20.04.1),
+ linux-signatures-nvidia-5.11.0-1016-aws (= 5.11.0-1016.17~20.04.1+1),
  linux-objects-nvidia-390-5.11.0-1016-aws (= ${binary:Version}),
  ${nvk:nvidia-390},
 Description: Linux kernel nvidia modules for version 5.11.0-1016
@@ -210,7 +336,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  linux-image-5.11.0-1016-aws | linux-image-unsigned-5.11.0-1016-aws,
- linux-signatures-nvidia-5.11.0-1016-aws (= 5.11.0-1016.17~20.04.1),
+ linux-signatures-nvidia-5.11.0-1016-aws (= 5.11.0-1016.17~20.04.1+1),
  linux-objects-nvidia-460-5.11.0-1016-aws (= ${binary:Version}),
  ${nvk:nvidia-460},
 Description: Linux kernel nvidia modules for version 5.11.0-1016
@@ -250,7 +376,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  linux-image-5.11.0-1016-aws | linux-image-unsigned-5.11.0-1016-aws,
- linux-signatures-nvidia-5.11.0-1016-aws (= 5.11.0-1016.17~20.04.1),
+ linux-signatures-nvidia-5.11.0-1016-aws (= 5.11.0-1016.17~20.04.1+1),
  linux-objects-nvidia-470-5.11.0-1016-aws (= ${binary:Version}),
  ${nvk:nvidia-470},
 Description: Linux kernel nvidia modules for version 5.11.0-1016
@@ -290,7 +416,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  linux-image-5.11.0-1016-aws | linux-image-unsigned-5.11.0-1016-aws,
- linux-signatures-nvidia-5.11.0-1016-aws (= 5.11.0-1016.17~20.04.1),
+ linux-signatures-nvidia-5.11.0-1016-aws (= 5.11.0-1016.17~20.04.1+1),
  linux-objects-nvidia-418-server-5.11.0-1016-aws (= ${binary:Version}),
  ${nvk:nvidia-418-server},
 Description: Linux kernel nvidia modules for version 5.11.0-1016
@@ -330,7 +456,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  linux-image-5.11.0-1016-aws | linux-image-unsigned-5.11.0-1016-aws,
- linux-signatures-nvidia-5.11.0-1016-aws (= 5.11.0-1016.17~20.04.1),
+ linux-signatures-nvidia-5.11.0-1016-aws (= 5.11.0-1016.17~20.04.1+1),
  linux-objects-nvidia-450-server-5.11.0-1016-aws (= ${binary:Version}),
  ${nvk:nvidia-450-server},
 Description: Linux kernel nvidia modules for version 5.11.0-1016
@@ -370,7 +496,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  linux-image-5.11.0-1016-aws | linux-image-unsigned-5.11.0-1016-aws,
- linux-signatures-nvidia-5.11.0-1016-aws (= 5.11.0-1016.17~20.04.1),
+ linux-signatures-nvidia-5.11.0-1016-aws (= 5.11.0-1016.17~20.04.1+1),
  linux-objects-nvidia-460-server-5.11.0-1016-aws (= ${binary:Version}),
  ${nvk:nvidia-460-server},
 Description: Linux kernel nvidia modules for version 5.11.0-1016
@@ -410,7 +536,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  linux-image-5.11.0-1016-aws | linux-image-unsigned-5.11.0-1016-aws,
- linux-signatures-nvidia-5.11.0-1016-aws (= 5.11.0-1016.17~20.04.1),
+ linux-signatures-nvidia-5.11.0-1016-aws (= 5.11.0-1016.17~20.04.1+1),
  linux-objects-nvidia-470-server-5.11.0-1016-aws (= ${binary:Version}),
  ${nvk:nvidia-470-server},
 Description: Linux kernel nvidia modules for version 5.11.0-1016
diff -Nru linux-restricted-modules-aws-5.11-5.11.0/debian/variants linux-restricted-modules-aws-5.11-5.11.0/debian/variants
--- linux-restricted-modules-aws-5.11-5.11.0/debian/variants	2021-08-12 04:29:24.000000000 +0000
+++ linux-restricted-modules-aws-5.11-5.11.0/debian/variants	2021-08-18 14:59:21.000000000 +0000
@@ -1 +1,2 @@
+--
 -edge