diff --git a/cloudlab-openstack-playbook.yml b/cloudlab-openstack-playbook.yml
index 623ade1..e8299f2 100644
--- a/cloudlab-openstack-playbook.yml
+++ b/cloudlab-openstack-playbook.yml
@@ -6,8 +6,9 @@
   vars:
     xos_repo_url: "https://github.com/open-cloud/xos"
     xos_repo_dest: "~/xos"
-    xos_repo_branch: "master"
+    xos_repo_branch: "feature/lts"
     xos_configuration: "devel"
+    xos_container_rebuild: true
 
   roles:
     - { role: common-prep, become: yes }
diff --git a/roles/xos-install/defaults/main.yml b/roles/xos-install/defaults/main.yml
index ba26bf6..e28acb4 100644
--- a/roles/xos-install/defaults/main.yml
+++ b/roles/xos-install/defaults/main.yml
@@ -4,3 +4,6 @@
 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-install/tasks/main.yml b/roles/xos-install/tasks/main.yml
index 60e5217..465040a 100644
--- a/roles/xos-install/tasks/main.yml
+++ b/roles/xos-install/tasks/main.yml
@@ -6,6 +6,11 @@
        dest={{ xos_repo_dest }}
        version={{ xos_repo_branch }}
 
+- name: Rebuild XOS containers
+  when: xos_container_rebuild
+  command: make local_containers
+    chdir="{{ xos_repo_dest }}/xos/configurations/{{ xos_configuration }}/"
+
 - name: Initial build of XOS
   command: make
     chdir="{{ xos_repo_dest }}/xos/configurations/{{ xos_configuration }}/"