diff --git a/mkosi.conf b/mkosi.conf
index 99efc6c1e..bfba08f8c 100644
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -4,7 +4,7 @@ MinimumVersion=26~devel
 [Distribution]
 Distribution=ubuntu
 Release=resolute
-Repositories=main,universe,restricted
+Repositories=main,universe,restricted,multiverse
 
 [Content]
 InitrdProfiles=plymouth
diff --git a/mkosi.conf.d/arch.arm64.conf b/mkosi.conf.d/arch.arm64.conf
index c8002977d..8ff6b763f 100644
--- a/mkosi.conf.d/arch.arm64.conf
+++ b/mkosi.conf.d/arch.arm64.conf
@@ -12,6 +12,5 @@ Dependencies=
     ext-sdk
     ext-virt
     driver-nvidia-addon
-    driver-nvidia-modules
-    driver-nvidia-runtime
+    driver-nvidia
     modules-db
diff --git a/mkosi.conf.d/arch.x86-64.conf b/mkosi.conf.d/arch.x86-64.conf
index 93c3fc143..7593026ab 100644
--- a/mkosi.conf.d/arch.x86-64.conf
+++ b/mkosi.conf.d/arch.x86-64.conf
@@ -12,9 +12,7 @@ Dependencies=
     ext-sdk
     ext-virt
     driver-nvidia-addon
-    driver-nvidia-modules
-    driver-nvidia-runtime
+    driver-nvidia
     driver-broadcom-addon
-    driver-broadcom-modules
-    driver-broadcom-runtime
+    driver-broadcom
     modules-db
diff --git a/mkosi.images/driver-broadcom-runtime/enable-runtime.chroot b/mkosi.images/driver-broadcom-runtime/enable-runtime.chroot
deleted file mode 100755
index 91c573a65..000000000
--- a/mkosi.images/driver-broadcom-runtime/enable-runtime.chroot
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-mkdir -p /usr/lib/modprobe.d/
-cp /etc/modprobe.d/broadcom-sta-common.conf /usr/lib/modprobe.d/
diff --git a/mkosi.images/driver-broadcom-runtime/mkosi.conf b/mkosi.images/driver-broadcom-runtime/mkosi.conf
deleted file mode 100644
index ccd2eec89..000000000
--- a/mkosi.images/driver-broadcom-runtime/mkosi.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-#broadcom-runtime
-[Config]
-Dependencies=base
-
-[Match]
-Architecture=x86-64
-
-[Output]
-ImageId=driver-broadcom-runtime
-Format=sysext
-Overlay=yes
-Output=driver-broadcom-runtime-%a_%v
-CompressOutput=false
-
-[Validation]
-Verity=yes
-
-[Content]
-Bootable=no
-BaseTrees=%O/base_%v
-RemovePackages=broadcom-sta-dkms
-BuildScripts=enable-runtime.chroot
-Packages=
-    broadcom-sta-common
diff --git a/mkosi.images/driver-broadcom-modules/get-module-only b/mkosi.images/driver-broadcom/get-module-only
similarity index 100%
rename from mkosi.images/driver-broadcom-modules/get-module-only
rename to mkosi.images/driver-broadcom/get-module-only
diff --git a/mkosi.images/driver-broadcom-modules/mkosi.conf b/mkosi.images/driver-broadcom/mkosi.conf
similarity index 77%
rename from mkosi.images/driver-broadcom-modules/mkosi.conf
rename to mkosi.images/driver-broadcom/mkosi.conf
index 4d43481c5..e2ae2f78f 100644
--- a/mkosi.images/driver-broadcom-modules/mkosi.conf
+++ b/mkosi.images/driver-broadcom/mkosi.conf
@@ -1,4 +1,4 @@
-#broadcom-modules
+#driver-broadcom
 [Config]
 Dependencies=base
 
@@ -6,10 +6,10 @@ Dependencies=base
 Architecture=x86-64
 
 [Output]
-ImageId=driver-broadcom-modules
+ImageId=driver-broadcom
 Format=sysext
 Overlay=yes
-Output=driver-broadcom-modules-%a_%v
+Output=driver-broadcom-%a_%v
 CompressOutput=false
 
 [Validation]
