diff --git a/roles/borgbackup_client/handlers/main.yml b/roles/borgbackup_client/handlers/main.yml
index 426cc4e..60f493a 100644
--- a/roles/borgbackup_client/handlers/main.yml
+++ b/roles/borgbackup_client/handlers/main.yml
@@ -2,16 +2,4 @@
 - name: Run systemd daemon-reload
   systemd:
     daemon_reload: true
-
-- name: Start and enable borgmatic timer
-  systemd:
-    name: borgmatic.timer
-    state: started
-    enabled: true
-
-- name: Start and enable borgmatic service
-  systemd:
-    name: borgmatic.service
-    state: started
-    enabled: true
 ...
diff --git a/roles/borgbackup_client/tasks/main.yml b/roles/borgbackup_client/tasks/main.yml
index b396017..090bda3 100644
--- a/roles/borgbackup_client/tasks/main.yml
+++ b/roles/borgbackup_client/tasks/main.yml
@@ -81,6 +81,18 @@
     - Start and enable borgmatic timer
     - Start and enable borgmatic service
 
+- name: Start and enable borgmatic timer
+  systemd:
+    name: borgmatic.timer
+    state: started
+    enabled: true
+
+- name: Start and enable borgmatic service
+  systemd:
+    name: borgmatic.service
+    state: started
+    enabled: true
+
 - include_role: update_motd
   vars:
     key: 10-borgmatic