diff --git a/ansible/roles/ceph/tasks/precheck.yml b/ansible/roles/ceph/tasks/precheck.yml
index ed97d539c095cf1413af30cc23dea272095b97dd..b12c5b4028cf2b0aec2705d5ff3851a47731ffb0 100644
--- a/ansible/roles/ceph/tasks/precheck.yml
+++ b/ansible/roles/ceph/tasks/precheck.yml
@@ -1 +1,16 @@
 ---
+- name: Get container facts
+  kolla_container_facts:
+    name:
+      - ceph_rgw
+  register: container_facts
+
+- name: Checking free port for RadosGW
+  wait_for:
+    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
+    port: "{{ rgw_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - container_facts['ceph-rgw'] is not defined
+    - inventory_hostname in groups['ceph-rgw']
diff --git a/ansible/roles/haproxy/tasks/precheck.yml b/ansible/roles/haproxy/tasks/precheck.yml
index efb49ac3693cb1c67cc04533db59ed98c13dabfc..c13b46bff190614b7fd5039bbc0e3b125b91cef5 100644
--- a/ansible/roles/haproxy/tasks/precheck.yml
+++ b/ansible/roles/haproxy/tasks/precheck.yml
@@ -201,6 +201,17 @@
     - "{{ 'manila_api' not in haproxy_stat }}"
     - inventory_hostname in groups['haproxy']
 
+- name: Checking free port for MariaDB HAProxy
+  wait_for:
+    host: "{{ kolla_internal_vip_address }}"
+    port: "{{ database_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - enable_mariadb | bool
+    - "{{ 'mariadb' not in haproxy_stat }}"
+    - inventory_hostname in groups['haproxy']
+
 - name: Checking free port for Mistral API HAProxy
   wait_for:
     host: "{{ kolla_internal_vip_address }}"
@@ -280,6 +291,28 @@
     - nova_console == 'spice'
     - inventory_hostname in groups['haproxy']
 
+- name: Checking free port for Octavia API HAProxy
+  wait_for:
+    host: "{{ kolla_internal_vip_address }}"
+    port: "{{ octavia_api_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - enable_octavia | bool
+    - "{{ 'octavia_api' not in haproxy_stat }}"
+    - inventory_hostname in groups['haproxy']
+
+- name: Checking free port for Panko API HAProxy
+  wait_for:
+    host: "{{ kolla_internal_vip_address }}"
+    port: "{{ panko_api_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - enable_panko | bool
+    - "{{ 'panko_api' not in haproxy_stat }}"
+    - inventory_hostname in groups['haproxy']
+
 - name: Checking free port for RabbitMQ Management HAProxy
   wait_for:
     host: "{{ kolla_internal_vip_address }}"
@@ -291,6 +324,17 @@
     - "{{ 'rabbitmq_management' not in haproxy_stat }}"
     - inventory_hostname in groups['haproxy']
 
+- name: Checking free port for RadosGW HAProxy
+  wait_for:
+    host: "{{ kolla_internal_vip_address }}"
+    port: "{{ rgw_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - enable_ceph_rgw | bool
+    - "{{ 'radosgw' not in haproxy_stat }}"
+    - inventory_hostname in groups['haproxy']
+
 - name: Checking free port for Sahara API HAProxy
   wait_for:
     host: "{{ kolla_internal_vip_address }}"
diff --git a/ansible/roles/mariadb/tasks/precheck.yml b/ansible/roles/mariadb/tasks/precheck.yml
index ed97d539c095cf1413af30cc23dea272095b97dd..a41e35dacb3e8a7e4179a8cf42b257cfe3ee0480 100644
--- a/ansible/roles/mariadb/tasks/precheck.yml
+++ b/ansible/roles/mariadb/tasks/precheck.yml
@@ -1 +1,42 @@
 ---
+- name: Get container facts
+  kolla_container_facts:
+    name:
+      - mariadb
+  register: container_facts
+
+- name: Checking free port for MariaDB
+  wait_for:
+    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
+    port: "{{ database_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - container_facts['mariadb'] is not defined
+
+- name: Checking free port for MariaDB WSREP
+  wait_for:
+    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
+    port: "{{ mariadb_wsrep_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - container_facts['mariadb'] is not defined
+
+- name: Checking free port for MariaDB IST
+  wait_for:
+    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
+    port: "{{ mariadb_ist_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - container_facts['mariadb'] is not defined
+
+- name: Checking free port for MariaDB SST
+  wait_for:
+    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
+    port: "{{ mariadb_sst_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - container_facts['mariadb'] is not defined
diff --git a/ansible/roles/octavia/tasks/precheck.yml b/ansible/roles/octavia/tasks/precheck.yml
index ed97d539c095cf1413af30cc23dea272095b97dd..f17158a7bcb9916d56cf8851f41ee4f6dc81c2a3 100644
--- a/ansible/roles/octavia/tasks/precheck.yml
+++ b/ansible/roles/octavia/tasks/precheck.yml
@@ -1 +1,27 @@
 ---
