diff --git a/group_vars/all/08_timer.yml b/group_vars/all/08_timer.yml
index 9e948ade..60b3a656 100644
--- a/group_vars/all/08_timer.yml
+++ b/group_vars/all/08_timer.yml
@@ -8,6 +8,7 @@ SYS_TIMER_SUFFIX:   ".{{ SOFTWARE_NAME | lower }}.timer"
 
 HOURS_SERVER_AWAKE:   "0..23" # Ours in which the server is "awake" (100% working). Rest of the time is reserved for maintanance
 RANDOMIZED_DELAY_SEC: "5min"  # Random delay for systemd timers to avoid peak loads.
+
 ACTIVATE_ALL_TIMERS:  false   # Runtime Variables for Process Control - Activates all timers, independend if the handlers had been triggered
 
 ## Timeouts for all services
diff --git a/roles/sys-ctl-cln-certs/tasks/01_core.yml b/roles/sys-ctl-cln-certs/tasks/01_core.yml
index 4209e11e..19f1d6bc 100644
--- a/roles/sys-ctl-cln-certs/tasks/01_core.yml
+++ b/roles/sys-ctl-cln-certs/tasks/01_core.yml
@@ -13,6 +13,7 @@
 
 - include_role:
     name: sys-systemctl
+  vars:
     systemctl_timer_enabled:  true
     systemctl_on_calendar:    "{{ SYS_SCHEDULE_CLEANUP_CERTS }}"
     systemctl_copy_files:     false
diff --git a/roles/sys-ctl-cln-disc-space/templates/scripts.sh.j2 b/roles/sys-ctl-cln-disc-space/templates/script.sh.j2
similarity index 100%
rename from roles/sys-ctl-cln-disc-space/templates/scripts.sh.j2
rename to roles/sys-ctl-cln-disc-space/templates/script.sh.j2
diff --git a/roles/sys-ctl-mtn-cert-renew/tasks/01_core.yml b/roles/sys-ctl-mtn-cert-renew/tasks/01_core.yml
index 8bed7aab..955a3392 100644
--- a/roles/sys-ctl-mtn-cert-renew/tasks/01_core.yml
+++ b/roles/sys-ctl-mtn-cert-renew/tasks/01_core.yml
@@ -17,5 +17,5 @@
   vars:
     systemctl_copy_files: false
     systemctl_on_calendar: "{{ SYS_SCHEDULE_MAINTANANCE_LETSENCRYPT_RENEW }}"
-    persistent: "true"
+    persistent: true
     systemctl_timer_enabled:  true