diff --git a/opencloud/Makefile b/opencloud/Makefile
index 98d5f0e..4b2e571 100644
--- a/opencloud/Makefile
+++ b/opencloud/Makefile
@@ -11,7 +11,7 @@
 # Include common functions
 include $(COMMON_DIR)/Makefile
 
-xos: prereqs config_dirs xos_download opencloud_services oc_bootstrap onboarding
+xos: prereqs config_dirs xos_download opencloud_services bootstrap onboarding
 
 opencloud_services: $(SERVICE_DIR) \
 	$(SERVICE_DIR)/onos-service \
@@ -19,19 +19,6 @@
 	$(SERVICE_DIR)/vrouter \
 	$(SERVICE_DIR)/vtn
 
-opencloud_bootstrap: deployment.yaml
-	@echo "[OC BOOTSTRAP]"
-	@echo "XOS Image Build Date: `sudo docker inspect -f '{{ .Created }}' xosproject/xos`"
-	@echo "XOS Image Commit Hash: `sudo docker inspect -f '{{ .Config.Labels.XOS_GIT_COMMIT_HASH }}' xosproject/xos`"
-	@echo "XOS Image Commit Date: `sudo docker inspect -f '{{ .Config.Labels.XOS_GIT_COMMIT_DATE }}' xosproject/xos`"
-	sudo rm -f $(DOCKER_COMPOSE_YML)
-	sudo CONFIG_DIR=$(CONFIG_DIR) docker-compose -p $(BOOTSTRAP_PROJECT) -f $(BOOTSTRAP_YML) up -d
-	bash $(COMMON_DIR)/wait_for_xos_port.sh $(XOS_BOOTSTRAP_PORT)
-	sudo docker-compose -p $(BOOTSTRAP_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py none - < $(COMMON_DIR)/tosca/fixtures.yaml
-	sudo docker-compose -p $(BOOTSTRAP_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py none - < deployment.yaml
-	bash $(COMMON_DIR)/wait_for_xos_port.sh $(XOS_BOOTSTRAP_PORT)
-	$(RUN_TOSCA_BOOTSTRAP) $(CONFIG_DIR)/xos.yaml
-
 onboarding: synchronizers.yaml id_rsa id_rsa.pub
 	@echo "[ONBOARDING]"
 	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
@@ -50,9 +37,10 @@
 	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
 	bash $(COMMON_DIR)/wait_for_xos_port.sh $(XOS_UI_PORT)
 
-opencloud: opencloud.yaml
+opencloud: nodes.yaml management-net.yaml
 	@echo "[OPENCLOUD]"
-	$(RUN_TOSCA) opencloud.yaml
+	$(RUN_TOSCA) nodes.yaml
+	$(RUN_TOSCA) management-net.yaml
 
 vtn: vtn.yaml
 	@echo "[VTN]"