diff --git a/Dockerfile b/Dockerfile
index b4d6d599..1d5e99cf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-rdesktop:fedora-40
+FROM ghcr.io/linuxserver/baseimage-rdesktop:fedora40
 
 # set version label
 ARG BUILD_DATE
@@ -13,7 +13,6 @@ RUN \
   dnf install -y --setopt=install_weak_deps=False --best \
     chromium \
     obconf-qt \
-    openbox \
     st && \
   echo "**** application tweaks ****" && \
   mv \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 875ebb85..02b37ab0 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-fedora-40
+FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-fedora40
 
 # set version label
 ARG BUILD_DATE
@@ -13,7 +13,6 @@ RUN \
   dnf install -y --setopt=install_weak_deps=False --best \
     chromium \
     obconf-qt \
-    openbox \
     st && \
   echo "**** application tweaks ****" && \
   mv \
diff --git a/root/defaults/autostart b/root/defaults/autostart
new file mode 100644
index 00000000..ca916d09
--- /dev/null
+++ b/root/defaults/autostart
@@ -0,0 +1 @@
+exit 0
diff --git a/root/defaults/startwm.sh b/root/defaults/startwm.sh
index 86e41287..ca0890e7 100755
--- a/root/defaults/startwm.sh
+++ b/root/defaults/startwm.sh
@@ -1,3 +1,19 @@
 #!/bin/bash
+
+# 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/openbox-session > /dev/null 2>&1