diff --git a/ansible/roles/aodh/tasks/config.yml b/ansible/roles/aodh/tasks/config.yml
index 17701d37c9..3162e6a5b5 100644
--- a/ansible/roles/aodh/tasks/config.yml
+++ b/ansible/roles/aodh/tasks/config.yml
@@ -96,5 +96,5 @@
   notify:
     - "Restart aodh-api container"
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/barbican/tasks/config.yml b/ansible/roles/barbican/tasks/config.yml
index 5fbf03172d..f29a1ad3b0 100644
--- a/ansible/roles/barbican/tasks/config.yml
+++ b/ansible/roles/barbican/tasks/config.yml
@@ -142,5 +142,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/blazar/tasks/config.yml b/ansible/roles/blazar/tasks/config.yml
index ce65ee1ebd..5355874d21 100644
--- a/ansible/roles/blazar/tasks/config.yml
+++ b/ansible/roles/blazar/tasks/config.yml
@@ -82,5 +82,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/ceilometer/tasks/config.yml b/ansible/roles/ceilometer/tasks/config.yml
index 4195c2c98d..128a0c6700 100644
--- a/ansible/roles/ceilometer/tasks/config.yml
+++ b/ansible/roles/ceilometer/tasks/config.yml
@@ -391,5 +391,5 @@
   notify:
     - "Restart {{ item.key }} container"
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/chrony/tasks/config.yml b/ansible/roles/chrony/tasks/config.yml
index 67a25706e4..b28c4cfa03 100644
--- a/ansible/roles/chrony/tasks/config.yml
+++ b/ansible/roles/chrony/tasks/config.yml
@@ -52,5 +52,5 @@
   notify:
     - Restart chrony container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/cinder/tasks/config.yml b/ansible/roles/cinder/tasks/config.yml
index a5e557d464..9cf7215142 100644
--- a/ansible/roles/cinder/tasks/config.yml
+++ b/ansible/roles/cinder/tasks/config.yml
@@ -127,5 +127,5 @@
   notify:
     - Restart cinder-volume container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/cloudkitty/tasks/config.yml b/ansible/roles/cloudkitty/tasks/config.yml
index a55961f2e1..a381073f2d 100644
--- a/ansible/roles/cloudkitty/tasks/config.yml
+++ b/ansible/roles/cloudkitty/tasks/config.yml
@@ -120,5 +120,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/collectd/tasks/config.yml b/ansible/roles/collectd/tasks/config.yml
index 4a23a8adf2..7c69ce1ca4 100644
--- a/ansible/roles/collectd/tasks/config.yml
+++ b/ansible/roles/collectd/tasks/config.yml
@@ -57,5 +57,5 @@
   notify:
     - Restart collectd container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/common/tasks/config.yml b/ansible/roles/common/tasks/config.yml
index 0730b436eb..e184113ad3 100644
--- a/ansible/roles/common/tasks/config.yml
+++ b/ansible/roles/common/tasks/config.yml
@@ -397,5 +397,5 @@
     - common_services['kolla-toolbox'] | service_enabled_and_mapped_to_host
     - api_address_family == "ipv6"
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/cyborg/tasks/config.yml b/ansible/roles/cyborg/tasks/config.yml
index 5ca3007988..4bfa07d27e 100644
--- a/ansible/roles/cyborg/tasks/config.yml
+++ b/ansible/roles/cyborg/tasks/config.yml
@@ -97,5 +97,5 @@
   notify:
     - Restart cyborg-api container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/designate/tasks/config.yml b/ansible/roles/designate/tasks/config.yml
index cbceed2491..e2e6914fae 100644
--- a/ansible/roles/designate/tasks/config.yml
+++ b/ansible/roles/designate/tasks/config.yml
@@ -152,5 +152,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/elasticsearch/tasks/config.yml b/ansible/roles/elasticsearch/tasks/config.yml
index 28dde49979..079327b05e 100644
--- a/ansible/roles/elasticsearch/tasks/config.yml
+++ b/ansible/roles/elasticsearch/tasks/config.yml
@@ -77,5 +77,5 @@
   notify:
     - Restart elasticsearch-curator container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/etcd/tasks/config.yml b/ansible/roles/etcd/tasks/config.yml
