diff --git a/tasks/main.yml b/tasks/main.yml
index be685a22bb4c8037616876809f2e09aa996a4a7d..eceef6e7f2033990a5cde7449ae9663979cbbf79 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,30 +1,32 @@
 ---
-  - name: Uploading service file
-    template:
-        src: service.j2
-        dest: "{{ systemd_base_path | default('/etc/systemd/system') }}/{{ item.key }}.service"
-        owner: "{{ item.value.timer_user | default('root') }}"
-        group: "{{ item.value.timer_user | default('root') }}"
-        mode: 0644
-    with_dict: "{{ timers }}"
-    notify: Reload systemd
+  - name: Upload files and enable timer
+    
+    block:
+      - name: Uploading service file
+        template:
+            src: service.j2
+            dest: "{{ systemd_base_path | default('/etc/systemd/system') }}/{{ item.key }}.service"
+            owner: "{{ item.value.timer_user | default('root') }}"
+            group: "{{ item.value.timer_user | default('root') }}"
+            mode: 0644
+        with_dict: "{{ timers }}"
 
-  - name: Uploading timer file
-    template:
-        src: timer.j2
-        dest: "{{ systemd_base_path | default('/etc/systemd/system') }}/{{ item.key }}.timer"
-        owner: "{{ item.value.timer_user | default('root') }}"
-        group: "{{ item.value.timer_user | default('root') }}"
-        mode: 0644
-    with_dict: "{{ timers }}"
-    notify: Reload systemd
+      - name: Uploading timer file
+        template:
+            src: timer.j2
+            dest: "{{ systemd_base_path | default('/etc/systemd/system') }}/{{ item.key }}.timer"
+            owner: "{{ item.value.timer_user | default('root') }}"
+            group: "{{ item.value.timer_user | default('root') }}"
+            mode: 0644
+        with_dict: "{{ timers }}"
 
-  - name: Enabling timers
-    systemd:
-        name: "{{ item.key }}.timer"
-        state: restarted
-        enabled: true
-        masked: false
-        daemon_reload: true
-        scope: "{{ systemd_scope | default('system') }}"
-    with_dict: "{{ timers }}"
\ No newline at end of file
+      - name: Enabling timers
+        systemd:
+            name: "{{ item.key }}.timer"
+            state: restarted
+            enabled: true
+            masked: false
+            scope: "{{ systemd_scope | default('system') }}"
+        with_dict: "{{ timers }}"
+    
+    notify: Reload systemd
\ No newline at end of file