diff --git a/install/BuildVoltha.sh b/install/BuildVoltha.sh
index bcfb955..0247409 100755
--- a/install/BuildVoltha.sh
+++ b/install/BuildVoltha.sh
@@ -36,6 +36,9 @@
 	echo 'testMode: "false"' >> settings.vagrant.yaml
 fi
 
+# Special actions that differentiate a cluster build from a singel instance build
+mv voltha/voltha.production.yml voltha/voltha.yml
+
 # Destroy the VM if it's running
 vagrant destroy voltha${uId}
 
diff --git a/install/CreateInstaller.sh b/install/CreateInstaller.sh
index 6294b20..34828e0 100755
--- a/install/CreateInstaller.sh
+++ b/install/CreateInstaller.sh
@@ -267,11 +267,11 @@
 
 if [ -z "$vVm" -o "$rebuildVoltha" == "yes" ]; then
 	if [ "$testMode" == "yes" ]; then
-		./BuildVoltha.sh $1
+		./BuildVoltha.sh "test"
 		rtrn=$?
 	else
 		# Default to installer mode 
-		./BuildVoltha.sh install
+		./BuildVoltha.sh "install"
 		rtrn=$?
 	fi
 	if [ $rtrn -ne 0 ]; then
diff --git a/install/cleanup.sh b/install/cleanup.sh
index 5c223e4..d076179 100755
--- a/install/cleanup.sh
+++ b/install/cleanup.sh
@@ -17,3 +17,4 @@
 git checkout ansible/group_vars/all
 git checkout ansible/roles/docker/templates/docker.cfg
 git checkout install.cfg
+git checkout ../voltha/voltha.yml