diff --git a/src/molecule_plugins/openstack/playbooks/create.yml b/src/molecule_plugins/openstack/playbooks/create.yml
index d9596952..d883f368 100644
--- a/src/molecule_plugins/openstack/playbooks/create.yml
+++ b/src/molecule_plugins/openstack/playbooks/create.yml
@@ -163,11 +163,3 @@
             content: "{{ instance_conf }}"
             dest: "{{ molecule_instance_config }}"
             mode: "0600"
-
-        - name: Wait for SSH
-          ansible.builtin.wait_for:
-            port: 22
-            host: "{{ item.address }}"
-            search_regex: SSH
-            delay: 10
-          loop: "{{ lookup('file', molecule_instance_config) | from_yaml }}"
diff --git a/src/molecule_plugins/openstack/playbooks/prepare.yml b/src/molecule_plugins/openstack/playbooks/prepare.yml
index 96288a55..40c63e9e 100644
--- a/src/molecule_plugins/openstack/playbooks/prepare.yml
+++ b/src/molecule_plugins/openstack/playbooks/prepare.yml
@@ -3,6 +3,11 @@
   hosts: all
   gather_facts: false
   tasks:
+    - name: Wait for SSH
+      ansible.builtin.wait_for_connection:
+        delay: 10
+        timeout: 180
+
     - name: Gather system info
       ansible.builtin.raw: uname
       register: raw_uname