diff --git a/ansible/roles/heat/tasks/deploy.yml b/ansible/roles/heat/tasks/deploy.yml
new file mode 100644
index 0000000000000000000000000000000000000000..a27fbf2ccc6c6f660d1bf970e6ad9e3062d10321
--- /dev/null
+++ b/ansible/roles/heat/tasks/deploy.yml
@@ -0,0 +1,16 @@
+---
+- include: register.yml
+  when: inventory_hostname in groups['heat-api']
+
+- include: config.yml
+  when: inventory_hostname in groups['heat-api'] or
+        inventory_hostname in groups['heat-api-cfn'] or
+        inventory_hostname in groups['heat-engine']
+
+- include: bootstrap.yml
+  when: inventory_hostname in groups['heat-api']
+
+- include: start.yml
+  when: inventory_hostname in groups['heat-api'] or
+        inventory_hostname in groups['heat-api-cfn'] or
+        inventory_hostname in groups['heat-engine']
diff --git a/ansible/roles/heat/tasks/main.yml b/ansible/roles/heat/tasks/main.yml
index a27fbf2ccc6c6f660d1bf970e6ad9e3062d10321..b017e8b4ad9edbc10e43b690b269d460e5b9b1f4 100644
--- a/ansible/roles/heat/tasks/main.yml
+++ b/ansible/roles/heat/tasks/main.yml
@@ -1,16 +1,2 @@
 ---
-- include: register.yml
-  when: inventory_hostname in groups['heat-api']
-
-- include: config.yml
-  when: inventory_hostname in groups['heat-api'] or
-        inventory_hostname in groups['heat-api-cfn'] or
-        inventory_hostname in groups['heat-engine']
-
-- include: bootstrap.yml
-  when: inventory_hostname in groups['heat-api']
-
-- include: start.yml
-  when: inventory_hostname in groups['heat-api'] or
-        inventory_hostname in groups['heat-api-cfn'] or
-        inventory_hostname in groups['heat-engine']
+- include: "{{ action }}.yml"
diff --git a/ansible/roles/heat/tasks/pull.yml b/ansible/roles/heat/tasks/pull.yml
new file mode 100644
index 0000000000000000000000000000000000000000..b671b7b253ce411cd4aa49b35b71b44f4b36fa50
--- /dev/null
+++ b/ansible/roles/heat/tasks/pull.yml
@@ -0,0 +1,21 @@
+---
+- name: Pulling heat-api image
+  kolla_docker:
+    action: "pull_image"
+    common_options: "{{ docker_common_options }}"
+    image: "{{ heat_api_image_full }}"
+  when: inventory_hostname in groups['heat-api']
+
+- name: Pulling heat-api-cfn image
+  kolla_docker:
+    action: "pull_image"
+    common_options: "{{ docker_common_options }}"
+    image: "{{ heat_api_cfn_image_full }}"
+  when: inventory_hostname in groups['heat-api-cfn']
+
+- name: Pulling heat-engine image
+  kolla_docker:
+    action: "pull_image"
+    common_options: "{{ docker_common_options }}"
+    image: "{{ heat_engine_image_full }}"
+  when: inventory_hostname in groups['heat-engine']