diff --git a/frontend/Makefile b/frontend/Makefile
index 9ad3fc1..bac183a 100644
--- a/frontend/Makefile
+++ b/frontend/Makefile
@@ -13,7 +13,7 @@
 RUN_TOSCA_BOOTSTRAP=python ../common/run_tosca.py $(XOS_BOOTSTRAP_PORT) $(ADMIN_USERNAME) $(ADMIN_PASSWORD)
 RUN_TOSCA=python ../common/run_tosca.py $(XOS_UI_PORT) $(ADMIN_USERNAME) $(ADMIN_PASSWORD)
 
-frontend: prereqs dirs download_services bootstrap onboarding frontendconfig
+frontend: prereqs dirs download_xos download_services bootstrap onboarding frontendconfig
 
 prereqs:
 	sudo make -f ../common/Makefile.prereqs
@@ -23,6 +23,9 @@
 	mkdir -p key_import
 	mkdir -p onboarding-docker-compose
 
+download_xos:
+	make -f ../common/Makefile.services xos_core
+
 download_services:
 	make -f ../common/Makefile.services
 
@@ -48,7 +51,7 @@
 	echo "[FRONTENDCONFIG]"
 	$(RUN_TOSCA) sample.yaml
 
-containers:
+containers: prereqs download_xos
 	make -f ../common/Makefile.containers xos_devel synchronizer onboarding_synchronizer
 
 stop: