diff --git a/ansible/infra-vm-provision.yml b/ansible/infra-vm-provision.yml
index 1e4878154..28d4e3253 100644
--- a/ansible/infra-vm-provision.yml
+++ b/ansible/infra-vm-provision.yml
@@ -29,17 +29,12 @@
   tags:
     - infra-vm-provision
   tasks:
-    - name: Wait for a connection to VM with bootstrap user
-      wait_for_connection:
+    - name: Wait for SSH access to the infra VM
+      wait_for:
+        host: "{{ hostvars[inventory_hostname].ansible_host }}"
+        port: 22
+        state: started
         # NOTE: Ensure we exceed the 5 minute DHCP timeout of the eth0
         # interface if necessary.
-        timeout: 600
-      vars:
-        # NOTE(wszumski): ansible_host_key_checking variable doesn't seem to
-        # work, But it would be nice not to fail if the host_key changes.
-        # We check the hostkey during host configure.
-        # https://github.com/ansible/ansible/blob/1c34492413dec09711c430745034db0c108227a9/lib/ansible/plugins/connection/ssh.py#L49
-        # https://github.com/ansible/ansible/issues/49254
-        ansible_ssh_extra_args: '{{ infra_vm_wait_connection_ssh_extra_args }}'
-        ansible_user: "{{ bootstrap_user }}"
-        ansible_python_interpreter: /usr/bin/python3
+        timeout: 360
+      delegate_to: localhost