diff --git a/handlers/main.yml b/handlers/main.yml
index dd07b9b..19df154 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -21,6 +21,10 @@
   loop: "{{ systemd_socket.results }}"
   loop_control:
     loop_var: socket_results
+  args:
+    apply:
+      tags:
+        - systemd-service
   tags:
    - systemd-service
 
@@ -28,6 +32,10 @@
 - name: Restart changed services
   include_tasks: handlers/systemd_restart.yml
   listen: systemd service changed
+  args:
+    apply:
+      tags:
+        - systemd-service
   when:
     - 'services_results.item.restart_changed | default(systemd_service_restart_changed) | bool'
     - 'services_results.item.state is not defined'
diff --git a/tasks/main.yml b/tasks/main.yml
index a74aa80..42b9a82 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -147,6 +147,10 @@
   loop: "{{ systemd_services }}"
   loop_control:
     loop_var: service
+  args:
+    apply:
+      tags:
+        - systemd-service
   tags:
     - systemd-service