diff --git a/mkosi.images/driver-nvidia-runtime/mkosi.conf b/mkosi.images/driver-nvidia-runtime/mkosi.conf
deleted file mode 100644
index 71229ddd6..000000000
--- a/mkosi.images/driver-nvidia-runtime/mkosi.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-#nvidia-runtime
-[Config]
-Dependencies=base
-
-[Output]
-ImageId=driver-nvidia-runtime
-Format=sysext
-Overlay=yes
-Output=driver-nvidia-runtime-%a_%v
-CompressOutput=false
-
-[Validation]
-Verity=yes
-
-[Build]
-Environment=DEB_BUILD_PROFILES=nokerneldkms
-
-[Content]
-Bootable=no
-BaseTrees=%O/base_%v
-RemovePackages=linux-modules-nvidia-590-open-generic
-Packages=
-    libnvidia-gl-590
-    nvidia-utils-590
-    nvidia-driver-590-open
diff --git a/mkosi.images/driver-nvidia-modules/get-module-only b/mkosi.images/driver-nvidia/get-module-only
similarity index 100%
rename from mkosi.images/driver-nvidia-modules/get-module-only
rename to mkosi.images/driver-nvidia/get-module-only
diff --git a/mkosi.images/driver-nvidia-modules/mkosi.conf b/mkosi.images/driver-nvidia/mkosi.conf
similarity index 50%
rename from mkosi.images/driver-nvidia-modules/mkosi.conf
rename to mkosi.images/driver-nvidia/mkosi.conf
index d5d09e9ac..5bcf44bb0 100644
--- a/mkosi.images/driver-nvidia-modules/mkosi.conf
+++ b/mkosi.images/driver-nvidia/mkosi.conf
@@ -1,12 +1,12 @@
-#nvidia-modules
+#driver-nvidia
 [Config]
 Dependencies=base
 
 [Output]
-ImageId=driver-nvidia-modules
+ImageId=driver-nvidia
 Format=sysext
 Overlay=yes
-Output=driver-nvidia-modules-%a_%v
+Output=driver-nvidia-%a_%v
 CompressOutput=false
 
 [Validation]
@@ -18,5 +18,11 @@ Environment=DEB_BUILD_PROFILES=nokerneldkms
 [Content]
 Bootable=no
 BaseTrees=%O/base_%v
-Packages=linux-modules-nvidia-590-open-generic
+BuildPackages=
+    linux-headers-generic
+Packages=
+    linux-modules-nvidia-610-open-generic
+    libnvidia-gl-610
+    nvidia-utils-610
+    nvidia-driver-610-open
 BuildScripts=get-module-only
diff --git a/mkosi.images/modules-db/mkosi.conf.d/arch.arm64.conf b/mkosi.images/modules-db/mkosi.conf.d/arch.arm64.conf
index 59b2472d8..d64e76503 100644
--- a/mkosi.images/modules-db/mkosi.conf.d/arch.arm64.conf
+++ b/mkosi.images/modules-db/mkosi.conf.d/arch.arm64.conf
@@ -1,5 +1,7 @@
 [Config]
-Dependencies=base
+Dependencies=
+    base
+    driver-nvidia
 
 [Match]
 Architecture=arm64
@@ -13,5 +15,5 @@ CompressOutput=false
 Bootable=false
 BaseTrees=
     %O/base_%v
-    %O/driver-nvidia-modules-%a_%v.raw
+    %O/driver-nvidia-%a_%v.raw
 Output=modules-db_%a-%v
diff --git a/mkosi.images/modules-db/mkosi.conf.d/arch.x86-64.conf b/mkosi.images/modules-db/mkosi.conf.d/arch.x86-64.conf
index b082c18b0..6b72674f6 100644
--- a/mkosi.images/modules-db/mkosi.conf.d/arch.x86-64.conf
+++ b/mkosi.images/modules-db/mkosi.conf.d/arch.x86-64.conf
@@ -1,5 +1,8 @@
 [Config]
-Dependencies=base
+Dependencies=
+    base
+    driver-broadcom
+    driver-nvidia
 
 [Match]
 Architecture=x86-64
@@ -13,6 +16,6 @@ CompressOutput=false
 Bootable=false
 BaseTrees=
     %O/base_%v
-    %O/driver-broadcom-modules-%a_%v.raw
-    %O/driver-nvidia-modules-%a_%v.raw
+    %O/driver-broadcom-%a_%v.raw
+    %O/driver-nvidia-%a_%v.raw
 Output=modules-db_%a-%v
