diff --git a/tasks/RedHat-register.yml b/tasks/RedHat-register.yml
index 3e1beaa..02db0e5 100644
--- a/tasks/RedHat-register.yml
+++ b/tasks/RedHat-register.yml
@@ -5,10 +5,12 @@
         --secret {{ cmk_secret }}
       changed_when: false
       notify: remove agent
+      tags: cmk_register
   rescue:
     - name: Gather facts of packages
       package_facts:
         manager: "auto"
+      tags: cmk_register
 
     - name: Ensure check_mk_agent installed (again)
       command: /usr/bin/yum install --nogpgcheck -y /tmp/check-mk-agent.rpm
@@ -18,10 +20,12 @@
         - restart xinetd
         - ensure firewall open
       when: "'check-mk-agent' not in ansible_facts.packages"
+      tags: cmk_register
 
     - name: Gather facts of packages (again)
       package_facts:
         manager: "auto"
+      tags: cmk_register
 
     - name: Register with CheckMK Update Server (retry)
       shell: |
@@ -30,3 +34,4 @@
       changed_when: false
       when: "'check-mk-agent' in ansible_facts.packages"
       notify: remove agent
+      tags: cmk_register
diff --git a/tasks/Windows-register.yml b/tasks/Windows-register.yml
index 86e2d75..87d3eb8 100644
--- a/tasks/Windows-register.yml
+++ b/tasks/Windows-register.yml
@@ -3,4 +3,5 @@
     C:\ProgramData\checkmk\agent\plugins\cmk-update-agent.exe register `
     -H $env:computername `
     --user {{ cmk_username }} `
-    --secret {{ cmk_secret }}
\ No newline at end of file
+    --secret {{ cmk_secret }}
+  tags: cmk_register
\ No newline at end of file