index 635cb2725a..ba228357d2 100644
--- a/ansible/roles/etcd/tasks/config.yml
+++ b/ansible/roles/etcd/tasks/config.yml
@@ -29,5 +29,5 @@
   when:
     - etcd_enable_tls | bool
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/freezer/tasks/config.yml b/ansible/roles/freezer/tasks/config.yml
index 2153172f7e..ae7620ef02 100644
--- a/ansible/roles/freezer/tasks/config.yml
+++ b/ansible/roles/freezer/tasks/config.yml
@@ -96,5 +96,5 @@
   notify:
     - "Restart {{ item.key }} container"
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/glance/tasks/config.yml b/ansible/roles/glance/tasks/config.yml
index bbeeac51d8..7043d74ebc 100644
--- a/ansible/roles/glance/tasks/config.yml
+++ b/ansible/roles/glance/tasks/config.yml
@@ -156,5 +156,5 @@
   notify:
     - Restart glance-tls-proxy container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/gnocchi/tasks/config.yml b/ansible/roles/gnocchi/tasks/config.yml
index b4cd7f892c..f97f41ccaf 100644
--- a/ansible/roles/gnocchi/tasks/config.yml
+++ b/ansible/roles/gnocchi/tasks/config.yml
@@ -102,5 +102,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/grafana/tasks/config.yml b/ansible/roles/grafana/tasks/config.yml
index 8e75ff2188..f9f4f7430b 100644
--- a/ansible/roles/grafana/tasks/config.yml
+++ b/ansible/roles/grafana/tasks/config.yml
@@ -103,5 +103,5 @@
   notify:
     - Restart grafana container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/haproxy/tasks/config.yml b/ansible/roles/haproxy/tasks/config.yml
index 2ff6263794..1ca42fb9f1 100644
--- a/ansible/roles/haproxy/tasks/config.yml
+++ b/ansible/roles/haproxy/tasks/config.yml
@@ -147,5 +147,5 @@
   notify:
     - Restart haproxy container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/heat/tasks/config.yml b/ansible/roles/heat/tasks/config.yml
index d6117e21bc..b2fbdf9398 100644
--- a/ansible/roles/heat/tasks/config.yml
+++ b/ansible/roles/heat/tasks/config.yml
@@ -110,5 +110,5 @@
   notify:
     - Restart heat-api-cfn container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/horizon/tasks/config.yml b/ansible/roles/horizon/tasks/config.yml
index 5aa2a06cc6..088c08bec4 100644
--- a/ansible/roles/horizon/tasks/config.yml
+++ b/ansible/roles/horizon/tasks/config.yml
@@ -136,5 +136,5 @@
   when:
     - kolla_copy_ca_into_containers | bool or horizon_enable_tls_backend | bool
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/influxdb/tasks/config.yml b/ansible/roles/influxdb/tasks/config.yml
index 80cfc8e66d..3311b7aa9f 100644
--- a/ansible/roles/influxdb/tasks/config.yml
+++ b/ansible/roles/influxdb/tasks/config.yml
@@ -43,5 +43,5 @@
   notify:
     - Restart influxdb container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/ironic/tasks/config.yml b/ansible/roles/ironic/tasks/config.yml
index 508b56b686..26111f48f5 100644
--- a/ansible/roles/ironic/tasks/config.yml
+++ b/ansible/roles/ironic/tasks/config.yml
@@ -244,5 +244,5 @@
   notify:
     - "Restart {{ item.key }} container"
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/iscsi/tasks/config.yml b/ansible/roles/iscsi/tasks/config.yml
index e884678ec8..34856259d1 100644
--- a/ansible/roles/iscsi/tasks/config.yml
+++ b/ansible/roles/iscsi/tasks/config.yml
@@ -25,5 +25,5 @@
   notify:
     - "Restart {{ item.key }} container"
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/kafka/tasks/config.yml b/ansible/roles/kafka/tasks/config.yml
index 18f9c414dc..6323eb46b2 100644
--- a/ansible/roles/kafka/tasks/config.yml
+++ b/ansible/roles/kafka/tasks/config.yml
@@ -41,5 +41,5 @@
   notify:
     - Restart kafka container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/karbor/tasks/config.yml b/ansible/roles/karbor/tasks/config.yml
index 84be0847e2..cde7f68d83 100644
--- a/ansible/roles/karbor/tasks/config.yml
+++ b/ansible/roles/karbor/tasks/config.yml
@@ -83,5 +83,5 @@
   notify:
     - Restart karbor-protection container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/keystone/tasks/config.yml b/ansible/roles/keystone/tasks/config.yml
index b47b77f4f0..c0368364c8 100644
--- a/ansible/roles/keystone/tasks/config.yml
+++ b/ansible/roles/keystone/tasks/config.yml
@@ -230,5 +230,5 @@
   notify:
     - Restart keystone-ssh container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/kibana/tasks/config.yml b/ansible/roles/kibana/tasks/config.yml
