diff --git a/README.md b/README.md
index 3d71455..b6a8b41 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,8 @@
 You'll also need to create a `xos.yaml` which specifies the configuration of
 the onboarded XOS container, and `docker-compose-bootstrap.yml` which
 configures the bootstrap containers.  Optionally, create a `cleanup.sh` to
-clean up between run, if your service profile requires it.
+clean up between run, if your service profile requires it - this enables the
+`make cleanup` target.
 
 ## Utility/Convenience targets
 
@@ -89,4 +90,3 @@
  - Open a shell on the Database container: `make enter-db`
 
 
-
diff --git a/common/Makedefs b/common/Makedefs
index 5a4560e..73c6bfb 100644
--- a/common/Makedefs
+++ b/common/Makedefs
@@ -9,7 +9,7 @@
 
 XOS_DIR              ?= $(HOME_DIR)/xos
 SERVICE_DIR          ?= $(HOME_DIR)/xos_services
-LIBRARY_DIR	     ?= $(HOME_DIR)/xos_libraries
+LIBRARY_DIR          ?= $(HOME_DIR)/xos_libraries
 
 XOS_BOOTSTRAP_PORT   ?= 81
 XOS_UI_PORT          ?= 80
diff --git a/common/Makefile b/common/Makefile
index 4d52349..b4b969b 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -170,10 +170,25 @@
 	cd $(XOS_DIR)/containers/xos; make test
 
 
+# image downloads
+
+$(CONFIG_DIR)images/trusty-server-multi-nic.img: config_dirs
+	curl -fLsS http://www.vicci.org/opencloud/trusty-server-cloudimg-amd64-disk1.img -o $@
+	echo "c2d0ffc937aeb96016164881052a496658efeb98959dc68e73d9895c5d9920f7  $@" | sha256sum -c -
+
+$(CONFIG_DIR)images/vsg-1.1.img: config_dirs
+	curl -fLsS http://www.vicci.org/cord/vsg-1.1.img -o $@
+	echo "16b0beb6778aed0f5feecb05f8d5750e6c262f98e6011e99ddadf7d46a177b6f  $@" | sha256sum -c -
+
+$(CONFIG_DIR)images/ceilometer-trusty-server-multi-nic.img: config_dirs
+	curl -fLsS http://www.vicci.org/cord/ceilometer-trusty-server-multi-nic.compressed.qcow2 -o $@
+	echo "afde3f0448483902693be4d52ae76bb683fd74b1c7728019094bf81b37d86105  $@" | sha256sum -c -
+
+
 # utilties/convenience targets
-cleanup: stop rm
+cleanup: stop rm $(CONFIG_DIR)/cleanup.sh
 	$(CONFIG_DIR)/cleanup.sh
