diff --git a/ansible/roles/heat/tasks/do_reconfigure.yml b/ansible/roles/heat/tasks/do_reconfigure.yml
new file mode 100644
index 0000000000..40c5671d1c
--- /dev/null
+++ b/ansible/roles/heat/tasks/do_reconfigure.yml
@@ -0,0 +1,74 @@
+---
+- name: Ensuring the containers up
+  kolla_docker:
+    name: "{{ item.name }}"
+    action: "get_container_state"
+  register: container_state
+  failed_when: container_state.Running == false
+  when: inventory_hostname in groups[item.group]
+  with_items:
+    - { name: heat_api, group: heat-api }
+    - { name: heat_api_cfn, group: heat-api-cfn }
+    - { name: heat_engine, group: heat-engine }
+
+- include: config.yml
+
+- name: Check the configs
+  command: docker exec {{ item.name }} /usr/local/bin/kolla_set_configs --check
+  changed_when: false
+  failed_when: false
+  register: check_results
+  when: inventory_hostname in groups[item.group]
+  with_items:
+    - { name: heat_api, group: heat-api }
+    - { name: heat_api_cfn, group: heat-api-cfn }
+    - { name: heat_engine, group: heat-engine }
+
+# NOTE(jeffrey4l): when config_strategy == 'COPY_ALWAYS'
+# and container env['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE',
+# just remove the container and start again
+- name: Containers config strategy
+  kolla_docker:
+    name: "{{ item.name }}"
+    action: "get_container_env"
+  register: container_envs
+  when: inventory_hostname in groups[item.group]
+  with_items:
+    - { name: heat_api, group: heat-api }
+    - { name: heat_api_cfn, group: heat-api-cfn }
+    - { name: heat_engine, group: heat-engine }
+
+- name: Remove the containers
+  kolla_docker:
+    name: "{{ item[0]['name'] }}"
+    action: "remove_container"
+  register: remove_containers
+  when:
+    - config_strategy == "COPY_ONCE" or item[1]['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE'
+    - item[2]['rc'] == 1
+    - inventory_hostname in groups[item[0]['group']]
+  with_together:
+    - [{ name: heat_api, group: heat-api },
+       { name: heat_api_cfn, group: heat-api-cfn },
+       { name: heat_engine, group: heat-engine }]
+    - container_envs.results
+    - check_results.results
+
+- include: start.yml
+  when: remove_containers.changed
+
+- name: Restart containers
+  kolla_docker:
+    name: "{{ item[0]['name'] }}"
+    action: "restart_container"
+  when:
+    - config_strategy == 'COPY_ALWAYS'
+    - item[1]['KOLLA_CONFIG_STRATEGY'] != 'COPY_ONCE'
+    - item[2]['rc'] == 1
+    - inventory_hostname in groups[item[0]['group']]
+  with_together:
+    - [{ name: heat_api, group: heat-api },
+       { name: heat_api_cfn, group: heat-api-cfn },
+       { name: heat_engine, group: heat-engine }]
+    - container_envs.results
+    - check_results.results
diff --git a/ansible/roles/heat/tasks/reconfigure.yml b/ansible/roles/heat/tasks/reconfigure.yml
index ed97d539c0..e8cc98f75a 100644
--- a/ansible/roles/heat/tasks/reconfigure.yml
+++ b/ansible/roles/heat/tasks/reconfigure.yml
@@ -1 +1,6 @@
 ---
+- include: do_reconfigure.yml
+  serial: "30%"
+  when: inventory_hostname in groups['heat-api']
+        or inventory_hostname in groups['heat-api-cfn']
+        or inventory_hostname in groups['heat-engine']