diff --git a/roles/xos-vm-install/defaults/main.yml b/roles/xos-vm-install/defaults/main.yml
index 64c4421..42723d9 100644
--- a/roles/xos-vm-install/defaults/main.yml
+++ b/roles/xos-vm-install/defaults/main.yml
@@ -6,7 +6,7 @@
 
 xos_configuration: "devel"
 
-xos_container_rebuild: false
+xos_container_rebuild: True
 
 service_profile_repo_url: "https://gerrit.opencord.org/p/service-profile.git"
 service_profile_repo_dest: "~/service-profile"
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 364882e..8a99769 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
@@ -49,24 +49,31 @@
         src=~/.ssh/id_rsa
         dest={{ service_profile_repo_dest }}/{{ xos_configuration }}/node_key
 
-    - name: download software image
+    - name: Download Glance VM images
       get_url:
         url={{ item.url }}
         checksum={{ item.checksum }}
         dest={{ service_profile_repo_dest }}/{{ xos_configuration }}/images/{{ item.name }}.img
       with_items: "{{ xos_images }}"
 
+    - name: Pull database and cord-app-build image
+      become: yes
+      command: docker pull {{ item }}
+      with_items:
+        - xosproject/xos-postgres
+        - xosproject/cord-app-build
+
     - name: Pull docker images for XOS
       when: not xos_container_rebuild
       become: yes
       command: docker pull {{ item }}
       with_items:
         - xosproject/xos-base
-        - xosproject/xos-postgres
 
     - name: Rebuild XOS containers
       when: xos_container_rebuild
       command: make {{ item }}
-        chdir="{{ service_profile_repo_dest }}/containers/xos/"
+        chdir="{{ xos_repo_dest }}/containers/xos/"
       with_items:
        - base
+
diff --git a/roles/xos-vm-install/tasks/main.yml b/roles/xos-vm-install/tasks/main.yml
index 1aa66a9..a4fc803 100644
--- a/roles/xos-vm-install/tasks/main.yml
+++ b/roles/xos-vm-install/tasks/main.yml
@@ -15,7 +15,7 @@
 
 - name: Run the XOS ansible playbook
   command: ansible-playbook {{ ansible_user_dir }}/xos-setup-playbook.yml
-  async: 2400
+  async: 4800
   poll: 0
   register: xos_setup_playbook