diff --git a/mkosi.images/sysupdate/mkosi.extra/usr/lib/sysupdate.d/driver-broadcom-modules.transfer b/mkosi.images/sysupdate/mkosi.extra/usr/lib/sysupdate.d/driver-broadcom-modules.transfer
deleted file mode 100644
index 470134b67..000000000
--- a/mkosi.images/sysupdate/mkosi.extra/usr/lib/sysupdate.d/driver-broadcom-modules.transfer
+++ /dev/null
@@ -1,15 +0,0 @@
-[Transfer]
-ProtectVersion=%A
-Features=driver-broadcom
-Verify=yes
-
-[Source]
-Type=url-file
-Path=https://%W.updates.elementaryos.org/%a/ext
-MatchPattern=driver-broadcom-modules-%a_@v.raw.zst
-
-[Target]
-Type=regular-file
-Path=/var/lib/extensions/
-MatchPattern=driver-broadcom-modules-%a_@v.raw
-InstancesMax=2
diff --git a/mkosi.images/sysupdate/mkosi.extra/usr/lib/sysupdate.d/driver-broadcom-runtime.transfer b/mkosi.images/sysupdate/mkosi.extra/usr/lib/sysupdate.d/driver-broadcom.transfer
similarity index 67%
rename from mkosi.images/sysupdate/mkosi.extra/usr/lib/sysupdate.d/driver-broadcom-runtime.transfer
rename to mkosi.images/sysupdate/mkosi.extra/usr/lib/sysupdate.d/driver-broadcom.transfer
index b04263436..740f38715 100644
--- a/mkosi.images/sysupdate/mkosi.extra/usr/lib/sysupdate.d/driver-broadcom-runtime.transfer
+++ b/mkosi.images/sysupdate/mkosi.extra/usr/lib/sysupdate.d/driver-broadcom.transfer
@@ -6,10 +6,10 @@ Verify=yes
 [Source]
 Type=url-file
 Path=https://%W.updates.elementaryos.org/%a/ext
-MatchPattern=driver-broadcom-runtime-%a_@v.raw.zst
+MatchPattern=driver-broadcom-%a_@v.raw.zst
 
 [Target]
 Type=regular-file
 Path=/var/lib/extensions/
-MatchPattern=driver-broadcom-runtime-%a_@v.raw
+MatchPattern=driver-broadcom-%a_@v.raw
 InstancesMax=2
diff --git a/mkosi.images/sysupdate/mkosi.extra/usr/lib/sysupdate.d/driver-nvidia-runtime.transfer b/mkosi.images/sysupdate/mkosi.extra/usr/lib/sysupdate.d/driver-nvidia-runtime.transfer
deleted file mode 100644
index 14c96e608..000000000
--- a/mkosi.images/sysupdate/mkosi.extra/usr/lib/sysupdate.d/driver-nvidia-runtime.transfer
+++ /dev/null
@@ -1,15 +0,0 @@
-[Transfer]
-ProtectVersion=%A
-Features=driver-nvidia
-Verify=yes
-
-[Source]
-Type=url-file
-Path=https://%W.updates.elementaryos.org/%a/ext
-MatchPattern=driver-nvidia-runtime-%a_@v.raw.zst
-
-[Target]
-Type=regular-file
-Path=/var/lib/extensions/
-MatchPattern=driver-nvidia-runtime-%a_@v.raw
-InstancesMax=2
diff --git a/mkosi.images/sysupdate/mkosi.extra/usr/lib/sysupdate.d/driver-nvidia-modules.transfer b/mkosi.images/sysupdate/mkosi.extra/usr/lib/sysupdate.d/driver-nvidia.transfer
similarity index 68%
rename from mkosi.images/sysupdate/mkosi.extra/usr/lib/sysupdate.d/driver-nvidia-modules.transfer
rename to mkosi.images/sysupdate/mkosi.extra/usr/lib/sysupdate.d/driver-nvidia.transfer
index 3374a6d80..4ee40c8c8 100644
--- a/mkosi.images/sysupdate/mkosi.extra/usr/lib/sysupdate.d/driver-nvidia-modules.transfer
+++ b/mkosi.images/sysupdate/mkosi.extra/usr/lib/sysupdate.d/driver-nvidia.transfer
@@ -6,10 +6,10 @@ Verify=yes
 [Source]
 Type=url-file
 Path=https://%W.updates.elementaryos.org/%a/ext
-MatchPattern=driver-nvidia-modules-%a_@v.raw.zst
+MatchPattern=driver-nvidia-%a_@v.raw.zst
 
 [Target]
 Type=regular-file
 Path=/var/lib/extensions/
-MatchPattern=driver-nvidia-modules-%a_@v.raw
+MatchPattern=driver-nvidia-%a_@v.raw
 InstancesMax=2
diff --git a/repos/common-files/etc/apt/preferences.d/restrict-proprietary b/repos/common-files/etc/apt/preferences.d/restrict-proprietary
new file mode 100644
index 000000000..6905fa30c
--- /dev/null
+++ b/repos/common-files/etc/apt/preferences.d/restrict-proprietary
@@ -0,0 +1,17 @@
+Explanation: Block everything by default in multiverse, except NVIDIA.
+Package: *
+Pin: release c=multiverse
+Pin-Priority: -1
+
+Package: /.*nvidia.*/
+Pin: release c=multiverse
+Pin-Priority: 500
+
+Explanation: Block everything by default in restricted, except NVIDIA and Broadcom.
+Package: *
+Pin: release c=restricted
+Pin-Priority: -1
+
+Package: /.*(nvidia|broadcom).*/
+Pin: release c=restricted
+Pin-Priority: 500
\ No newline at end of file