diff --git a/etc/modules-load.d/nvidia-uvm.conf b/etc/modules-load.d/nvidia-uvm.conf
deleted file mode 100644
index 876a4bb..0000000
--- a/etc/modules-load.d/nvidia-uvm.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Needed for bind mount of /dev/nvidia-uvm into nspawn containers.
-nvidia-uvm
diff --git a/etc/systemd/nspawn/ArchLinux.nspawn b/etc/systemd/nspawn/ArchLinux.nspawn
index bdfbdec..121cab5 100644
--- a/etc/systemd/nspawn/ArchLinux.nspawn
+++ b/etc/systemd/nspawn/ArchLinux.nspawn
@@ -1,7 +1,7 @@
 [Exec]
 Boot=true
 Capability=CAP_NET_ADMIN
-PrivateUsers=pick
+PrivateUsers=false
 
 [Files]
 Bind=/dev/dri
@@ -10,8 +10,6 @@ Bind=/dev/snd
 Bind=/dev/nvidia0
 Bind=/dev/nvidiactl
 Bind=/dev/nvidia-modeset
-Bind=/dev/nvidia-uvm
-Bind=/dev/nvidia-uvm-tools
 Bind=/run/user/1000/pulse/native:/tmp/pulse_server
 Bind=/etc/systemd/nspawn/20-machines-profile.sh:/etc/profile.d/20-machines-profile.sh
 BindReadOnly=/tmp/.X11-unix
diff --git a/etc/systemd/nspawn/BlackArch.nspawn b/etc/systemd/nspawn/BlackArch.nspawn
index 6ad940b..121cab5 100644
--- a/etc/systemd/nspawn/BlackArch.nspawn
+++ b/etc/systemd/nspawn/BlackArch.nspawn
@@ -10,8 +10,6 @@ Bind=/dev/snd
 Bind=/dev/nvidia0
 Bind=/dev/nvidiactl
 Bind=/dev/nvidia-modeset
-Bind=/dev/nvidia-uvm
-Bind=/dev/nvidia-uvm-tools
 Bind=/run/user/1000/pulse/native:/tmp/pulse_server
 Bind=/etc/systemd/nspawn/20-machines-profile.sh:/etc/profile.d/20-machines-profile.sh
 BindReadOnly=/tmp/.X11-unix
diff --git a/etc/systemd/nspawn/Debian.nspawn b/etc/systemd/nspawn/Debian.nspawn
index bdfbdec..9c4b4de 100644
--- a/etc/systemd/nspawn/Debian.nspawn
+++ b/etc/systemd/nspawn/Debian.nspawn
@@ -10,8 +10,6 @@ Bind=/dev/snd
 Bind=/dev/nvidia0
 Bind=/dev/nvidiactl
 Bind=/dev/nvidia-modeset
-Bind=/dev/nvidia-uvm
-Bind=/dev/nvidia-uvm-tools
 Bind=/run/user/1000/pulse/native:/tmp/pulse_server
 Bind=/etc/systemd/nspawn/20-machines-profile.sh:/etc/profile.d/20-machines-profile.sh
 BindReadOnly=/tmp/.X11-unix
diff --git a/etc/systemd/nspawn/KaliLinux.nspawn b/etc/systemd/nspawn/KaliLinux.nspawn
index 6ad940b..121cab5 100644
--- a/etc/systemd/nspawn/KaliLinux.nspawn
+++ b/etc/systemd/nspawn/KaliLinux.nspawn
@@ -10,8 +10,6 @@ Bind=/dev/snd
 Bind=/dev/nvidia0
 Bind=/dev/nvidiactl
 Bind=/dev/nvidia-modeset
-Bind=/dev/nvidia-uvm
-Bind=/dev/nvidia-uvm-tools
 Bind=/run/user/1000/pulse/native:/tmp/pulse_server
 Bind=/etc/systemd/nspawn/20-machines-profile.sh:/etc/profile.d/20-machines-profile.sh
 BindReadOnly=/tmp/.X11-unix
diff --git a/etc/systemd/nspawn/ParrotSec.nspawn b/etc/systemd/nspawn/ParrotSec.nspawn
index 6ad940b..121cab5 100644
--- a/etc/systemd/nspawn/ParrotSec.nspawn
+++ b/etc/systemd/nspawn/ParrotSec.nspawn
@@ -10,8 +10,6 @@ Bind=/dev/snd
 Bind=/dev/nvidia0
 Bind=/dev/nvidiactl
 Bind=/dev/nvidia-modeset
-Bind=/dev/nvidia-uvm
-Bind=/dev/nvidia-uvm-tools
 Bind=/run/user/1000/pulse/native:/tmp/pulse_server
 Bind=/etc/systemd/nspawn/20-machines-profile.sh:/etc/profile.d/20-machines-profile.sh
 BindReadOnly=/tmp/.X11-unix