diff --git a/xos/configurations/syndicate/MS.mk b/xos/configurations/syndicate/MS.mk
index b51d7ec..dc65237 100644
--- a/xos/configurations/syndicate/MS.mk
+++ b/xos/configurations/syndicate/MS.mk
@@ -1,6 +1,7 @@
-# MS build parameters 
+# MS build parameters
 
 MS_APP_ADMIN_EMAIL        ?= sites@opencloud.us
+MS_APP_PUBLIC_HOST				?= localhost
 MS_APP_ADMIN_PUBLIC_KEY   ?= ms/admin.pub
 MS_APP_ADMIN_PRIVATE_KEY  ?= ms/admin.pem
 
@@ -35,4 +36,12 @@
 ms/app.yaml: ms/app.yamlin
 	mkdir -p "$(@D)"
 	cat "$<" | \
-		sed -e 's~@MS_APP_NAME@~$(MS_APP_NAME)~g;' > "$@"
+		sed -e 's~@MS_APP_NAME@~$(MS_APP_NAME)~g;' | \
+		sed -e 's~@MS_APP_PUBLIC_HOST@~$(MS_APP_PUBLIC_HOST)~g;' > "$@"
+
+clean: 
+	rm -f ms/admin_info.py ms/app.yaml
+
+clean_certs:
+	rm -f $(MS_APP_ADMIN_PUBLIC_KEY) $(MS_APP_ADMIN_PRIVATE_KEY) $(MS_APP_PUBLIC_KEY) $(MS_APP_PRIVATE_KEY)
+
diff --git a/xos/configurations/syndicate/Makefile b/xos/configurations/syndicate/Makefile
index f057182..c15b855 100644
--- a/xos/configurations/syndicate/Makefile
+++ b/xos/configurations/syndicate/Makefile
@@ -1,5 +1,4 @@
-MYIP:=$(shell hostname -i)
-
+# MYIP:=$(shell hostname -i)
 
 cloudlab: common_cloudlab xos
 
@@ -11,13 +10,13 @@
 	sudo MYIP=$(MYIP) docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /opt/xos/configurations/common/base.yaml
 	sudo MYIP=$(MYIP) docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/nodes.yaml
 
-containers: 
+containers:
 	cd ../../../containers/xos; make devel
 	cd ../../../containers/synchronizer; make
 	cd ../../../containers/syndicate-ms; make
 
+# see Makefiles on this project: https://github.com/syndicate-storage/syndicate-core
 include MS.mk
-# see also 
 syndicate_config: ms/admin_info.py ms/app.yaml
 
 common_cloudlab:
diff --git a/xos/configurations/syndicate/ms/app.yamlin b/xos/configurations/syndicate/ms/app.yamlin
index c480565..ea8080b 100644
--- a/xos/configurations/syndicate/ms/app.yamlin
+++ b/xos/configurations/syndicate/ms/app.yamlin
@@ -43,3 +43,5 @@
 - name: django
   version: 1.4
 
+env_variables:
+  MS_APP_PUBLIC_HOST: '@MS_APP_PUBLIC_HOST@'