diff --git a/ansible/roles/haproxy/tasks/precheck.yml b/ansible/roles/haproxy/tasks/precheck.yml
index 22dafd1a9e..b9dbf33582 100644
--- a/ansible/roles/haproxy/tasks/precheck.yml
+++ b/ansible/roles/haproxy/tasks/precheck.yml
@@ -91,17 +91,6 @@
     - "{{ 'horizon' not in haproxy_stat }}"
     - inventory_hostname in groups['haproxy']
 
-- name: Checking free port for watcher API HAProxy
-  wait_for:
-    host: "{{ kolla_internal_vip_address }}"
-    port: "{{ watcher_api_port }}"
-    connect_timeout: 1
-    state: stopped
-  when:
-    - enable_watcher | bool
-    - "{{ 'watcher_api' not in haproxy_stat }}"
-    - inventory_hostname in groups['haproxy']
-
 - name: Checking free port for Manila API HAProxy
   wait_for:
     host: "{{ kolla_internal_vip_address }}"
@@ -123,3 +112,15 @@
     - enable_sahara | bool
     - "{{ 'sahara_api' not in haproxy_stat }}"
     - inventory_hostname in groups['haproxy']
+
+- name: Checking free port for Watcher API HAProxy
+  wait_for:
+    host: "{{ kolla_internal_vip_address }}"
+    port: "{{ watcher_api_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - enable_watcher | bool
+    - "{{ 'watcher_api' not in haproxy_stat }}"
+    - inventory_hostname in groups['haproxy']
+