diff --git a/common/Makefile b/common/Makefile
index b66ee6d..9f410d4 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -194,10 +194,13 @@
 	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
+$(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 -
 
+$(CONFIG_DIR)images/ceilometer-service-trusty-server-multi-nic.img: | config_dirs
+	curl -fLsS http://www.vicci.org/cord/ceilometer-service-trusty-server-multi-nic.compressed.qcow2 -o $@
+	echo "9c346ff15727e9a98942835d6bd34b3d033f868234425f517e53d64b5a124a13  $@" | sha256sum -c -
 
 # utilties/convenience targets
 cleanup: stop rm $(CONFIG_DIR)/cleanup.sh
diff --git a/cord-pod/Makefile b/cord-pod/Makefile
index 4567130..72a4824 100644
--- a/cord-pod/Makefile
+++ b/cord-pod/Makefile
@@ -100,11 +100,15 @@
 	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: onboard-monitoringservice
+cord-monitoringservice: ceilometer_custom_images onboard-monitoringservice
 	$(RUN_TOSCA) monitoringservice.yaml
 	$(RUN_TOSCA) monitoringtenant.yaml
 
-onboard-monitoringservice: $(SERVICE_DIR)/monitoring
+rebuild-monitoringservice:
+	bash $(COMMON_DIR)/rebuild.sh $(XOS_BOOTSTRAP_PORT) monitoring
+	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
+
+onboard-monitoringservice: ceilometer_custom_images $(SERVICE_DIR)/monitoring
 	sudo cp id_rsa key_import/monitoringservice_rsa
 	sudo cp id_rsa.pub key_import/monitoringservice_rsa.pub
 	$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/monitoring/xos/monitoring-onboard.yaml
@@ -113,6 +117,8 @@
 	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
 	bash $(COMMON_DIR)/wait_for_xos_port.sh $(XOS_UI_PORT)
 
+ceilometer_custom_images: $(CONFIG_DIR)images/ceilometer-trusty-server-multi-nic.img $(CONFIG_DIR)images/ceilometer-service-trusty-server-multi-nic.img
+
 virtualbng_json:
 	export SETUPDIR=$(CONFIG_DIR); bash ./make-virtualbng-json.sh