diff --git a/libs/xfce/Dockerfile b/libs/xfce/Dockerfile
index f6411919..d44bdb95 100644
--- a/libs/xfce/Dockerfile
+++ b/libs/xfce/Dockerfile
@@ -22,7 +22,6 @@ RUN apt-get update && apt-get install -y \
     # Desktop environment
     xfce4 \
     xfce4-terminal \
-    xfce4-goodies \
     dbus-x11 \
     # VNC server
     tigervnc-standalone-server \
@@ -59,12 +58,19 @@ RUN apt-get update && apt-get install -y \
     zlib1g-dev \
     && rm -rf /var/lib/apt/lists/*
 
-# Remove power manager to avoid popup in container
-RUN apt-get remove -y xfce4-power-manager xfce4-power-manager-data || true
+# Remove screensavers and power manager to avoid popups and lock screens
+RUN apt-get remove -y \
+    xfce4-power-manager \
+    xfce4-power-manager-data \
+    xfce4-power-manager-plugins \
+    xfce4-screensaver \
+    light-locker \
+    xscreensaver \
+    xscreensaver-data || true
 
 # Create user after sudo is installed
 RUN useradd -m -s /bin/bash -G sudo cua && \
-    echo "cua:password" | chpasswd && \
+    echo "cua:cua" | chpasswd && \
     echo "cua ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
 
 # Install Firefox from Mozilla PPA (snap-free) - inline to avoid script issues
@@ -113,9 +119,13 @@ RUN mkdir -p $HOME/.config/xfce4/xfconf/xfce-perchannel-xml $HOME/.config/xfce4
 # Copy XFCE config to disable browser launching and welcome screens
 COPY --chown=cua:cua src/xfce-config/helpers.rc $HOME/.config/xfce4/helpers.rc
 COPY --chown=cua:cua src/xfce-config/xfce4-session.xml $HOME/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
+COPY --chown=cua:cua src/xfce-config/xfce4-power-manager.xml $HOME/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
 
-# Disable panel plugins that might try to open browsers
+# Disable autostart for screensaver, lock screen, and power manager
 RUN echo "[Desktop Entry]\nHidden=true" > $HOME/.config/autostart/xfce4-tips-autostart.desktop && \
+    echo "[Desktop Entry]\nHidden=true" > $HOME/.config/autostart/xfce4-screensaver.desktop && \
+    echo "[Desktop Entry]\nHidden=true" > $HOME/.config/autostart/light-locker.desktop && \
+    echo "[Desktop Entry]\nHidden=true" > $HOME/.config/autostart/xfce4-power-manager.desktop && \
     chown -R cua:cua $HOME/.config
 
 # Create storage and shared directories, and Firefox cache directory
diff --git a/libs/xfce/src/xfce-config/xfce4-power-manager.xml b/libs/xfce/src/xfce-config/xfce4-power-manager.xml
new file mode 100644
index 00000000..56447c1e
--- /dev/null
+++ b/libs/xfce/src/xfce-config/xfce4-power-manager.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<channel name="xfce4-power-manager" version="1.0">
+  <property name="xfce4-power-manager" type="empty">
+    <property name="dpms-enabled" type="bool" value="false"/>
+    <property name="dpms-on-ac-sleep" type="uint" value="0"/>
+    <property name="dpms-on-ac-off" type="uint" value="0"/>
+    <property name="dpms-on-battery-sleep" type="uint" value="0"/>
+    <property name="dpms-on-battery-off" type="uint" value="0"/>
+    <property name="blank-on-ac" type="int" value="0"/>
+    <property name="blank-on-battery" type="int" value="0"/>
+    <property name="lock-screen-suspend-hibernate" type="bool" value="false"/>
+    <property name="logind-handle-lid-switch" type="bool" value="false"/>
+    <property name="brightness-on-ac" type="uint" value="9"/>
+    <property name="brightness-on-battery" type="uint" value="9"/>
+    <property name="inactivity-on-ac" type="uint" value="0"/>
+    <property name="inactivity-on-battery" type="uint" value="0"/>
+    <property name="inactivity-sleep-mode-on-battery" type="uint" value="1"/>
+  </property>
+</channel>
diff --git a/libs/xfce/src/xfce-config/xfce4-session.xml b/libs/xfce/src/xfce-config/xfce4-session.xml
index d7b834d9..5af36711 100644
--- a/libs/xfce/src/xfce-config/xfce4-session.xml
+++ b/libs/xfce/src/xfce-config/xfce4-session.xml
@@ -48,4 +48,8 @@
     <property name="ShowHybridSleep" type="bool" value="false"/>
     <property name="ShowSwitchUser" type="bool" value="false"/>
   </property>
+  <property name="screensaver" type="empty">
+    <property name="enabled" type="bool" value="false"/>
+    <property name="lock-enabled" type="bool" value="false"/>
+  </property>
 </channel>