diff --git a/tasks/lockscreen.yaml b/tasks/lockscreen.yaml
index 32e76e5..3e596ac 100644
--- a/tasks/lockscreen.yaml
+++ b/tasks/lockscreen.yaml
@@ -5,18 +5,18 @@
     src: lockscreen/lockscreen.env.j2
     dest: ~/.lockscreen.env
 
+- name: screensaver shell script
+  template:
+    src: lockscreen/screensaver.sh.j2
+    dest: ~/.screensaver.sh
+    mode: 0755
+
 - name: lockscreen graphical-session service
   template:
     src: lockscreen/lockscreen.service.j2
     dest: ~/.config/systemd/user/lockscreen.service
   notify: systemd daemon-reload
 
-- name: lockscreen-auto graphical-session service
-  template:
-    src: lockscreen/lockscreen-auto.service.j2
-    dest: ~/.config/systemd/user/lockscreen-auto.service
-  notify: systemd daemon-reload
-
 - name: lockscreen graphical-session service enabled
   systemd:
     name: lockscreen.service
diff --git a/templates/lockscreen/lockscreen-auto.service.j2 b/templates/lockscreen/lockscreen-auto.service.j2
deleted file mode 100644
index aded42e..0000000
--- a/templates/lockscreen/lockscreen-auto.service.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-{{ ansible_managed | comment }}
-
-[Unit]
-Description=Screensaver
-PartOf=graphical-session.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/xss-lock -l -- systemctl --user start lockscreen.service
-Restart=always
-
-[Install]
-WantedBy=graphical-session.target
diff --git a/templates/lockscreen/lockscreen.env.j2 b/templates/lockscreen/lockscreen.env.j2
index d0ccad1..4d71293 100644
--- a/templates/lockscreen/lockscreen.env.j2
+++ b/templates/lockscreen/lockscreen.env.j2
@@ -1,5 +1,4 @@
 {{ ansible_managed | comment }}
 
-#XSECURELOCK_SAVER=$HOME/bin/screensaver
 XSECURELOCK_AUTH_BACKGROUND_COLOR={{home_base_color_hue|hsv2rgb(66,47)}}
 XSECURELOCK_SWITCH_USER_COMMAND=dm-tool switch-to-greeter
diff --git a/templates/lockscreen/lockscreen.service.j2 b/templates/lockscreen/lockscreen.service.j2
index b288491..ae77998 100644
--- a/templates/lockscreen/lockscreen.service.j2
+++ b/templates/lockscreen/lockscreen.service.j2
@@ -5,10 +5,11 @@ Description=Screensaver
 PartOf=graphical-session.target
 
 [Service]
-Type=notify
-ExecStart=xsecurelock -- systemd-notify --ready
-NotifyAccess=all
+Type=simple
+ExecStart=/usr/bin/xss-lock -l -- xsecurelock
 EnvironmentFile=%h/.lockscreen.env
+Environment="XSECURELOCK_SAVER=%h/.screensaver.sh"
+Restart=always
 
 [Install]
 WantedBy=graphical-session.target
diff --git a/files/bin/screensaver b/templates/lockscreen/screensaver.sh.j2
similarity index 100%
rename from files/bin/screensaver
rename to templates/lockscreen/screensaver.sh.j2