diff --git a/roles/xos-vm-install/files/xos-setup-cord-pod-playbook.yml b/roles/xos-vm-install/files/xos-setup-cord-pod-playbook.yml
index abb5a30..53e0835 100644
--- a/roles/xos-vm-install/files/xos-setup-cord-pod-playbook.yml
+++ b/roles/xos-vm-install/files/xos-setup-cord-pod-playbook.yml
@@ -116,9 +116,15 @@
     - name: Pull docker images for XOS
       when: not xos_container_rebuild
       become: yes
-      command: docker pull {{ item }}
+      command: docker pull {{ docker_registry }}/{{ item }}:{{ docker_tag }}
       with_items:
-        - "{{ docker_registry }}/xosproject/xos-base:{{ docker_tag }}"
+        - xosproject/xos-base
+
+    - name: Tag the images downloaded from the local registry
+      command: docker tag {{ docker_registry }}/{{ item }}:{{ docker_tag }} {{ item }}:latest
+      with_items:
+        - xosproject/xos-base
+      when: (not xos_container_rebuild) and (docker_registry_check|succeeded)
 
     - name: Rebuild XOS containers
       when: xos_container_rebuild