diff --git a/cord-single-playbook.yml b/cord-single-playbook.yml
index 499721d..4b01322 100644
--- a/cord-single-playbook.yml
+++ b/cord-single-playbook.yml
@@ -27,7 +27,7 @@
   become: yes
   roles:
     - common-prep
-    - cloudlab-prep
+    - { role: cloudlab-prep, when: on-cloudlab }
 
 - name: Configure head node, create VM's
   hosts: head
diff --git a/scripts/single-node-pod.sh b/scripts/single-node-pod.sh
index 72050d9..78eca1b 100755
--- a/scripts/single-node-pod.sh
+++ b/scripts/single-node-pod.sh
@@ -46,8 +46,13 @@
 }
 
 function setup_openstack() {
-    # Run the playbook
-    ansible-playbook -i $INVENTORY cord-single-playbook.yml
+    # Run the playbook, but check to see if we're on cloudlab
+    if [[ -x /usr/testbed/bin/mkextrafs ]]
+    then
+      ansible-playbook -i $INVENTORY cord-single-playbook.yml --extra-vars="on-clouldlab=true"
+    else
+      ansible-playbook -i $INVENTORY cord-single-playbook.yml
+    fi
 }
 
 function build_xos_docker_images() {