diff --git a/BasicDesktop/Dockerfile b/BasicDesktop/Dockerfile
index 981ae833afd31dd999192f2babafeea76e9a534f..d414fc639dfdc2228ccdaee8417ec8bb55e46d0b 100644
--- a/BasicDesktop/Dockerfile
+++ b/BasicDesktop/Dockerfile
@@ -49,10 +49,13 @@ COPY files/home_metauser_.config /metauser_home_vanilla/.config
 #COPY data/desktop-cf881dd7/metauser_home_vanilla/.config /metauser_home_vanilla/.config
 RUN chown -R metauser:metauser /metauser_home_vanilla/.config
 
-# Disable screensaver
+# Disable the X screensaver
 COPY files/dot_xscreensaver /metauser_home_vanilla/.xscreensaver
 RUN chown metauser:metauser /metauser_home_vanilla/.xscreensaver
 
+# Remove the screen locker package altogether
+RUN apt-get remove -y light-locker light-locker-settings
+
 # Disable logout dialog
 RUN chmod 000 /usr/bin/xfce4-session-logout
 
diff --git a/BasicDesktop/files/home_metauser_.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml b/BasicDesktop/files/home_metauser_.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f2a3ef5de93539a11f3c22bd3a41d899f60aaf4e
--- /dev/null
+++ b/BasicDesktop/files/home_metauser_.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-power-manager" version="1.0">
+  <property name="xfce4-power-manager" type="empty">
+    <property name="power-button-action" type="empty"/>
+    <property name="lock-screen-suspend-hibernate" type="empty"/>
+    <property name="logind-handle-lid-switch" type="empty"/>
+    <property name="blank-on-ac" type="int" value="0"/>
+    <property name="blank-on-battery" type="int" value="0"/>
+    <property name="dpms-enabled" type="bool" value="false"/>
+    <property name="dpms-on-ac-sleep" type="empty"/>
+    <property name="dpms-on-ac-off" type="empty"/>
+    <property name="dpms-on-battery-sleep" type="empty"/>
+    <property name="dpms-on-battery-off" type="empty"/>
+    <property name="show-panel-label" type="empty"/>
+    <property name="inactivity-sleep-mode-on-ac" type="empty"/>
+    <property name="inactivity-sleep-mode-on-battery" type="empty"/>
+    <property name="show-tray-icon" type="bool" value="false"/>
+  </property>
+</channel>
\ No newline at end of file
diff --git a/BasicDesktop/files/home_metauser_.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-screensaver.xml b/BasicDesktop/files/home_metauser_.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-screensaver.xml
new file mode 100644
index 0000000000000000000000000000000000000000..da3f6a68f5c7053f2e38a3c39d9919e0cf75946b
--- /dev/null
+++ b/BasicDesktop/files/home_metauser_.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-screensaver.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-screensaver" version="1.0">
+  <property name="saver" type="empty">
+    <property name="mode" type="int" value="0"/>
+    <property name="enabled" type="bool" value="false"/>
+  </property>
+  <property name="lock" type="empty">
+    <property name="enabled" type="bool" value="false"/>
+  </property>
+</channel>
\ No newline at end of file