index aacc6e25ee..82b89ced66 100644
--- a/ansible/roles/kibana/tasks/config.yml
+++ b/ansible/roles/kibana/tasks/config.yml
@@ -47,5 +47,5 @@
   notify:
     - Restart kibana container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/kuryr/tasks/config.yml b/ansible/roles/kuryr/tasks/config.yml
index 18aa6705a1..eab990e331 100644
--- a/ansible/roles/kuryr/tasks/config.yml
+++ b/ansible/roles/kuryr/tasks/config.yml
@@ -98,5 +98,5 @@
   notify:
     - Restart kuryr container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/magnum/tasks/config.yml b/ansible/roles/magnum/tasks/config.yml
index 257dae7599..b26234daef 100644
--- a/ansible/roles/magnum/tasks/config.yml
+++ b/ansible/roles/magnum/tasks/config.yml
@@ -82,5 +82,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/manila/tasks/config.yml b/ansible/roles/manila/tasks/config.yml
index eee11ebd98..26c55bf2cc 100644
--- a/ansible/roles/manila/tasks/config.yml
+++ b/ansible/roles/manila/tasks/config.yml
@@ -111,5 +111,5 @@
   notify:
     - "Restart {{ item.key }} container"
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/mariadb/tasks/config.yml b/ansible/roles/mariadb/tasks/config.yml
index 273d19303f..b305f90e35 100644
--- a/ansible/roles/mariadb/tasks/config.yml
+++ b/ansible/roles/mariadb/tasks/config.yml
@@ -110,5 +110,5 @@
   notify:
     - restart mariadb-clustercheck
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/memcached/tasks/config.yml b/ansible/roles/memcached/tasks/config.yml
index 0e894e82f5..8aeeea38bb 100644
--- a/ansible/roles/memcached/tasks/config.yml
+++ b/ansible/roles/memcached/tasks/config.yml
@@ -25,5 +25,5 @@
     - service.enabled | bool
   notify: Restart memcached container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/mistral/tasks/config.yml b/ansible/roles/mistral/tasks/config.yml
index 64346b6b5d..e7f92bd5dd 100644
--- a/ansible/roles/mistral/tasks/config.yml
+++ b/ansible/roles/mistral/tasks/config.yml
@@ -100,5 +100,5 @@
   notify:
     - "Restart mistral-event-engine container"
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/monasca/tasks/config.yml b/ansible/roles/monasca/tasks/config.yml
index 7f97189ec6..6e3e409683 100644
--- a/ansible/roles/monasca/tasks/config.yml
+++ b/ansible/roles/monasca/tasks/config.yml
@@ -385,5 +385,5 @@
   notify:
     - Restart monasca-grafana container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/multipathd/tasks/config.yml b/ansible/roles/multipathd/tasks/config.yml
index 601cdbf485..e5f70d4e46 100644
--- a/ansible/roles/multipathd/tasks/config.yml
+++ b/ansible/roles/multipathd/tasks/config.yml
@@ -38,5 +38,5 @@
   notify:
     - Restart multipathd container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/murano/tasks/config.yml b/ansible/roles/murano/tasks/config.yml
index b9761fe6de..f46e8ba87d 100644
--- a/ansible/roles/murano/tasks/config.yml
+++ b/ansible/roles/murano/tasks/config.yml
@@ -81,5 +81,5 @@
   notify:
     - "Restart {{ item.key }} container"
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml
index f63687d76b..7d0e9a9cba 100644
--- a/ansible/roles/neutron/tasks/config.yml
+++ b/ansible/roles/neutron/tasks/config.yml
@@ -399,5 +399,5 @@
   notify:
     - "Restart {{ item.0 }} container"
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/nova-cell/tasks/config.yml b/ansible/roles/nova-cell/tasks/config.yml
index dc78269cc1..1c7cab9329 100644
--- a/ansible/roles/nova-cell/tasks/config.yml
+++ b/ansible/roles/nova-cell/tasks/config.yml
@@ -193,5 +193,5 @@
   notify:
     - "Restart {{ item.key }} container"
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/nova/tasks/config.yml b/ansible/roles/nova/tasks/config.yml
index a976ed9cc2..d077643d96 100644
--- a/ansible/roles/nova/tasks/config.yml
+++ b/ansible/roles/nova/tasks/config.yml
@@ -83,5 +83,5 @@
   notify:
     - "Restart {{ item.key }} container"
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/octavia/tasks/config.yml b/ansible/roles/octavia/tasks/config.yml
index fc480d5b86..7e579b0c96 100644
--- a/ansible/roles/octavia/tasks/config.yml
+++ b/ansible/roles/octavia/tasks/config.yml
@@ -139,5 +139,5 @@
   notify:
     - Restart octavia-health-manager container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/openvswitch/tasks/config.yml b/ansible/roles/openvswitch/tasks/config.yml
