diff --git a/common/Makedefs b/common/Makedefs
index d20f493..c7a808d 100644
--- a/common/Makedefs
+++ b/common/Makedefs
@@ -10,6 +10,8 @@
 XOS_DIR              ?= $(HOME_DIR)/xos
 SERVICE_DIR          ?= $(HOME_DIR)/xos_services
 LIBRARY_DIR          ?= $(HOME_DIR)/xos_libraries
+REST_GW_DIR          ?= $(HOME_DIR)/xos-rest-gw
+GUI_DIR              ?= $(HOME_DIR)/xos-gui
 
 XOS_BOOTSTRAP_PORT   ?= 81
 XOS_UI_PORT          ?= 80
diff --git a/common/Makefile b/common/Makefile
index 48f5ef3..4451670 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -173,6 +173,14 @@
 xos_test_c:
 	cd $(XOS_DIR)/containers/xos; make test
 
+xos_rest_gw_c:
+	# this folder is cloned by repo
+	cd $(REST_GW_DIR); docker build -t xosproject/xos-rest-gw .
+
+xos_gui_c:
+	# this folder is cloned by repo
+	cd $(GUI_DIR); docker build -t xosproject/xos-gui .
+
 
 # utilties/convenience targets
 cleanup: stop rm $(CONFIG_DIR)/cleanup.sh