diff --git a/Dockerfile b/Dockerfile
index 6f87c279..f7ae1eb0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,6 +30,9 @@ RUN \
     's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \
     /usr/share/applications/chromium.desktop && \
   mv /usr/bin/exo-open /usr/bin/exo-open-real && \
+  echo "**** xfce tweaks ****" && \
+  rm -f \
+    /etc/xdg/autostart/xscreensaver.desktop && \
   echo "**** cleanup ****" && \
   apt-get autoclean && \
   rm -rf \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 9a3b3f5d..5c364cc9 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -30,6 +30,9 @@ RUN \
     's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \
     /usr/share/applications/chromium.desktop && \
   mv /usr/bin/exo-open /usr/bin/exo-open-real && \
+  echo "**** xfce tweaks ****" && \
+  rm -f \
+    /etc/xdg/autostart/xscreensaver.desktop && \
   echo "**** cleanup ****" && \
   apt-get autoclean && \
   rm -rf \
diff --git a/root/defaults/startwm.sh b/root/defaults/startwm.sh
index ba3aa3a2..b5612da4 100755
--- a/root/defaults/startwm.sh
+++ b/root/defaults/startwm.sh
@@ -2,7 +2,6 @@
 
 setterm blank 0
 setterm powerdown 0
-xset s 0 0
 if [ -f "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml ]; then
   sed -i \
     '/use_compositing/c <property name="use_compositing" type="bool" value="false"/>' \