diff --git a/roles/svc-bkp-rmt-2-loc/templates/systemctl.service.j2 b/roles/svc-bkp-rmt-2-loc/templates/systemctl.service.j2
index 05e3780a..d1543319 100644
--- a/roles/svc-bkp-rmt-2-loc/templates/systemctl.service.j2
+++ b/roles/svc-bkp-rmt-2-loc/templates/systemctl.service.j2
@@ -6,4 +6,3 @@ OnFailure={{ SYS_SERVICE_ON_FAILURE_COMPOSE }} {{ SYS_SERVICE_CLEANUP_BACKUPS_FA
 Type=oneshot
 ExecStartPre=/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ')  }} --ignore {{ SYS_SERVICE_GROUP_BACKUPS | join(' ') }} --timeout "{{ SYS_TIMEOUT_BACKUP_SERVICES }}"
 ExecStart={{ system_service_script_exec }}
-
diff --git a/roles/sys-ctl-hlth-btrfs/tasks/01_core.yml b/roles/sys-ctl-hlth-btrfs/tasks/01_core.yml
index 37e50a1b..fdc30d76 100644
--- a/roles/sys-ctl-hlth-btrfs/tasks/01_core.yml
+++ b/roles/sys-ctl-hlth-btrfs/tasks/01_core.yml
@@ -6,5 +6,6 @@
 - include_role:
     name: sys-service
   vars:
-    system_service_on_calendar: "{{SYS_SCHEDULE_HEALTH_BTRFS}}"
-    system_service_timer_enabled:  true
\ No newline at end of file
+    system_service_on_calendar:   "{{SYS_SCHEDULE_HEALTH_BTRFS}}"
+    system_service_timer_enabled:  true
+    system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"
\ No newline at end of file
diff --git a/roles/sys-ctl-hlth-csp/tasks/01_core.yml b/roles/sys-ctl-hlth-csp/tasks/01_core.yml
index 7bdd6764..233da99d 100644
--- a/roles/sys-ctl-hlth-csp/tasks/01_core.yml
+++ b/roles/sys-ctl-hlth-csp/tasks/01_core.yml
@@ -13,5 +13,6 @@
 - include_role:
     name: sys-service
   vars:
-    system_service_on_calendar: "{{ SYS_SCHEDULE_HEALTH_CSP_CRAWLER }}"
-    system_service_timer_enabled: true
+    system_service_on_calendar:     "{{ SYS_SCHEDULE_HEALTH_CSP_CRAWLER }}"
+    system_service_timer_enabled:   true
+    system_service_tpl_on_failure:  "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"
diff --git a/roles/sys-ctl-hlth-disc-space/tasks/main.yml b/roles/sys-ctl-hlth-disc-space/tasks/main.yml
index 808a152f..4534fc28 100644
--- a/roles/sys-ctl-hlth-disc-space/tasks/main.yml
+++ b/roles/sys-ctl-hlth-disc-space/tasks/main.yml
@@ -4,10 +4,12 @@
       name: sys-ctl-alm-compose
     when: run_once_sys_ctl_alm_compose is not defined
   - include_tasks: utils/run_once.yml
+  - include_role:
+      name: sys-service
+      vars:
+        system_service_on_calendar:    "{{ SYS_SCHEDULE_HEALTH_DISC_SPACE }}"
+        system_service_timer_enabled:  true
+        system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"
+  - name: "Flush handlers a second time"
+    include_tasks: utils/run_once.yml
   when: run_once_sys_ctl_hlth_disc_space is not defined
-
-- include_role:
-    name: sys-service
-  vars:
-    system_service_on_calendar:    "{{ SYS_SCHEDULE_HEALTH_DISC_SPACE }}"
-    system_service_timer_enabled:  true
diff --git a/roles/sys-ctl-hlth-docker-container/tasks/01_core.yml b/roles/sys-ctl-hlth-docker-container/tasks/01_core.yml
index 2322220c..ada38437 100644
--- a/roles/sys-ctl-hlth-docker-container/tasks/01_core.yml
+++ b/roles/sys-ctl-hlth-docker-container/tasks/01_core.yml
@@ -8,3 +8,4 @@
   vars:
     system_service_timer_enabled:  true
     system_service_on_calendar:    "{{ SYS_SCHEDULE_HEALTH_DOCKER_CONTAINER }}"
+    system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"
diff --git a/roles/sys-ctl-hlth-docker-volumes/tasks/01_core.yml b/roles/sys-ctl-hlth-docker-volumes/tasks/01_core.yml
index f93de064..9d9bc757 100644
--- a/roles/sys-ctl-hlth-docker-volumes/tasks/01_core.yml
+++ b/roles/sys-ctl-hlth-docker-volumes/tasks/01_core.yml
@@ -8,3 +8,4 @@
   vars:
     system_service_on_calendar: "{{SYS_SCHEDULE_HEALTH_DOCKER_VOLUMES}}"
     system_service_timer_enabled: true
+    system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"
diff --git a/roles/sys-ctl-hlth-journalctl/tasks/01_core.yml b/roles/sys-ctl-hlth-journalctl/tasks/01_core.yml
index 93830ad9..7e32d99b 100644
--- a/roles/sys-ctl-hlth-journalctl/tasks/01_core.yml
+++ b/roles/sys-ctl-hlth-journalctl/tasks/01_core.yml
@@ -6,5 +6,6 @@
 - include_role:
     name: sys-service
   vars:
-    system_service_on_calendar: "{{SYS_SCHEDULE_HEALTH_JOURNALCTL}}"
+    system_service_on_calendar:   "{{SYS_SCHEDULE_HEALTH_JOURNALCTL}}"
     system_service_timer_enabled:  true
+    system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"
diff --git a/roles/sys-ctl-hlth-msmtp/tasks/01_core.yml b/roles/sys-ctl-hlth-msmtp/tasks/01_core.yml
index 8a500d9f..b196a517 100644
--- a/roles/sys-ctl-hlth-msmtp/tasks/01_core.yml
+++ b/roles/sys-ctl-hlth-msmtp/tasks/01_core.yml
@@ -6,5 +6,6 @@
 - include_role:
     name: sys-service
   vars:
+    system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"
     system_service_on_calendar:    "{{ SYS_SCHEDULE_HEALTH_MSMTP }}"
     system_service_timer_enabled:  true
\ No newline at end of file
diff --git a/roles/sys-ctl-hlth-webserver/tasks/01_core.yml b/roles/sys-ctl-hlth-webserver/tasks/01_core.yml
index 2bfd8545..90e4b7f8 100644
--- a/roles/sys-ctl-hlth-webserver/tasks/01_core.yml
+++ b/roles/sys-ctl-hlth-webserver/tasks/01_core.yml
@@ -1,20 +1,20 @@
-- block:
-  - name: Include dependencies
-    include_role:
-      name: '{{ item }}'
-    loop:
-    - dev-python-pip
-    - sys-ctl-alm-compose
-  - include_tasks: utils/run_once.yml
-  when: run_once_sys_ctl_hlth_webserver is not defined
+- name: Include dependencies
+  include_role:
+    name: '{{ item }}'
+  loop:
+  - dev-python-pip
+  - sys-ctl-alm-compose
 
 - name: Install required Python modules
   community.general.pacman:
     name: python-requests
     state: present
 
+- meta: flush_handlers
+
 - include_role:
     name: sys-service
   vars:
-    system_service_on_calendar: "{{SYS_SCHEDULE_HEALTH_NGINX}}"
+    system_service_on_calendar: "{{ SYS_SCHEDULE_HEALTH_NGINX }}"
     system_service_timer_enabled:  true
+    system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"
diff --git a/roles/sys-ctl-mtn-cert-deploy/tasks/01_core.yml b/roles/sys-ctl-mtn-cert-deploy/tasks/01_core.yml
index 7259d8c3..94ca8143 100644
--- a/roles/sys-ctl-mtn-cert-deploy/tasks/01_core.yml
+++ b/roles/sys-ctl-mtn-cert-deploy/tasks/01_core.yml
@@ -1,12 +1,15 @@
 - name: Include dependency 'sys-ctl-alm-compose'
   include_role:
     name: sys-ctl-alm-compose
+    vars:
+      flush_handlers: true
   when: run_once_sys_ctl_alm_compose is not defined
 
 - include_role:
     name: sys-service
   vars:
-    system_service_state: restarted
-    system_service_on_calendar:  "{{ SYS_SCHEDULE_MAINTANANCE_LETSENCRYPT_DEPLOY }}"
-    persistent:   "true"
-    system_service_timer_enabled:  true
\ No newline at end of file
+    system_service_state:         restarted
+    system_service_on_calendar:   "{{ SYS_SCHEDULE_MAINTANANCE_LETSENCRYPT_DEPLOY }}"
+    persistent:                    "true"
+    system_service_timer_enabled:  true
+    system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"
\ No newline at end of file
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 a42fb369..3ea59420 100644
--- a/roles/sys-ctl-mtn-cert-renew/tasks/01_core.yml
+++ b/roles/sys-ctl-mtn-cert-renew/tasks/01_core.yml
@@ -15,7 +15,8 @@
 - include_role:
     name: sys-service
   vars:
-    system_service_copy_files: false
-    system_service_on_calendar: "{{ SYS_SCHEDULE_MAINTANANCE_LETSENCRYPT_RENEW }}"
-    persistent: true
-    system_service_timer_enabled:  true
+    system_service_copy_files:      false
+    system_service_on_calendar:     "{{ SYS_SCHEDULE_MAINTANANCE_LETSENCRYPT_RENEW }}"
+    persistent:                     true
+    system_service_timer_enabled:   true
+    system_service_tpl_on_failure:  "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"
diff --git a/roles/sys-ctl-rpr-btrfs-balancer/tasks/01_core.yml b/roles/sys-ctl-rpr-btrfs-balancer/tasks/01_core.yml
index b33308dc..e61b34ba 100644
--- a/roles/sys-ctl-rpr-btrfs-balancer/tasks/01_core.yml
+++ b/roles/sys-ctl-rpr-btrfs-balancer/tasks/01_core.yml
@@ -12,6 +12,7 @@
 - include_role:
     name: sys-service
   vars:
-    system_service_copy_files: false
-    system_service_on_calendar: "{{SYS_SCHEDULE_REPAIR_BTRFS_AUTO_BALANCER}}"
+    system_service_copy_files:    false
+    system_service_on_calendar:   "{{SYS_SCHEDULE_REPAIR_BTRFS_AUTO_BALANCER}}"
     system_service_timer_enabled:  true
+    system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"
diff --git a/roles/sys-ctl-rpr-docker-soft/tasks/01_core.yml b/roles/sys-ctl-rpr-docker-soft/tasks/01_core.yml
index b4087e5a..2e957db5 100644
--- a/roles/sys-ctl-rpr-docker-soft/tasks/01_core.yml
+++ b/roles/sys-ctl-rpr-docker-soft/tasks/01_core.yml
@@ -6,5 +6,6 @@
 - include_role:
     name: sys-service
   vars:
-    system_service_on_calendar: "{{SYS_SCHEDULE_REPAIR_DOCKER_SOFT}}"
+    system_service_on_calendar:   "{{SYS_SCHEDULE_REPAIR_DOCKER_SOFT}}"
     system_service_timer_enabled:  true
+    system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"