diff --git a/Dockerfile b/Dockerfile
index e2fc9df0..e5383808 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop:arch-dbus
+FROM ghcr.io/linuxserver/baseimage-rdesktop:arch
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 744dd7f5..22b1f752 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-arch-dbus
+FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-arch
 
 # set version label
 ARG BUILD_DATE
diff --git a/root/defaults/startwm.sh b/root/defaults/startwm.sh
index aa0ef27d..5d69c0cc 100755
--- a/root/defaults/startwm.sh
+++ b/root/defaults/startwm.sh
@@ -1,5 +1,19 @@
 #!/bin/bash
-PULSE_SCRIPT=/etc/xrdp/pulse/default.pa /startpulse.sh &
-setterm blank 0
-setterm powerdown 0 
+
+# Combine env
+/usr/bin/with-contenv /usr/bin/env | sed 's/^/export /g' > /defaults/env.sh
+source /defaults/env.sh
+rm /defaults/env.sh
+
+# Enable Nvidia GPU support if detected
+if which nvidia-smi; then
+  export LIBGL_KOPPER_DRI2=1
+  export MESA_LOADER_DRIVER_OVERRIDE=zink
+  export GALLIUM_DRIVER=zink
+fi
+
+# Start Pulseaudio
+/startpulse.sh &
+
+# Launch DE
 /usr/bin/i3 > /dev/null 2>&1