diff --git a/ansible/1.bat b/ansible/1.bat
new file mode 100644
index 0000000000..20599947c0
--- /dev/null
+++ b/ansible/1.bat
@@ -0,0 +1,2 @@
+https://download.visualstudio.microsoft.com/download/pr/c5c75dfa-1b29-4419-80f8-bd39aed6bcd9/7ed8fa27575648163e07548ff5667b55b95663a2323e2b2a5f87b16284e481e6/vs_Community.exe
+C:\temp\vs_community.exe --wait --add Microsoft.VisualStudio.Workload.NativeDesktop;includeRecommended;includeOptional --quiet --norestart
diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/MSVS_2017/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/MSVS_2017/tasks/main.yml
index fd761d9a43..3b4079da85 100644
--- a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/MSVS_2017/tasks/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/MSVS_2017/tasks/main.yml
@@ -21,7 +21,7 @@
   tags: MSVS_2017
 
 - name: Install Visual Studio Community 2017
-  win_shell: 'C:\temp\vs_community.exe --wait --add Microsoft.VisualStudio.Workload.NativeDesktop;includeRecommended;includeOptional --quiet --norestart'
+  win_shell: 'C:\temp\vs_community.exe --wait --add Microsoft.VisualStudio.Workload.NativeDesktop --includeRecommended --includeOptional --passive --norestart'
   args:
     executable: cmd
   when: (not vs2017_installed.stat.exists)
@@ -29,11 +29,24 @@
   failed_when: vs2017_error.rc != 1 and vs2017_error.rc != 0
   tags: MSVS_2017
 
+- name: Test if VS 2017 DLL 1 is installed
+  win_stat:
+    path: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\DIA SDK\bin\msdia140.dll'
+  register: vs2017_dll_1_installed
+  tags: MSVS_2017
+
+- name: Test if VS 2017 DLL 2 is installed
+  win_stat:
+    path: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\DIA SDK\bin\amd64\msdia140.dll'
+  register: vs2017_dll_2_installed
+  tags: MSVS_2017
+
 - name: Register Visual Studio Community 2017 DIA SDK shared libraries
   win_command: 'regsvr32 /s "{{ item }}"'
   with_items:
     - C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\DIA SDK\bin\msdia140.dll
     - C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\DIA SDK\bin\amd64\msdia140.dll
+  when: (vs2017_dll_1_installed.stat.exists) and (vs2017_dll_2_installed.stat.exists)
   tags: MSVS_2017
 
 - name: Reboot machine after Visual Studio installation