diff --git a/Dockerfile b/Dockerfile
index b726e502..136b8ec6 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
@@ -11,7 +11,9 @@ LABEL maintainer="thelamer"
 RUN \
   echo "**** install packages ****" && \
   dnf install -y --setopt=install_weak_deps=False --best \
+    caja \
     chromium \
+    dconf-editor \
     marco \
     mate-control-center \
     mate-desktop \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index a486a5ac..54bd4e9d 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
@@ -11,7 +11,9 @@ LABEL maintainer="thelamer"
 RUN \
   echo "**** install packages ****" && \
   dnf install -y --setopt=install_weak_deps=False --best \
+    caja \
     chromium \
+    dconf-editor \
     marco \
     mate-control-center \
     mate-desktop \
diff --git a/root/defaults/startwm.sh b/root/defaults/startwm.sh
index 691a380b..c2d9fec0 100755
--- a/root/defaults/startwm.sh
+++ b/root/defaults/startwm.sh
@@ -1,5 +1,24 @@
 #!/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 &
+
+# Disable compositing
 setterm blank 0
 setterm powerdown 0
+gsettings set org.mate.Marco.general compositing-manager false
+
+# Launch DE
 /usr/bin/mate-session > /dev/null 2>&1