diff --git a/extraconfig/pre_network/boot-params-service.yaml b/extraconfig/pre_network/boot-params-service.yaml
index db74ad277f..b68e24b506 100644
--- a/extraconfig/pre_network/boot-params-service.yaml
+++ b/extraconfig/pre_network/boot-params-service.yaml
@@ -87,13 +87,10 @@ outputs:
                   become: yes
                   when: reboot_required is defined and reboot_required
 
-                - name:  Wait for the ssh port to be ready on the restarted node
-                  local_action: wait_for
-                  become: no
-                  args:
-                    host: "{{ inventory_hostname }}"
-                    port: 22
-                    state: started
+                - name:  Wait for the connection to be ready on the restarted node
+                  wait_for_connection:
+                    connect_timeout: 20
+                    sleep: 5
                     delay: 30
                     timeout:
                       get_param: NodeRebootWaitTimeout