diff --git a/tripleo_ansible/playbooks/cli-overcloud-node-growvols.yaml b/tripleo_ansible/playbooks/cli-overcloud-node-growvols.yaml
index 4371c140d..9bca3dd98 100644
--- a/tripleo_ansible/playbooks/cli-overcloud-node-growvols.yaml
+++ b/tripleo_ansible/playbooks/cli-overcloud-node-growvols.yaml
@@ -28,13 +28,9 @@
       /var=100%
   pre_tasks:
     - name: Wait for provisioned nodes to boot
-      wait_for:
+      wait_for_connection:
         timeout: 600
-        port: 22
-        host: '{{ ansible_host }}'
-        search_regex: OpenSSH
         delay: 10
-        msg: Timeout waiting for provisioned nodes to become available
       connection: local
   tasks:
 
diff --git a/tripleo_ansible/playbooks/cli-overcloud-node-kernelargs.yaml b/tripleo_ansible/playbooks/cli-overcloud-node-kernelargs.yaml
index f8f206a0c..604c89923 100644
--- a/tripleo_ansible/playbooks/cli-overcloud-node-kernelargs.yaml
+++ b/tripleo_ansible/playbooks/cli-overcloud-node-kernelargs.yaml
@@ -26,13 +26,9 @@
     tuned_isolated_cores: ''
   pre_tasks:
     - name: Wait for provisioned nodes to boot
-      wait_for:
+      wait_for_connection:
         timeout: 600
-        port: 22
-        host: '{{ ansible_host }}'
-        search_regex: OpenSSH
         delay: 10
-        msg: Timeout waiting for provisioned nodes to become available
       connection: local
   tasks:
     - name: Kernel args block
diff --git a/tripleo_ansible/playbooks/cli-overcloud-node-network-config.yaml b/tripleo_ansible/playbooks/cli-overcloud-node-network-config.yaml
index fa84e9051..5524cd127 100644
--- a/tripleo_ansible/playbooks/cli-overcloud-node-network-config.yaml
+++ b/tripleo_ansible/playbooks/cli-overcloud-node-network-config.yaml
@@ -20,13 +20,9 @@
   gather_facts: false
   pre_tasks:
     - name: Wait for provisioned nodes to boot
-      wait_for:
+      wait_for_connection:
         timeout: 600
-        port: 22
-        host: '{{ ansible_host }}'
-        search_regex: OpenSSH
         delay: 10
-        msg: Timeout waiting for provisioned nodes to become available
       connection: local
   roles:
     - role: tripleo_network_config