diff --git a/packer/ansible/roles/windowmanager/files/apt-preferences-mate-desktop b/packer/ansible/roles/windowmanager/files/apt-preferences-mate-desktop
new file mode 100644
index 0000000..760a4d8
--- /dev/null
+++ b/packer/ansible/roles/windowmanager/files/apt-preferences-mate-desktop
@@ -0,0 +1,7 @@
+Package: mate-screensaver
+Pin: release o=Debian
+Pin-Priority: -1
+
+Package: mate-screensaver-common
+Pin: release o=Debian
+Pin-Priority: -1
diff --git a/packer/ansible/roles/windowmanager/files/autostart b/packer/ansible/roles/windowmanager/files/autostart
index d29db82..a864d68 100755
--- a/packer/ansible/roles/windowmanager/files/autostart
+++ b/packer/ansible/roles/windowmanager/files/autostart
@@ -11,6 +11,9 @@ gsettings set org.mate.background picture-filename '/etc/lightdm/bg.jpg'
 gsettings set org.mate.interface font-name 'Roboto 10'
 gsettings set org.mate.interface document-font-name 'Roboto 10'
 
+# disable screensaver / screen blanking
+xset s off -dpms
+
 if echo $USER | grep -E 'guest-*'; then
 	gsettings set org.mate.screensaver lock-enabled false
 	zenity \
diff --git a/packer/ansible/roles/windowmanager/tasks/mate.yml b/packer/ansible/roles/windowmanager/tasks/mate.yml
index 23ab80f..2f296d1 100644
--- a/packer/ansible/roles/windowmanager/tasks/mate.yml
+++ b/packer/ansible/roles/windowmanager/tasks/mate.yml
@@ -1,4 +1,9 @@
 ---
+- name: configure apt preferences for mate-desktop components
+  copy:
+    src: apt-preferences-mate-desktop
+    dest: /etc/apt/preferences.d/mate-desktop
+
 - name: install mate
   apt:
     name: "task-mate-desktop"
@@ -19,8 +24,3 @@
   copy:
     src: autostart.desktop
     dest: /etc/skel/.config/autostart/autostart.desktop
-
-- name: disable screensaver
-  file:
-    path: /etc/xdg/autostart/mate-screensaver.desktop
-    state: absent