diff --git a/roles/sys-ctl-bkp-docker-2-loc/tasks/01_core.yml b/roles/sys-ctl-bkp-docker-2-loc/tasks/01_core.yml
index 7de27430..cb7ac1ed 100644
--- a/roles/sys-ctl-bkp-docker-2-loc/tasks/01_core.yml
+++ b/roles/sys-ctl-bkp-docker-2-loc/tasks/01_core.yml
@@ -23,4 +23,6 @@
     system_service_tpl_exec_start_pre:  '/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(" ")  }} --ignore {{ SYS_SERVICE_BACKUP_DOCKER_2_LOC }} --timeout "{{ SYS_TIMEOUT_BACKUP_SERVICES }}"'
     system_service_tpl_exec_start:      "/bin/sh -c '{{ BKP_DOCKER_2_LOC_EXEC }}'"
     system_service_tpl_on_failure:      "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }} {{ SYS_SERVICE_CLEANUP_BACKUPS_FAILED }}"
-    system_service_tpl_exec_start_post: "/usr/bin/systemctl start {{ SYS_SERVICE_CLEANUP_BACKUPS }}"
+    # system_service_tpl_exec_start_post: "/usr/bin/systemctl start {{ SYS_SERVICE_CLEANUP_BACKUPS }}" # Not possible to use it because it's a deathlock. Keep this line for documentation purposes
+
+- include_tasks: utils/run_once.yml
\ No newline at end of file
diff --git a/roles/sys-ctl-bkp-docker-2-loc/tasks/main.yml b/roles/sys-ctl-bkp-docker-2-loc/tasks/main.yml
index 71f1f771..9b89e326 100644
--- a/roles/sys-ctl-bkp-docker-2-loc/tasks/main.yml
+++ b/roles/sys-ctl-bkp-docker-2-loc/tasks/main.yml
@@ -1,6 +1,5 @@
 - block:
     - include_tasks: 01_core.yml
-    - include_tasks: utils/run_once.yml
   when: 
     - run_once_sys_ctl_bkp_docker_2_loc is not defined
 
diff --git a/roles/sys-ctl-cln-bkps/tasks/01_core.yml b/roles/sys-ctl-cln-bkps/tasks/01_core.yml
index 022bbcac..1920b0ac 100644
--- a/roles/sys-ctl-cln-bkps/tasks/01_core.yml
+++ b/roles/sys-ctl-cln-bkps/tasks/01_core.yml
@@ -19,4 +19,8 @@
     system_service_tpl_on_failure:      "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"
     system_service_tpl_exec_start:      "{{ system_service_script_exec }} --backups-folder-path {{ BACKUPS_FOLDER_PATH }} --maximum-backup-size-percent {{SIZE_PERCENT_MAXIMUM_BACKUP}}"
     system_service_tpl_exec_start_pre:  '/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(" ")  }} --ignore {{ SYS_SERVICE_GROUP_CLEANUP | join(" ") }} --timeout "{{ SYS_TIMEOUT_BACKUP_SERVICES }}"'
-    system_service_copy_files:          true
\ No newline at end of file
+    system_service_copy_files:          true
+
+- include_tasks: utils/run_once.yml
+  vars:
+    flush_handlers: true
\ No newline at end of file
diff --git a/roles/sys-ctl-cln-bkps/tasks/main.yml b/roles/sys-ctl-cln-bkps/tasks/main.yml
index 0c53246c..a4c8a54b 100644
--- a/roles/sys-ctl-cln-bkps/tasks/main.yml
+++ b/roles/sys-ctl-cln-bkps/tasks/main.yml
@@ -1,6 +1,3 @@
 - block:
     - include_tasks: 01_core.yml
-    - include_tasks: utils/run_once.yml
-      vars:
-        flush_handlers: true
   when: run_once_sys_ctl_cln_bkps is not defined
diff --git a/roles/sys-ctl-cln-faild-bkps/tasks/01_core.yml b/roles/sys-ctl-cln-faild-bkps/tasks/01_core.yml
index f60c51cc..0580a9e6 100644
--- a/roles/sys-ctl-cln-faild-bkps/tasks/01_core.yml
+++ b/roles/sys-ctl-cln-faild-bkps/tasks/01_core.yml
@@ -21,3 +21,5 @@
     system_service_tpl_on_failure:      "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"
     system_service_tpl_exec_start:      '/bin/sh -c "{{ CLEANUP_FAILED_BACKUPS_PKG }} --all --workers {{ CLEANUP_FAILED_BACKUPS_WORKERS }} --yes"'
     system_service_tpl_exec_start_pre:  '/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(" ")  }} --ignore {{ SYS_SERVICE_GROUP_CLEANUP| join(" ") }} --timeout "{{ SYS_TIMEOUT_CLEANUP_SERVICES }}"'
+
+- include_tasks: utils/run_once.yml
diff --git a/roles/sys-ctl-cln-faild-bkps/tasks/main.yml b/roles/sys-ctl-cln-faild-bkps/tasks/main.yml
index d2e94209..bd25969a 100644
--- a/roles/sys-ctl-cln-faild-bkps/tasks/main.yml
+++ b/roles/sys-ctl-cln-faild-bkps/tasks/main.yml
@@ -1,4 +1,3 @@
 - block:
     - include_tasks: 01_core.yml
-    - include_tasks: utils/run_once.yml
   when: run_once_sys_ctl_cln_faild_bkps is not defined
\ No newline at end of file