diff --git a/defaults/main.yml b/defaults/main.yml
index 10dd091..44b67a0 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -68,9 +68,5 @@ i3_xautolock: true
 i3_screensaver_time: '90'
 i3_disable_beep: true
 
-#
-# enable_lock_after_time: false
-# lock_after_time: '90'  # minutes to wait until your screen is locked
-
 # version check for this role?
 submodules_versioncheck: true
diff --git a/templates/config.j2 b/templates/config.j2
index 4a35e62..1b5f92d 100644
--- a/templates/config.j2
+++ b/templates/config.j2
@@ -194,7 +194,7 @@ exec_always xset b off
 {% endif %}
 
 {% if i3_xautolock | bool %}
-exec xautolock -time {{ lock_after_time }} -locker 'maim /tmp/screen_locked.png; mogrify -scale 10% -scale 1000% /tmp/screen_locked.png; i3lock -i /tmp/screen_locked.png'
+exec xautolock -time {{ i3_screensaver_time }} -locker 'maim /tmp/screen_locked.png; mogrify -scale 10% -scale 1000% /tmp/screen_locked.png; i3lock -i /tmp/screen_locked.png'
 {% endif %}
 
 # Start Default Applications
diff --git a/vars/main.yml b/vars/main.yml
index b887a1f..28a9579 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -33,5 +33,5 @@ __i3_workspaces:
 
 user: "{{ i3wm_user }}"
 
-playbook_version_number: 9028  # should be int
+playbook_version_number: 9029  # should be int
 playbook_version_path: 'role-i3wm_chaos-bodensee_github.com.version'