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)/*