-	bash -c "source ./admin-openrc.sh; nova list --all-tenants; neutron net-list"
+	bash -c "source $(CONFIG_DIR)/admin-openrc.sh; nova list --all-tenants; neutron net-list"
 
 cleanup_services: $(SERVICE_DIR)
 	rm -rf $(SERVICE_DIR)/*
diff --git a/cord-pod/Makefile b/cord-pod/Makefile
index 5eeed41..a4f03ac 100644
--- a/cord-pod/Makefile
+++ b/cord-pod/Makefile
@@ -55,6 +55,9 @@
 vtn: vtn-external.yaml
 	$(RUN_TOSCA) vtn-external.yaml
 
+vtn-external.yaml:
+	export SETUPDIR=$(CONFIG_DIR); bash ./make-vtn-external-yaml.sh
+
 delete_fabric_config:
 	http -a karaf:karaf DELETE http://onos-fabric:8181/onos/v1/network/configuration/
 
@@ -63,17 +66,17 @@
 	http -a karaf:karaf POST http://onos-fabric:8181/onos/v1/applications/org.onosproject.segmentrouting/active
 
 fabric: fabric.yaml
-	cp ../../xos_services/fabric/config/network-cfg-quickstart.json .
+	cp $(SERVICE_DIR)/fabric/config/network-cfg-quickstart.json .
 	$(RUN_TOSCA) fabric.yaml
 
-cord: vsg_custom_images
+fabric.yaml:
+	export SETUPDIR=$(CONFIG_DIR); bash ./make-fabric-yaml.sh
+
+cord: $(CONFIG_DIR)/images/vsg-1.1.img
 	$(RUN_TOSCA) $(COMMON_DIR)/tosca/mgmt-net.yaml
 	$(RUN_TOSCA) cord-services.yaml
 	$(RUN_TOSCA) $(COMMON_DIR)/tosca/cord-volt-devices.yaml
 
-vsg_custom_images: images/vsg-1.1.img
-	bash -c "source ./admin-openrc.sh; glance image-show vsg-1.1 || glance image-create --name vsg-1.1 --disk-format qcow2 --file ./images/vsg-1.1.img --container-format bare"
-
 cord-subscriber:
 	$(RUN_TOSCA) cord-test-subscriber.yaml
 
@@ -96,7 +99,7 @@
 	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
 	bash $(COMMON_DIR)/wait_for_xos_port.sh $(XOS_UI_PORT)
 
-cord-monitoringservice: ceilometer_custom_images onboard-monitoringservice
+cord-monitoringservice: onboard-monitoringservice
 	$(RUN_TOSCA) monitoringservice.yaml
 	$(RUN_TOSCA) monitoringtenant.yaml
 
@@ -109,12 +112,6 @@
 	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
 	bash $(COMMON_DIR)/wait_for_xos_port.sh $(XOS_UI_PORT)
 
-vtn-external.yaml:
-	export SETUPDIR=$(CONFIG_DIR); bash ./make-vtn-external-yaml.sh
-
-fabric.yaml:
-	export SETUPDIR=$(CONFIG_DIR); bash ./make-fabric-yaml.sh
-
 virtualbng_json:
 	export SETUPDIR=$(CONFIG_DIR); bash ./make-virtualbng-json.sh
 
diff --git a/mcord/Makefile b/mcord/Makefile
index cce2917..c4a1101 100644
--- a/mcord/Makefile
+++ b/mcord/Makefile
@@ -55,23 +55,6 @@
 	$(RUN_TOSCA) mgmt-net.yaml
 	$(RUN_TOSCA) mcord.yaml
 
-ceilometer_custom_images: images/ceilometer-service-trusty-server-multi-nic.img images/ceilometer-trusty-server-multi-nic.img
-	#TODO: Add logic for service VM custom image (ceilometer-service-trusty-server-multi-nic)
-	bash -c "source ./admin-openrc.sh; glance image-show ceilometer-trusty-server-multi-nic || glance image-create --name ceilometer-trusty-server-multi-nic --disk-format qcow2 --file ./images/ceilometer-trusty-server-multi-nic.compressed.qcow2 --container-format bare"
-
-#vsg_custom_images: images/vsg-1.1.img
-#	bash -c "source ./admin-openrc.sh; glance image-show vsg-1.1 || glance image-create --name vsg-1.1 --disk-format qcow2 --file ./images/vsg-1.1.img --container-format bare"
-
-images/ceilometer-trusty-server-multi-nic.img: images
-	bash -c "source ./admin-openrc.sh; glance image-show ceilometer-trusty-server-multi-nic || wget http://www.vicci.org/cord/ceilometer-trusty-server-multi-nic.compressed.qcow2 -P ./images"
-
-images/ceilometer-service-trusty-server-multi-nic.img: images
-	#TODO: Add logic for service VM custom image (ceilometer-service-trusty-server-multi-nic) once image is uploaded into vicci portal
-	#bash -c "source ../setup/admin-openrc.sh; glance image-show ceilometer-service-trusty-server-multi-nic || wget http://www.vicci.org/cord/ceilometer-service-trusty-server-multi-nic.compressed.qcow2 -P ./images"
-
-#images/vsg-1.1.img: images
-#	[ -s images/vsg-1.1.img ] || wget http://www.vicci.org/cord/vsg-1.1.img -P ./images
-
 onboard-slicing: slicing-ui
 	@echo "[ONBOARDING]"
 	# on-board slicing services here