diff --git a/windows/deploy_vm/deploy_vm.yml b/windows/deploy_vm/deploy_vm.yml
index de70dc48f..bc92cf5fe 100644
--- a/windows/deploy_vm/deploy_vm.yml
+++ b/windows/deploy_vm/deploy_vm.yml
@@ -27,7 +27,10 @@
       include_tasks: ../../common/vcenter_add_key_provider.yml
       vars:
         vc_cert_path: "{{ current_test_log_folder }}"
-      when: virtual_tpm is defined and virtual_tpm | bool
+      when:
+        - virtual_tpm is defined
+        - virtual_tpm | bool
+        - key_provider_type is defined
 
     - name: "Deploy VM"
       block:
diff --git a/windows/deploy_vm/deploy_vm_from_iso.yml b/windows/deploy_vm/deploy_vm_from_iso.yml
index bb0e94c15..ed864f536 100644
--- a/windows/deploy_vm/deploy_vm_from_iso.yml
+++ b/windows/deploy_vm/deploy_vm_from_iso.yml
@@ -124,6 +124,8 @@
 
 - name: "Enable VBS"
   block:
+    - name: "Get guest OS system info"
+      include_tasks: ../utils/get_windows_system_info.yml
     - name: "Enable VBS in guest OS"
       include_tasks: ../utils/win_enable_vbs_guest.yml
     - name: "Get VBS status in guest OS"