diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Incredibuild/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Incredibuild/tasks/main.yml
index 598e006981..d9f7f4b60d 100644
--- a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Incredibuild/tasks/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Incredibuild/tasks/main.yml
@@ -7,17 +7,20 @@
   ansible.windows.win_service_info:
     name: IBXDashboard
   register: service_info
+  tags: incredibuild
 
 - name: Stop the IBX Dashboard service if it exists
   ansible.windows.win_service:
     name: IBXDashboard
     state: stopped
   when: service_info.exists
+  tags: incredibuild
 
 - name: Check if incredibuild.conf file exists
   win_stat:
     path: 'C:\Program Files (x86)\IncrediBuild\Dashboard\Apache24\conf\incredibuild.conf'
   register: incredibuild_conf_file
+  tags: incredibuild
 
 - name: Replace APACHE_PORT in incredibuild.conf if file exists
   win_lineinfile:
@@ -26,9 +29,11 @@
     line: 'define APACHE_PORT 31000'
     backup: yes
   when: incredibuild_conf_file.stat.exists
+  tags: incredibuild
 
 - name: Start the IBX Dashboard service if it exists
   ansible.windows.win_service:
     name: IBXDashboard
     state: started
   when: service_info.exists
+  tags: incredibuild
diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/MSVS_2022_REDIST/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/MSVS_2022_REDIST/tasks/main.yml
index ff4805b2e3..641e56fff4 100644
--- a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/MSVS_2022_REDIST/tasks/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/MSVS_2022_REDIST/tasks/main.yml
@@ -19,13 +19,13 @@
   tags: MSVS_2022_REDIST
 
 - name: Check if C:\openjdk\devkit exists
-  ansible.windows.win_stat:
+  win_stat:
     path: 'c:\openjdk\devkit'
   register: directory_status
   tags: MSVS_2022_REDIST
 
 - name: Create  C:\openjdk\devkit if it does not exist
-  ansible.windows.win_file:
+  win_file:
     path: 'c:\openjdk\devkit\'
     state: directory
   when: not directory_status.stat.exists