diff --git a/ansible/roles/cinder/tasks/deploy.yml b/ansible/roles/cinder/tasks/deploy.yml
new file mode 100644
index 0000000000..06909bd225
--- /dev/null
+++ b/ansible/roles/cinder/tasks/deploy.yml
@@ -0,0 +1,27 @@
+---
+- include: ceph.yml
+  when:
+    - enable_ceph | bool
+    - inventory_hostname in groups['ceph-mon'] or
+        inventory_hostname in groups['cinder-api'] or
+        inventory_hostname in groups['cinder-volume'] or
+        inventory_hostname in groups['cinder-scheduler'] or
+        inventory_hostname in groups['cinder-backup']
+
+- include: register.yml
+  when: inventory_hostname in groups['cinder-api']
+
+- include: config.yml
+  when: inventory_hostname in groups['cinder-api'] or
+        inventory_hostname in groups['cinder-volume'] or
+        inventory_hostname in groups['cinder-scheduler'] or
+        inventory_hostname in groups['cinder-backup']
+
+- include: bootstrap.yml
+  when: inventory_hostname in groups['cinder-api']
+
+- include: start.yml
+  when: inventory_hostname in groups['cinder-api'] or
+        inventory_hostname in groups['cinder-volume'] or
+        inventory_hostname in groups['cinder-scheduler'] or
+        inventory_hostname in groups['cinder-backup']
diff --git a/ansible/roles/cinder/tasks/main.yml b/ansible/roles/cinder/tasks/main.yml
index 06909bd225..b017e8b4ad 100644
--- a/ansible/roles/cinder/tasks/main.yml
+++ b/ansible/roles/cinder/tasks/main.yml
@@ -1,27 +1,2 @@
 ---
-- include: ceph.yml
-  when:
-    - enable_ceph | bool
-    - inventory_hostname in groups['ceph-mon'] or
-        inventory_hostname in groups['cinder-api'] or
-        inventory_hostname in groups['cinder-volume'] or
-        inventory_hostname in groups['cinder-scheduler'] or
-        inventory_hostname in groups['cinder-backup']
-
-- include: register.yml
-  when: inventory_hostname in groups['cinder-api']
-
-- include: config.yml
-  when: inventory_hostname in groups['cinder-api'] or
-        inventory_hostname in groups['cinder-volume'] or
-        inventory_hostname in groups['cinder-scheduler'] or
-        inventory_hostname in groups['cinder-backup']
-
-- include: bootstrap.yml
-  when: inventory_hostname in groups['cinder-api']
-
-- include: start.yml
-  when: inventory_hostname in groups['cinder-api'] or
-        inventory_hostname in groups['cinder-volume'] or
-        inventory_hostname in groups['cinder-scheduler'] or
-        inventory_hostname in groups['cinder-backup']
+- include: "{{ action }}.yml"
diff --git a/ansible/roles/cinder/tasks/pull.yml b/ansible/roles/cinder/tasks/pull.yml
new file mode 100644
index 0000000000..6e2249f2df
--- /dev/null
+++ b/ansible/roles/cinder/tasks/pull.yml
@@ -0,0 +1,28 @@
+---
+- name: Pulling cinder-api image
+  kolla_docker:
+    action: "pull_image"
+    common_options: "{{ docker_common_options }}"
+    image: "{{ cinder_api_image_full }}"
+  when: inventory_hostname in groups['cinder-api']
+
+- name: Pulling cinder-backup image
+  kolla_docker:
+    action: "pull_image"
+    common_options: "{{ docker_common_options }}"
+    image: "{{ cinder_backup_image_full }}"
+  when: inventory_hostname in groups['cinder-backup']
+
+- name: Pulling cinder-scheduler image
+  kolla_docker:
+    action: "pull_image"
+    common_options: "{{ docker_common_options }}"
+    image: "{{ cinder_scheduler_image_full }}"
+  when: inventory_hostname in groups['cinder-scheduler']
+
+- name: Pulling cinder-volume image
+  kolla_docker:
+    action: "pull_image"
+    common_options: "{{ docker_common_options }}"
+    image: "{{ cinder_volume_image_full }}"
+  when: inventory_hostname in groups['cinder-volume']