diff --git a/ansible/playbooks/checkmk.yml b/ansible/playbooks/checkmk.yml
index a92dd14..d29c1e1 100644
--- a/ansible/playbooks/checkmk.yml
+++ b/ansible/playbooks/checkmk.yml
@@ -123,25 +123,27 @@
       block:
         - name: Gather Facts
           setup:
-          tags: 
-            - checkmk_all
-            - checkmk_agent
+          tags: checkmk_agent
 
         - name: Install CheckMK agent on VMs
           import_role:
             name: agent
-          tags: 
-            - checkmk_all
-            - checkmk_agent
+          tags: checkmk_agent
 
-        - name: TLS registrtion
-          block: 
-            - name: register for TLS
-              win_shell: |
-                sl 'C:\Program Files (x86)\checkmk\service'
-                .\cmk-agent-ctl register --hostname {{ inventory_hostname }} --server {{ checkmk_server }} --site {{ checkmk_agent_site }} --user {{ checkmk_agent_user }} --password '{{ checkmk_password }}' --trust-cert
-          tags: 
-            - checkmk_host
-            - checkmk_tls
-            - checkmk_all
-          
\ No newline at end of file
+      rescue:
+        - name: restart agent service
+          win_shell: |
+            powershell Restart-Service -Name CheckmkService
+          tags: always
+
+        - name: Retry agent installation
+          import_role:
+            name: agent
+          tags: always
+
+      always:
+        - name: register for TLS
+          win_shell: |
+            sl 'C:\Program Files (x86)\checkmk\service'
+            .\cmk-agent-ctl register --hostname {{ inventory_hostname }} --server {{ checkmk_server }} --site {{ checkmk_agent_site }} --user {{ checkmk_agent_user }} --password '{{ checkmk_password }}' --trust-cert
+      tags: [checkmk_all, checkmk_agent, checkmk_tls]