diff --git a/ansible/playbooks/checkmk.yml b/ansible/playbooks/checkmk.yml
index baab0e2..f315106 100644
--- a/ansible/playbooks/checkmk.yml
+++ b/ansible/playbooks/checkmk.yml
@@ -1,6 +1,7 @@
 ---
 - name: CheckMK Agent
   hosts: "meta-win_project_{{ win_project }}:&meta-os_windows"
+  gather_facts: false
   collections:
     - checkmk.general
   vars_files:
@@ -9,11 +10,19 @@
     - ../vars/connection.yml
   tasks: 
     - name: Install CheckMK agent on VMs
-      import_role:
-        name: agent
-      tags: 
-        - checkmk
-        - checkmk_agent
+      block:
+        - name: Gather Facts
+          setup:
+          tags: 
+            - checkmk_all
+            - checkmk_agent
+
+        - name: Install CheckMK agent on VMs
+          import_role:
+            name: agent
+          tags: 
+            - checkmk_all
+            - checkmk_agent
 
 - name: CheckMK Hosts
   hosts: "meta-win_project_{{ win_project }}:&meta-os_windows"