diff --git a/cloudlab-openstack-playbook.yml b/cloudlab-openstack-playbook.yml
new file mode 100644
index 0000000..623ade1
--- /dev/null
+++ b/cloudlab-openstack-playbook.yml
@@ -0,0 +1,15 @@
+---
+# Installs XOS on Cloudlab's OpenStack profile systems
+
+- hosts: cloudlab
+
+  vars:
+    xos_repo_url: "https://github.com/open-cloud/xos"
+    xos_repo_dest: "~/xos"
+    xos_repo_branch: "master"
+    xos_configuration: "devel"
+
+  roles:
+    - { role: common-prep, become: yes }
+    - xos-install
+
diff --git a/cord-single-playbook.yml b/cord-single-playbook.yml
index 9496503..2e1b738 100644
--- a/cord-single-playbook.yml
+++ b/cord-single-playbook.yml
@@ -1,5 +1,8 @@
 ---
-# CORD playbook, for installing a single-node CORD test-environment on cloudlab
+# Installs the single node cord-pod XOS configuration, using Juju to provision
+# the OpenStack installation inside of VM's on the head node.
+#
+# This is used by `scripts/single-node-pod.sh` for E2E testing.
 
 - name: Include vars
   hosts: all
diff --git a/inventory/cloudlab-openstack b/inventory/cloudlab-openstack
new file mode 100644
index 0000000..12da333
--- /dev/null
+++ b/inventory/cloudlab-openstack
@@ -0,0 +1,5 @@
+# inventory file for Clouldlab's OpenStack Profile
+
+[clouldlab]
+ctl ansible_ssh_host=hostname_goes_here.cloudlab.us ansible_ssh_user=cloudlab_username
+
diff --git a/inventory/single-localhost b/inventory/single-localhost
index 18e7e0d..36fdcaa 100644
--- a/inventory/single-localhost
+++ b/inventory/single-localhost
@@ -4,3 +4,6 @@
 [head]
 localhost
 
+[cloudlab]
+localhost
+
diff --git a/cloudlab-compute.yml b/legacy/cloudlab-compute.yml
similarity index 100%
rename from cloudlab-compute.yml
rename to legacy/cloudlab-compute.yml
diff --git a/cloudlab-setup.yml b/legacy/cloudlab-setup.yml
similarity index 100%
rename from cloudlab-setup.yml
rename to legacy/cloudlab-setup.yml
diff --git a/cord-setup.yml b/legacy/cord-setup.yml
similarity index 100%
rename from cord-setup.yml
rename to legacy/cord-setup.yml
diff --git a/setup-mgmtbr.sh b/legacy/setup-mgmtbr.sh
similarity index 100%
rename from setup-mgmtbr.sh
rename to legacy/setup-mgmtbr.sh
diff --git a/opencloud-multi-playbook.yml b/opencloud-multi-playbook.yml
index e3d9428..0468a62 100644
--- a/opencloud-multi-playbook.yml
+++ b/opencloud-multi-playbook.yml
@@ -1,5 +1,5 @@
 ---
-# aztest playbook, for installing an OpenCloud site
+# Install an OpenCloud site, with multi-node Juju configured OpenStack
 
 - name: Include Configuration
   hosts: all
diff --git a/roles/xos-install/tasks/main.yml b/roles/xos-install/tasks/main.yml
index d982c26..60e5217 100644
--- a/roles/xos-install/tasks/main.yml
+++ b/roles/xos-install/tasks/main.yml
@@ -1,7 +1,12 @@
 ---
 # tasks for xos-install role
 
- - name: checkout XOS repo
-   git: repo={{ xos_repo_url }}
-        dest={{ xos_repo_dest }}
-        version={{ xos_repo_branch }}
+- name: checkout XOS repo
+  git: repo={{ xos_repo_url }}
+       dest={{ xos_repo_dest }}
+       version={{ xos_repo_branch }}
+
+- name: Initial build of XOS
+  command: make
+    chdir="{{ xos_repo_dest }}/xos/configurations/{{ xos_configuration }}/"
+