diff --git a/scripts/single-node-pod.sh b/scripts/single-node-pod.sh
index 789a879..6726467 100755
--- a/scripts/single-node-pod.sh
+++ b/scripts/single-node-pod.sh
@@ -48,7 +48,14 @@
 function setup_openstack() {
     cd ~/platform-install
 
-    extra_vars="xos_repo_url=$XOS_REPO_URL xos_repo_branch=$XOS_BRANCH"
+    extra_vars="single_node_pod_script=true"
+
+    if [[ "$XOS_REPO_URL" != "" ]]; then
+        extra_vars="$extra_vars xos_repo_url=$XOS_REPO_URL"
+    fi
+    if [[ "$XOS_BRANCH" != "" ]]; then 
+        extra_vars="$extra_vars xos_repo_branch=$XOS_BRANCH"
+    fi
 
     # check if running on cloudlab
     if [[ -x /usr/testbed/bin/mkextrafs ]]
@@ -126,8 +133,6 @@
 SETUP_BRANCH="master"
 SETUP_REPO_URL="https://github.com/opencord/platform-install"
 INVENTORY="inventory/single-localhost"
-XOS_BRANCH="master"
-XOS_REPO_URL="https://github.com/opencord/xos"
 DIAGNOSTICS=1
 
 while getopts "b:dehi:p:r:ts:" opt; do
diff --git a/vars/cord_defaults.yml b/vars/cord_defaults.yml
index 56a85e3..1988e02 100644
--- a/vars/cord_defaults.yml
+++ b/vars/cord_defaults.yml
@@ -12,9 +12,7 @@
 
 service_profile_repo_dest: "~/service-profile"
 
-xos_configuration: cord-pod
-
-xos_repo_branch: "master"
+xos_configuration: cord-pod-ansible
 
 xos_repo_dest: "~/xos"
 
diff --git a/vars/cord_single_defaults.yml b/vars/cord_single_defaults.yml
index e5890d4..56399a2 100644
--- a/vars/cord_single_defaults.yml
+++ b/vars/cord_single_defaults.yml
@@ -13,9 +13,7 @@
 
 service_profile_repo_dest: "~/service-profile"
 
-xos_configuration: cord-pod
-
-xos_repo_branch: "master"
+xos_configuration: cord-pod-ansible
 
 xos_container_rebuild: True