diff --git a/tasks/main.yaml b/tasks/main.yaml
index 07fac52..359d1e7 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -7,6 +7,7 @@
 - import_tasks: vnc.yaml
 - import_tasks: tmux.yaml
 - import_tasks: pulseaudio.yaml
+- import_tasks: screensaver.yaml
 - import_tasks: git.yaml
 
 - import_tasks: kanboard.yaml
diff --git a/tasks/screensaver.yaml b/tasks/screensaver.yaml
new file mode 100644
index 0000000..6aafc28
--- /dev/null
+++ b/tasks/screensaver.yaml
@@ -0,0 +1,10 @@
+---
+
+- name: screensaver graphical-session service enabled
+  systemd:
+    name: screensaver.service
+    enabled: true
+    scope: user
+  when:
+    - home_profile != "presentation"
+    - home_profile != "vdesk"