diff --git a/roles/restart-docker/tasks/main.yml b/roles/restart-docker/tasks/main.yml
index 3f2087c6..fa41a109 100644
--- a/roles/restart-docker/tasks/main.yml
+++ b/roles/restart-docker/tasks/main.yml
@@ -9,29 +9,25 @@
     copy:
       src: restart-docker.py
       dest: "{{restart_docker_script}}"
-    when: run_once_restart_docker is not defined
 
   - name: configure restart-docker.cymais.service
     template: 
       src: restart-docker.service.j2
       dest: /etc/systemd/system/restart-docker.cymais.service
     notify: "reload restart-docker.cymais.service"
-    when: run_once_restart_docker is not defined
 
   - name: set service_name to the name of the current role
     set_fact:
       service_name: "{{ role_name }}"
-  when: run_once_restart_docker is not defined
-when: run_once_restart_docker is not defined
 
-- name: "include role for systemd-timer for {{service_name}}"
-  include_role:
-    name: systemd-timer
-  vars:
-    on_calendar:  "{{on_calendar_restart_docker}}"
-  when: run_once_restart_docker is not defined
+  - name: "include role for systemd-timer for {{service_name}}"
+    include_role:
+      name: systemd-timer
+    vars:
+      on_calendar:  "{{on_calendar_restart_docker}}"
 
-- name: run the restart_docker_volumes tasks once
-  set_fact:
-    run_once_restart_docker: true
+  - name: run the restart_docker_volumes tasks once
+    set_fact:
+      run_once_restart_docker: true
+      
   when: run_once_restart_docker is not defined
\ No newline at end of file