index 7abfd58061..f9cf6bac71 100644
--- a/ansible/roles/openvswitch/tasks/config.yml
+++ b/ansible/roles/openvswitch/tasks/config.yml
@@ -53,5 +53,5 @@
   notify:
     - "Restart openvswitch-db-server container"
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/ovn/tasks/config.yml b/ansible/roles/ovn/tasks/config.yml
index 06216fc21f..f8e8daf575 100644
--- a/ansible/roles/ovn/tasks/config.yml
+++ b/ansible/roles/ovn/tasks/config.yml
@@ -25,5 +25,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/ovs-dpdk/tasks/config.yml b/ansible/roles/ovs-dpdk/tasks/config.yml
index caf6590a1e..ff991f8e3a 100644
--- a/ansible/roles/ovs-dpdk/tasks/config.yml
+++ b/ansible/roles/ovs-dpdk/tasks/config.yml
@@ -55,5 +55,5 @@
     hugepage_mountpoint: "{{ ovs_hugepage_mountpoint }}"
     ovs_physical_port_policy: "{{ ovs_physical_port_policy }}"
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/panko/tasks/config.yml b/ansible/roles/panko/tasks/config.yml
index 8cc4239483..f78ece80de 100644
--- a/ansible/roles/panko/tasks/config.yml
+++ b/ansible/roles/panko/tasks/config.yml
@@ -96,5 +96,5 @@
   notify:
     - Restart panko-api container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/placement/tasks/config.yml b/ansible/roles/placement/tasks/config.yml
index 39d7be080b..60d3a65622 100644
--- a/ansible/roles/placement/tasks/config.yml
+++ b/ansible/roles/placement/tasks/config.yml
@@ -110,5 +110,5 @@
   notify:
     - "Restart {{ item.key }} container"
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/prometheus/tasks/config.yml b/ansible/roles/prometheus/tasks/config.yml
index b371b6b845..eb54e47def 100644
--- a/ansible/roles/prometheus/tasks/config.yml
+++ b/ansible/roles/prometheus/tasks/config.yml
@@ -213,5 +213,5 @@
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/qdrouterd/tasks/config.yml b/ansible/roles/qdrouterd/tasks/config.yml
index 668d5e1b5a..178ee2d4af 100644
--- a/ansible/roles/qdrouterd/tasks/config.yml
+++ b/ansible/roles/qdrouterd/tasks/config.yml
@@ -61,5 +61,5 @@
   notify:
     - Restart qdrouterd container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/qinling/tasks/config.yml b/ansible/roles/qinling/tasks/config.yml
index 96ef350cd2..ba23384ccb 100644
--- a/ansible/roles/qinling/tasks/config.yml
+++ b/ansible/roles/qinling/tasks/config.yml
@@ -101,5 +101,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/rabbitmq/tasks/config.yml b/ansible/roles/rabbitmq/tasks/config.yml
index b4193c1189..25a977b6c5 100644
--- a/ansible/roles/rabbitmq/tasks/config.yml
+++ b/ansible/roles/rabbitmq/tasks/config.yml
@@ -103,5 +103,5 @@
     - Restart rabbitmq container (first node)
     - Restart rabbitmq container (rest of nodes)
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/rally/tasks/config.yml b/ansible/roles/rally/tasks/config.yml
index 238533dcf6..d53314234d 100644
--- a/ansible/roles/rally/tasks/config.yml
+++ b/ansible/roles/rally/tasks/config.yml
@@ -79,5 +79,5 @@
   notify:
     - Restart rally container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/redis/tasks/config.yml b/ansible/roles/redis/tasks/config.yml
