diff --git a/gdm/screensaver-long b/gdm/screensaver-long
new file mode 100644
index 0000000..8a2d014
--- /dev/null
+++ b/gdm/screensaver-long
@@ -0,0 +1,8 @@
+[org/gnome/desktop/session]
+# Number of seconds of inactivity before the screen goes blank
+# Set to 0 seconds if you want to deactivate the screensaver.
+idle-delay=uint32 1800
+
+[org/gnome/desktop/screensaver]
+# Number of seconds after the screen is blank before locking the screen
+lock-delay=uint32 60
diff --git a/gdm/screensaver-short b/gdm/screensaver-short
new file mode 100644
index 0000000..33451c2
--- /dev/null
+++ b/gdm/screensaver-short
@@ -0,0 +1,8 @@
+[org/gnome/desktop/session]
+# Number of seconds of inactivity before the screen goes blank
+# Set to 0 seconds if you want to deactivate the screensaver.
+idle-delay=uint32 180
+
+[org/gnome/desktop/screensaver]
+# Number of seconds after the screen is blank before locking the screen
+lock-delay=uint32 10
diff --git a/gnome-config.yaml b/gnome-config.yaml
index 4f1bba7..d1ef197 100644
--- a/gnome-config.yaml
+++ b/gnome-config.yaml
@@ -23,13 +23,24 @@
     - name: GDM login screen configuration - don't show all users
       copy:
         src: 'gdm/login-screen'
-        dest: '/etc/dconf/db/gdm.d/login-screen' 
+        dest: '/etc/dconf/db/gdm.d/login-screen'
 
     - name: GDM login screen configuration - disable accessibility
       # Not working, perhaps broken GDM
       copy:
         src: 'gdm/accessibility'
-        dest: '/etc/dconf/db/gdm.d/accessibility' 
+        dest: '/etc/dconf/db/gdm.d/accessibility'
+
+    - name: GDM screensaver with short delay
+      copy:
+        src: 'gdm/screensaver-short'
+        dest: '/etc/dconf/db/local.d/screensaver'
+
+    - name: GDM screensaver with long delay
+      when: inventory_hostname in groups['ucitelske']
+      copy:
+        src: 'gdm/screensaver-long'
+        dest: '/etc/dconf/db/local.d/screensaver'
 
     - name: Update dconf database
       command: "dconf update"