diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml
index 8685f5143e..78d07893e6 100644
--- a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml
@@ -70,19 +70,19 @@
     - ANT                         # Testing
     - role: MSVS_2013
       when: ansible_architecture == "64-bit"
-    # - role: MSVS_2017             # OpenJ9
-    #   when: ansible_architecture == "64-bit"
-    # - role: MSVS_2019                   # OpenJ9
-    #   tags: MSVS_2019
+    - role: MSVS_2017             # OpenJ9
+      when: ansible_architecture == "64-bit"
+    - role: MSVS_2019                   # OpenJ9
+      tags: MSVS_2019
     - role: MSVS_2022
       tags: MSVS_2022
     - role: MSVS_2022_REDIST
       tags: MSVS_2022_REDIST
-    # - NVidia_Cuda_Toolkit         # OpenJ9
+    - NVidia_Cuda_Toolkit         # OpenJ9
     - NTP_TIME
-    # - Clang_64bit                 # OpenJ9
-    # - Clang_32bit                 # OpenJ9
-    # - nasm                        # OpenJ9
+    - Clang_64bit                 # OpenJ9
+    - Clang_32bit                 # OpenJ9
+    - nasm                        # OpenJ9
     - Rust                        # IcedTea-Web
     - IcedTea-Web                 # For Jenkins webstart
     - WiX                         # For creating installers
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 309943273f..84bf3b8924 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
@@ -100,7 +100,7 @@
 
 # Download & Install VS2022 When No Layout & Not AdoptOpenJDK
 # This is the target that you're redirected to when you go to https://aka.ms/vs/17/release/vs_community.exe
-- name: Download Visual Studio Community 2022
+- name: Download Visual Studio Build Tools 2022
   win_get_url:
 # https://learn.microsoft.com/en-us/visualstudio/releases/2022/release-history
 # 17.7.34302.85    url: 'https://download.visualstudio.microsoft.com/download/pr/47b236ad-5505-4752-9d2b-5cf9795528bc/87684889f46dec53d1452f4a0ff9fec1ac202a97ebed866718d7c0269e814b28/vs_BuildTools.exe'