diff --git a/roles/cleanup-failed-docker-backups/handlers/main.yml b/roles/cleanup-failed-docker-backups/handlers/main.yml
index 1c6378ef..ecb75867 100644
--- a/roles/cleanup-failed-docker-backups/handlers/main.yml
+++ b/roles/cleanup-failed-docker-backups/handlers/main.yml
@@ -1,5 +1,6 @@
-- name: "reload cleanup-failed-docker-backups.cymais.service daemon"
+- name: "Reload and restart cleanup-failed-docker-backups.cymais.service"
   systemd:
     name: cleanup-failed-docker-backups.cymais.service
     enabled: yes
-    daemon_reload: yes
\ No newline at end of file
+    daemon_reload: yes
+    state: restarted
\ No newline at end of file
diff --git a/roles/cleanup-failed-docker-backups/tasks/main.yml b/roles/cleanup-failed-docker-backups/tasks/main.yml
index 126bcad8..7bed2f01 100644
--- a/roles/cleanup-failed-docker-backups/tasks/main.yml
+++ b/roles/cleanup-failed-docker-backups/tasks/main.yml
@@ -10,16 +10,16 @@
   register: pkgmgr_output
   when: run_once_cleanup_failed_docker_backups is not defined
 
-- name: Set fact for backup_docker_to_local_cleanup_folder
+- name: Set fact for backup_docker_to_local_cleanup_script
   set_fact:
-    backup_docker_to_local_cleanup_folder: "{{ pkgmgr_output.stdout }}"
+    backup_docker_to_local_cleanup_script: "{{ pkgmgr_output.stdout.rstrip('/') ~ '/cleanup-all.sh' }}"
   when: run_once_cleanup_failed_docker_backups is not defined
 
 - name: configure cleanup-failed-docker-backups.cymais.service
-  template: 
+  template:
     src: cleanup-failed-docker-backups.service.j2
     dest: /etc/systemd/system/cleanup-failed-docker-backups.cymais.service
-  notify: reload cleanup-failed-docker-backups.cymais.service daemon
+  notify: Reload and restart cleanup-failed-docker-backups.cymais.service
   when: run_once_cleanup_failed_docker_backups is not defined
 
 - name: set service_name to the name of the current role
diff --git a/roles/cleanup-failed-docker-backups/templates/cleanup-failed-docker-backups.service.j2 b/roles/cleanup-failed-docker-backups/templates/cleanup-failed-docker-backups.service.j2
index 6d0c3ecb..c017ad2a 100644
--- a/roles/cleanup-failed-docker-backups/templates/cleanup-failed-docker-backups.service.j2
+++ b/roles/cleanup-failed-docker-backups/templates/cleanup-failed-docker-backups.service.j2
@@ -5,4 +5,4 @@ OnFailure=systemd-notifier.cymais@%n.service
 [Service]
 Type=oneshot
 ExecStartPre=/bin/sh -c '/usr/bin/python {{ path_system_lock_script }} {{ system_maintenance_services | join(' ')  }} --ignore {{system_maintenance_cleanup_services| join(' ') }} --timeout "{{system_maintenance_lock_timeout_backup_services}}"'
-ExecStart=/bin/sh -c '/usr/bin/yes | /usr/bin/bash {{backup_docker_to_local_cleanup_folder}}cleanup-all.sh'
\ No newline at end of file
+ExecStart=/bin/sh -c '/usr/bin/yes | /usr/bin/bash {{backup_docker_to_local_cleanup_script}}'
\ No newline at end of file