diff --git a/handlers/main.yml b/handlers/main.yml
index 56ab471..495b029 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -23,4 +23,6 @@
     - 'item.item.restart_changed | default(systemd_service_restart_changed) | bool'
     - 'item.item.state is not defined'
     - 'item.item.enabled | default(systemd_service_enabled) | bool'
-    - 'item | changed'
+    - 'item is changed'
+  tags:
+   - systemd-service
diff --git a/tasks/main.yml b/tasks/main.yml
index 7d69eb4..0bc49a4 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -22,7 +22,7 @@
     mode: "02755"
   with_items: "{{ systemd_services }}"
   tags:
-   - systemd-init
+    - systemd-service
 
 - name: Create TEMP service lock dir
   file:
@@ -33,7 +33,7 @@
     mode: "02755"
   with_items: "{{ systemd_services }}"
   tags:
-    - systemd-init
+    - systemd-service
 
 - name: Create TEMP defined lock dir
   file:
@@ -153,7 +153,7 @@
   systemd:
     daemon_reload: yes
   when:
-    - (systemd_services_result | changed) or (systemd_timer_result | changed)
+    - (systemd_services_result is changed) or (systemd_timer_result is changed)
 
 - name: Load service
   systemd: