diff --git a/ansible/roles/haproxy/tasks/precheck.yml b/ansible/roles/haproxy/tasks/precheck.yml
index efb49ac369..f84d605fc4 100644
--- a/ansible/roles/haproxy/tasks/precheck.yml
+++ b/ansible/roles/haproxy/tasks/precheck.yml
@@ -179,6 +179,17 @@
     - "{{ 'ironic_api' not in haproxy_stat }}"
     - inventory_hostname in groups['haproxy']
 
+- name: Checking free port for Kibana HAProxy
+  wait_for:
+    host: "{{ kolla_internal_vip_address }}"
+    port: "{{ kibana_server_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - enable_kibana | bool
+    - "{{ 'kibana' not in haproxy_stat }}"
+    - inventory_hostname in groups['haproxy']
+
 - name: Checking free port for Magnum API HAProxy
   wait_for:
     host: "{{ kolla_internal_vip_address }}"
diff --git a/ansible/roles/kibana/tasks/precheck.yml b/ansible/roles/kibana/tasks/precheck.yml
index ed97d539c0..e485168398 100644
--- a/ansible/roles/kibana/tasks/precheck.yml
+++ b/ansible/roles/kibana/tasks/precheck.yml
@@ -1 +1,16 @@
 ---
+- name: Get container facts
+  kolla_container_facts:
+    name:
+      - kibana
+  register: container_facts
+
+- name: Checking free port for Kibana Server
+  wait_for:
+    host: "{{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}"
+    port: "{{ kibana_server_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - container_facts['kibana'] is not defined
+    - inventory_hostname in groups['kibana']
diff --git a/ansible/roles/prechecks/tasks/port_checks.yml b/ansible/roles/prechecks/tasks/port_checks.yml
index 68415437bd..b5544e23e4 100644
--- a/ansible/roles/prechecks/tasks/port_checks.yml
+++ b/ansible/roles/prechecks/tasks/port_checks.yml
@@ -193,16 +193,6 @@
     - inventory_hostname in groups['haproxy']
     - enable_mongodb | bool
 
-- name: Checking free port for Kibana Server
-  wait_for:
-    host: "{{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}"
-    port: "{{ kibana_server_port }}"
-    connect_timeout: 1
-    state: stopped
-  when:
-    - inventory_hostname in groups['kibana']
-    - enable_kibana | bool
-
 - name: Checking free port for Rsync
   wait_for:
     host: "{{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}"