diff --git a/ansible/DockerInventory.json b/ansible/DockerInventory.json
index 55a20b2328..b6b3eb5a6b 100644
--- a/ansible/DockerInventory.json
+++ b/ansible/DockerInventory.json
@@ -157,7 +157,7 @@
                 "port": "32772"
             },
             {
-                "nodeName": "test-docker-debain12-armv8l-1",
+                "nodeName": "test-docker-debian12-armv8l-1",
                 "port": "2231"
             },
             {
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml
index 60c7789130..f4afae4584 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml
@@ -8,6 +8,7 @@
 ############################
 - name: Call Build Packages and Tools Task
   include_tasks: build_packages_and_tools.yml
+  tags: [build_tools, test_tools]
 
 - name: Checking for /usr/lib/jvm
   stat: path=/usr/lib/jvm
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml
index d4fd79140f..cb1484d8ce 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml
@@ -59,6 +59,7 @@
 ############################
 - name: Call Build Packages and Tools Task
   include_tasks: build_packages_and_tools.yml
+  tags: [build_tools, test_tools]
 
 ##########################
 # Additional build tools #
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Debian.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Debian.yml
index 0da1c4dbed..b01c36206c 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Debian.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Debian.yml
@@ -130,6 +130,7 @@
 ############################
 - name: Call Build Packages and Tools Task
   include_tasks: build_packages_and_tools.yml
+  tags: [build_tools, test_tools]
 
 ##########################
 # Additional build tools #
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Fedora.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Fedora.yml
index e81cb80544..73b5da6ab0 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Fedora.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Fedora.yml
@@ -33,6 +33,7 @@
 ############################
 - name: Call Build Packages and Tools Task
   include_tasks: build_packages_and_tools.yml
+  tags: [build_tools, test_tools]
 
 ##########################
 # Additional build tools #
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/FreeBSD.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/FreeBSD.yml
index d34fb2bc75..b316c33c8e 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/FreeBSD.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/FreeBSD.yml
@@ -38,6 +38,7 @@
 ############################
 - name: Call Build Packages and Tools Task
   include_tasks: build_packages_and_tools.yml
+  tags: [build_tools, test_tools]
 
 ##########################
 # Additional build tools #
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml
index 11a8aa4d87..8f1ddd0797 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml
@@ -48,6 +48,7 @@
 ############################
 - name: Call Build Packages and Tools Task
   include_tasks: build_packages_and_tools.yml
+  tags: [build_tools, test_tools]
 
 ##########################
 # Additional build tools #
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/SLES.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/SLES.yml
index 3de6fa65a0..6eed1c2b5a 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/SLES.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/SLES.yml
@@ -39,6 +39,7 @@
 ############################
 - name: Call Build Packages and Tools Task
   include_tasks: build_packages_and_tools.yml
+  tags: [build_tools, test_tools]
 
 ##########################
 # Additional build tools #
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Ubuntu.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Ubuntu.yml
index 37ffdfd28b..17c1372ca1 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Ubuntu.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Ubuntu.yml
@@ -45,6 +45,7 @@
 ############################
 - name: Call Build Packages and Tools Task
   include_tasks: build_packages_and_tools.yml
+  tags: [build_tools, test_tools]
 
 ##########################
 # Additional build tools #
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/build_packages_and_tools.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/build_packages_and_tools.yml
index 0a7bc0226c..c5b02964a9 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/build_packages_and_tools.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/build_packages_and_tools.yml
@@ -5,12 +5,14 @@
 - name: Set package manager var
   set_fact:
     package_var: "latest"
+  tags: [build_tools, test_tools]
 
 - name: Set package manager var for FreeBSD
   set_fact:
     package_var: "present"
   when:
     - ansible_distribution == "FreeBSD"
+  tags: [build_tools, test_tools]
 
 - name: Install Build Tool Packages
   package: "name={{ item }} state={{ package_var }}"
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/main.yml
index 20e78dd920..e12179c71e 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/main.yml
@@ -20,7 +20,7 @@
 ########################
 - name: Include OS variables
   include_vars: "../vars/{{ ansible_distribution }}.yml"
-  tags: main
+  tags: [build_tools, install_java, main, test_tools]
 
 ##############################
 # OS setup and configuration #
@@ -28,7 +28,9 @@
 # If this errors, upgrade ansible to >=2.4
 - name: Perform OS setup and configuration
   include_tasks: "{{ ansible_distribution }}.yml"
-  tags: main
+  tags: [adoptopenjdk, azul-key, brew_cu, brew_upgrade, build_tools, build_tools_jfx, core_dump, cups, default_java,
+         expat, freetype, install_java, java8_SLES11, java8_SUSE, jck_tools, jenkins_user, kernel_tuning, libffi_sles,
+         locales, main, patch_update, rosetta, solaris_studio, SUSE_gcc48, test_tools, zlib]
 
 ###################
 # cmake on armv7l #
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/openSUSE.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/openSUSE.yml
index be2b631a4d..c762df8858 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/openSUSE.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/openSUSE.yml
@@ -53,6 +53,7 @@
 ############################
 - name: Call Build Packages and Tools Task
   include_tasks: build_packages_and_tools.yml
+  tags: [build_tools, test_tools]
 
 ##########################
 # Additional build tools #
diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/MSVS_2022/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/MSVS_2022/tasks/main.yml
index 2b9278a66d..a0c05be7ab 100644
--- a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/MSVS_2022/tasks/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/MSVS_2022/tasks/main.yml
@@ -94,7 +94,7 @@
 - name: Download Visual Studio Community 2022
   win_get_url:
     url: 'https://aka.ms/vs/17/release/vs_Community.exe'
-    checksum: 25ce0b366052fdd7eabe151b96c1c781c75e26cb228c9acda71cfe20d1415176
+    checksum: 8653debb099fe571c681c7f06334e703ea801168590787a727faef61e0cffc42
     checksum_algorithm: sha256
     dest: 'C:\temp\vs_community22.exe'
     force: no
diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/NVidia_Cuda_Toolkit/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/NVidia_Cuda_Toolkit/tasks/main.yml
index bfb571622e..1d450e01ea 100644
--- a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/NVidia_Cuda_Toolkit/tasks/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/NVidia_Cuda_Toolkit/tasks/main.yml
@@ -39,7 +39,7 @@
   tags: NVidia_Cuda_Toolkit
 
 - name: Install NVidia CUDA toolkit - Windows 10
-  win_shell: C:\temp\cuda_9.1.85_win10_network.exe -s compiler_9.1 nvml_dev_9.1
+  win_shell: C:\temp\cuda_9.1.85_win10_network.exe -s nvcc_9.1 nvml_dev_9.1
   when: (not cuda_installed.stat.exists and ansible_distribution_major_version == "10")
   tags: NVidia_Cuda_Toolkit