diff --git a/install/ansible/roles/pull-images/tasks/main.yml b/install/ansible/roles/pull-images/tasks/main.yml
index dde3d78..9b2044d 100644
--- a/install/ansible/roles/pull-images/tasks/main.yml
+++ b/install/ansible/roles/pull-images/tasks/main.yml
@@ -1,2 +1,12 @@
-- include: pull.yml
-  when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
+- name: Docker containers for Voltha are pulled
+  command: docker pull {{ docker_registry }}/{{ item }}
+  with_items: "{{ voltha_containers }}"
+  tags: [pull]
+- name: Docker images are re-tagged to expected names
+  command: docker tag {{ docker_registry }}/{{ item }} {{ item }}
+  with_items: "{{ voltha_containers }}"
+  tags: [pull]
+- name: Old docker image tags are removed
+  command: docker rmi {{ docker_registry }}/{{ item }}
+  with_items: "{{ voltha_containers }}"
+  tags: [pull]