diff --git a/tsm-backup/handlers/main.yml b/tsm-backup/handlers/main.yml
index 9dc961764e38be281790756efa9222fe8e404e1f..3cd6c3af4d77f56a919b0fa49ee819a0b5a5118e 100644
--- a/tsm-backup/handlers/main.yml
+++ b/tsm-backup/handlers/main.yml
@@ -1,8 +1,15 @@
 ---
-# file: tsm-backup/handlers/main.yml
 
 - name: reload systemd service files
-  command: systemctl daemon-reload
+  systemd:
+    daemon_reload: true
 
 - name: restart tsm service
-  service: name=dsmcad state=restarted
+  service:
+    name: dsmcad
+    state: restarted
+
+- name: stop dsmc sched service
+  service:
+    name: dsmc
+    state: stopped
diff --git a/tsm-backup/tasks/main.yml b/tsm-backup/tasks/main.yml
index dcf76eac951cedf37a74f13e8d310acc00c71ca6..08fdf38b91e30ff3346c70d379f3f91c243c3921 100644
--- a/tsm-backup/tasks/main.yml
+++ b/tsm-backup/tasks/main.yml
@@ -16,18 +16,11 @@
     state: absent
   notify:
     - reload systemd service files
+    - stop dsmc sched service
   tags:
     - tsm
   register: cleanup
 
-- name: ensure dsmc sched service is stopped
-  service:
-    name: dsmc
-    state: stopped
-  tags:
-    - tsm
-  when: cleanup.changed
-
 - meta: flush_handlers
 
 - name: ensure deployment of our config