+- name: Get container facts
+  kolla_container_facts:
+    name:
+      - octavia_api
+      - octavia_health_manager
+  register: container_facts
+
+- name: Checking free port for Octavia API
+  wait_for:
+    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
+    port: "{{ octavia_api_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - container_facts['octavia_api'] is not defined
+    - inventory_hostname in groups['octavia-api']
+
+- name: Checking free port for Octavia Health Manager
+  wait_for:
+    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
+    port: "{{ octavia_health_manager_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - container_facts['octavia_health_manager'] is not defined
+    - inventory_hostname in groups['octavia-health-manager']
diff --git a/ansible/roles/panko/tasks/precheck.yml b/ansible/roles/panko/tasks/precheck.yml
new file mode 100644
index 0000000000000000000000000000000000000000..7fd726c9ecf339c58e0361c30342a8bbcd583595
--- /dev/null
+++ b/ansible/roles/panko/tasks/precheck.yml
@@ -0,0 +1,16 @@
+---
+- name: Get container facts
+  kolla_container_facts:
+    name:
+      - panko_api
+  register: container_facts
+
+- name: Checking free port for Panko API
+  wait_for:
+    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
+    port: "{{ panko_api_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - container_facts['panko_api'] is not defined
+    - inventory_hostname in groups['panko-api']
diff --git a/ansible/roles/prechecks/tasks/port_checks.yml b/ansible/roles/prechecks/tasks/port_checks.yml
index dcba40e442a419b2154a929c0ae1733e60e61cff..a357fd40c7a7c9fc57d8f4eec0ed2eaa2e21b649 100644
--- a/ansible/roles/prechecks/tasks/port_checks.yml
+++ b/ansible/roles/prechecks/tasks/port_checks.yml
@@ -123,56 +123,6 @@
     - enable_iscsid | bool
     - inventory_hostname in groups['tgtd']
 
-- name: Checking free port for MariaDB
-  wait_for:
-    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
-    port: "{{ database_port }}"
-    connect_timeout: 1
-    state: stopped
-  when:
-    - enable_mariadb | bool
-    - inventory_hostname in groups['mariadb']
-
-- name: Checking free port for MariaDB HAProxy
-  wait_for:
-    host: "{{ kolla_internal_vip_address }}"
-    port: "{{ database_port }}"
-    connect_timeout: 1
-    state: stopped
-  when:
-    - enable_mariadb | bool
-    - inventory_hostname in groups['haproxy']
-
-- name: Checking free port for MariaDB WSREP
-  wait_for:
-    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
-    port: "{{ mariadb_wsrep_port }}"
-    connect_timeout: 1
-    state: stopped
-  when:
-    - enable_mariadb | bool
-    - inventory_hostname in groups['mariadb']
-
-- name: Checking free port for MariaDB IST
-  wait_for:
-    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
-    port: "{{ mariadb_ist_port }}"
-    connect_timeout: 1
-    state: stopped
-  when:
-    - enable_mariadb | bool
-    - inventory_hostname in groups['mariadb']
-
-- name: Checking free port for MariaDB SST
-  wait_for:
-    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
-    port: "{{ mariadb_sst_port }}"
-    connect_timeout: 1
-    state: stopped
-  when:
-    - enable_mariadb | bool
-    - inventory_hostname in groups['mariadb']
-
 - name: Checking free port for Mongodb
   wait_for:
     host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
@@ -312,23 +262,3 @@
   when:
     - enable_swift | bool
     - inventory_hostname in groups['haproxy']
-
-- name: Checking free port for RadosGW
-  wait_for:
-    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
-    port: "{{ rgw_port }}"
-    connect_timeout: 1
-    state: stopped
-  when:
-    - enable_ceph_rgw | bool
-    - inventory_hostname in groups['ceph-rgw']
-
-- name: Checking free port for RadosGW HAProxy
-  wait_for:
-    host: "{{ kolla_internal_vip_address }}"
-    port: "{{ rgw_port }}"
-    connect_timeout: 1
-    state: stopped
-  when:
-    - enable_ceph_rgw | bool
-    - inventory_hostname in groups['haproxy']