index ce0890929e..6c8a9d44fd 100644
--- a/ansible/roles/redis/tasks/config.yml
+++ b/ansible/roles/redis/tasks/config.yml
@@ -38,5 +38,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/sahara/tasks/config.yml b/ansible/roles/sahara/tasks/config.yml
index 99eec60935..578a9ade07 100644
--- a/ansible/roles/sahara/tasks/config.yml
+++ b/ansible/roles/sahara/tasks/config.yml
@@ -82,5 +82,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/searchlight/tasks/config.yml b/ansible/roles/searchlight/tasks/config.yml
index 55b8d70aef..374218c1a6 100644
--- a/ansible/roles/searchlight/tasks/config.yml
+++ b/ansible/roles/searchlight/tasks/config.yml
@@ -81,5 +81,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/senlin/tasks/config.yml b/ansible/roles/senlin/tasks/config.yml
index 98ec0bd682..793ee6f2e4 100644
--- a/ansible/roles/senlin/tasks/config.yml
+++ b/ansible/roles/senlin/tasks/config.yml
@@ -82,5 +82,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/skydive/tasks/config.yml b/ansible/roles/skydive/tasks/config.yml
index 6fb80e2805..46b85db06a 100644
--- a/ansible/roles/skydive/tasks/config.yml
+++ b/ansible/roles/skydive/tasks/config.yml
@@ -46,5 +46,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/solum/tasks/config.yml b/ansible/roles/solum/tasks/config.yml
index 0c222acfe0..043abc1f99 100644
--- a/ansible/roles/solum/tasks/config.yml
+++ b/ansible/roles/solum/tasks/config.yml
@@ -49,5 +49,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/storm/tasks/config.yml b/ansible/roles/storm/tasks/config.yml
index f6a4e4d77d..516cf1a233 100644
--- a/ansible/roles/storm/tasks/config.yml
+++ b/ansible/roles/storm/tasks/config.yml
@@ -61,5 +61,5 @@
   notify:
     - Restart storm-nimbus container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/tacker/tasks/config.yml b/ansible/roles/tacker/tasks/config.yml
index 261dd3bcf0..cb69ef7cbc 100644
--- a/ansible/roles/tacker/tasks/config.yml
+++ b/ansible/roles/tacker/tasks/config.yml
@@ -82,5 +82,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/telegraf/tasks/config.yml b/ansible/roles/telegraf/tasks/config.yml
index cf318706fb..61d35ede2a 100644
--- a/ansible/roles/telegraf/tasks/config.yml
+++ b/ansible/roles/telegraf/tasks/config.yml
@@ -63,5 +63,5 @@
   notify:
     - Restart telegraf container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/tempest/tasks/config.yml b/ansible/roles/tempest/tasks/config.yml
index 784de54840..a9ce4d9936 100644
--- a/ansible/roles/tempest/tasks/config.yml
+++ b/ansible/roles/tempest/tasks/config.yml
@@ -46,5 +46,5 @@
   notify:
     - Restart tempest container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/trove/tasks/config.yml b/ansible/roles/trove/tasks/config.yml
index 54a18f8e07..77f8f06d3c 100644
--- a/ansible/roles/trove/tasks/config.yml
+++ b/ansible/roles/trove/tasks/config.yml
@@ -103,5 +103,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/vitrage/tasks/config.yml b/ansible/roles/vitrage/tasks/config.yml
index 977b8e9579..a20e3db5c4 100644
--- a/ansible/roles/vitrage/tasks/config.yml
+++ b/ansible/roles/vitrage/tasks/config.yml
@@ -109,5 +109,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/vmtp/tasks/config.yml b/ansible/roles/vmtp/tasks/config.yml
index bb0f358d3a..66009ab41e 100644
--- a/ansible/roles/vmtp/tasks/config.yml
+++ b/ansible/roles/vmtp/tasks/config.yml
@@ -31,5 +31,5 @@
   notify:
     - Restart vmtp container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/watcher/tasks/config.yml b/ansible/roles/watcher/tasks/config.yml
index b05ceefefb..6ff9f84802 100644
--- a/ansible/roles/watcher/tasks/config.yml
+++ b/ansible/roles/watcher/tasks/config.yml
@@ -79,5 +79,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/zookeeper/tasks/config.yml b/ansible/roles/zookeeper/tasks/config.yml
index cb90b1020a..7e97996a7e 100644
--- a/ansible/roles/zookeeper/tasks/config.yml
+++ b/ansible/roles/zookeeper/tasks/config.yml
@@ -54,5 +54,5 @@
   notify:
     - Restart zookeeper container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"
diff --git a/ansible/roles/zun/tasks/config.yml b/ansible/roles/zun/tasks/config.yml
index 8394e2f993..cd149c4981 100644
--- a/ansible/roles/zun/tasks/config.yml
+++ b/ansible/roles/zun/tasks/config.yml
@@ -95,5 +95,5 @@
   notify:
     - Restart {{ item.key }} container
 
-- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
   when: kolla_action != "config"