diff --git a/install/BuildVoltha.sh b/install/BuildVoltha.sh
index 0247409..a3bec02 100755
--- a/install/BuildVoltha.sh
+++ b/install/BuildVoltha.sh
@@ -37,7 +37,9 @@
 fi
 
 # Special actions that differentiate a cluster build from a singel instance build
-mv voltha/voltha.production.yml voltha/voltha.yml
+cp voltha/voltha.production.yml voltha/voltha.yml
+cp ofagent/ofagent.production.yml ofagent/ofagent.yml
+cp netconf/netconf.production.yml netconf/netconf.yml
 
 # Destroy the VM if it's running
 vagrant destroy voltha${uId}
diff --git a/install/cleanup.sh b/install/cleanup.sh
index d076179..17996d8 100755
--- a/install/cleanup.sh
+++ b/install/cleanup.sh
@@ -18,3 +18,5 @@
 git checkout ansible/roles/docker/templates/docker.cfg
 git checkout install.cfg
 git checkout ../voltha/voltha.yml
+git checkout ../ofagent/ofagent.yml
+git checkout ../netconf/netconf.yml