diff --git a/roles/common-prep/tasks/main.yml b/roles/common-prep/tasks/main.yml
index 6e82f91..3fa4625 100644
--- a/roles/common-prep/tasks/main.yml
+++ b/roles/common-prep/tasks/main.yml
@@ -28,6 +28,16 @@
    - tmux
    - vim
 
+- name: Remove annoying default editors
+  apt:
+    pkg={{ item }}
+    state=absent
+    update_cache=yes
+    cache_valid_time=3600
+  with_items:
+   - nano
+   - jove
+
 - name: Enable vim syntax highlighting
   lineinfile: dest=/etc/vim/vimrc
     regexp="^\s*syntax on"
diff --git a/roles/xos-install/tasks/main.yml b/roles/xos-install/tasks/main.yml
index 465040a..ba656e4 100644
--- a/roles/xos-install/tasks/main.yml
+++ b/roles/xos-install/tasks/main.yml
@@ -8,8 +8,11 @@
 
 - name: Rebuild XOS containers
   when: xos_container_rebuild
-  command: make local_containers
+  command: make {{ item }}
     chdir="{{ xos_repo_dest }}/xos/configurations/{{ xos_configuration }}/"
+  with_items:
+    - common_cloudlab
+    - base
 
 - name: Initial build of XOS
   command: make
diff --git a/roles/xos-vm-install/defaults/main.yml b/roles/xos-vm-install/defaults/main.yml
index a2d12d1..9a29be2 100644
--- a/roles/xos-vm-install/defaults/main.yml
+++ b/roles/xos-vm-install/defaults/main.yml
@@ -1,7 +1,10 @@
---- 
+---
 
 xos_repo_url: "https://github.com/open-cloud/xos.git"
 xos_repo_dest: "~/xos"
 xos_repo_branch: "HEAD"
 
 xos_configuration: "devel"
+
+xos_container_rebuild: false
+
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 5f3bcd8..66ff0bf 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
@@ -50,9 +50,17 @@
       with_items: "{{ xos_images }}"
 
     - 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="{{ xos_repo_dest }}/containers/xos/"
+      with_items:
+       - base
+
diff --git a/roles/xos-vm-install/templates/xos-setup-vars.yml.j2 b/roles/xos-vm-install/templates/xos-setup-vars.yml.j2
index 2d5ab15..f650e21 100644
--- a/roles/xos-vm-install/templates/xos-setup-vars.yml.j2
+++ b/roles/xos-vm-install/templates/xos-setup-vars.yml.j2
@@ -6,5 +6,7 @@
 
 xos_configuration: "{{ xos_configuration }}"
 
+xos_container_rebuild: "{{ xos_container_rebuild }}"
+
 xos_images:
 {{ xos_images | to_nice_yaml }}
diff --git a/scripts/single-node-pod.sh b/scripts/single-node-pod.sh
index eb51249..832d222 100755
--- a/scripts/single-node-pod.sh
+++ b/scripts/single-node-pod.sh
@@ -69,6 +69,7 @@
     fi
 
     echo "Rebuilding XOS containers"
+    ssh ubuntu@xos "cd xos/containers/xos; make base"
     ssh ubuntu@xos "cd xos/xos/configurations/cord-pod; make local_containers"
 }