diff --git a/ansible/roles/elasticsearch/tasks/precheck.yml b/ansible/roles/elasticsearch/tasks/precheck.yml
index ed97d539c095cf1413af30cc23dea272095b97dd..ee10831bdbe4ac8b05383304365dc312ca7a33a7 100644
--- a/ansible/roles/elasticsearch/tasks/precheck.yml
+++ b/ansible/roles/elasticsearch/tasks/precheck.yml
@@ -1 +1,16 @@
 ---
+- name: Get container facts
+  kolla_container_facts:
+    name:
+      - elasticsearch
+  register: container_facts
+
+- name: Checking free port for Elasticsearch
+  wait_for:
+    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
+    port: "{{ elasticsearch_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - container_facts['elasticsearch'] is not defined
+    - inventory_hostname in groups['elasticsearch']
diff --git a/ansible/roles/haproxy/tasks/precheck.yml b/ansible/roles/haproxy/tasks/precheck.yml
index 89290b0169d450095468f8121d4ad3be9b824f70..9d9fcb53f357c312db1c255c944bbef1e9c2709b 100644
--- a/ansible/roles/haproxy/tasks/precheck.yml
+++ b/ansible/roles/haproxy/tasks/precheck.yml
@@ -91,6 +91,17 @@
     - inventory_hostname in groups['haproxy']
     - "{{ 'designate_api' not in haproxy_stat }}"
 
+- name: Checking free port for Elasticsearch HAProxy
+  wait_for:
+    host: "{{ kolla_internal_vip_address }}"
+    port: "{{ elasticsearch_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - enable_elasticsearch | bool
+    - "{{ 'elasticsearch' not in haproxy_stat }}"
+    - inventory_hostname in groups['haproxy']
+
 - name: Checking free port for Glance API HAProxy
   wait_for:
     host: "{{ kolla_internal_vip_address }}"
@@ -423,6 +434,27 @@
     - "{{ 'senlin_api' not in haproxy_stat }}"
     - inventory_hostname in groups['haproxy']
 
+- name: Checking free port for Solum Application Deployment HAProxy
+  wait_for:
+    host: "{{ kolla_internal_vip_address }}"
+    port: "{{ solum_application_deployment_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - enable_solum | bool
+    - "{{ 'solum_application_deployment' not in haproxy_stat }}"
+    - inventory_hostname in groups['haproxy']
+
+- name: Checking free port for Solum Image Builder HAProxy
+  wait_for:
+    host: "{{ kolla_internal_vip_address }}"
+    port: "{{ solum_image_builder_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - enable_solum | bool
+    - "{{ 'solum_image_builder' not in haproxy_stat }}"
+
 - name: Checking free port for Swift Proxy Server HAProxy
   wait_for:
     host: "{{ kolla_internal_vip_address }}"
diff --git a/ansible/roles/iscsi/tasks/precheck.yml b/ansible/roles/iscsi/tasks/precheck.yml
index ed97d539c095cf1413af30cc23dea272095b97dd..0f7eaf8c2f0f426ec5e2122c0809ec9b6de00d73 100644
--- a/ansible/roles/iscsi/tasks/precheck.yml
+++ b/ansible/roles/iscsi/tasks/precheck.yml
@@ -1 +1,16 @@
 ---
+- name: Get container facts
+  kolla_container_facts:
+    name:
+      - iscsid
+  register: container_facts
+
+- name: Checking free port for iscsi
+  wait_for:
+    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
+    port: "{{ iscsi_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - container_facts['iscsid'] is not defined
+    - inventory_hostname in groups['iscsid']
diff --git a/ansible/roles/prechecks/tasks/port_checks.yml b/ansible/roles/prechecks/tasks/port_checks.yml
index cd37a9381813e88f33394717c6db01346f437737..d06583ee518d09715d786010a3cfa2113ad58463 100644
--- a/ansible/roles/prechecks/tasks/port_checks.yml
+++ b/ansible/roles/prechecks/tasks/port_checks.yml
@@ -43,16 +43,6 @@
     - enable_haproxy | bool
     - inventory_hostname in groups['haproxy']
 
-- name: Checking free port for iscsi
-  wait_for:
-    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
-    port: "{{ iscsi_port }}"
-    connect_timeout: 1
-    state: stopped
-  when:
-    - enable_iscsid | bool
-    - inventory_hostname in groups['tgtd']
-
 - name: Checking free port for Rsync
   wait_for:
     host: "{{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}"
@@ -62,43 +52,3 @@
   when:
     - inventory_hostname in groups['swift-object-server']
     - enable_swift | bool
-
-- name: Checking free port for Solum Application Deployment
-  wait_for:
-    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
-    port: "{{ solum_application_deployment_port }}"
-    connect_timeout: 1
-    state: stopped
-  when:
-    - enable_solum | bool
-    - inventory_hostname in groups['solum-api']
-
-- name: Checking free port for Solum Image Builder
-  wait_for:
-    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
-    port: "{{ solum_image_builder_port }}"
-    connect_timeout: 1
-    state: stopped
-  when:
-    - enable_solum | bool
-    - inventory_hostname in groups['solum-api']
-
-- name: Checking free port for Solum Application Deployment HAProxy
-  wait_for:
-    host: "{{ kolla_internal_vip_address }}"
-    port: "{{ solum_application_deployment_port }}"
-    connect_timeout: 1
-    state: stopped
-  when:
-    - enable_solum | bool
-    - inventory_hostname in groups['haproxy']
-
-- name: Checking free port for Solum Image Builder HAProxy
-  wait_for:
-    host: "{{ kolla_internal_vip_address }}"
-    port: "{{ solum_image_builder_port }}"
-    connect_timeout: 1
-    state: stopped
-  when:
-    - enable_solum | bool
-    - inventory_hostname in groups['haproxy']