diff --git a/build.sh b/build.sh
index 55974cf..2262645 100755
--- a/build.sh
+++ b/build.sh
@@ -64,8 +64,6 @@ announce Starting make update...
 for s in $sites; do
 	export GLUON_SITEDIR="${site_path}/sites/${s}"
 	export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_BRANCH}/${s}"
-	export GLUON_IMAGEDIR="${GLUON_OUTPUTDIR}/images"
-	export GLUON_MODULEDIR="${GLUON_OUTPUTDIR}/modules"
 	rm -rf "${GLUON_OUTPUTDIR}"
 	mkdir -p "${GLUON_IMAGEDIR}" "${GLUON_MODULEDIR}"
 	make update
diff --git a/template/site.conf.erb b/template/site.conf.erb
index e0103ec..1b46d6c 100644
--- a/template/site.conf.erb
+++ b/template/site.conf.erb
@@ -28,7 +28,7 @@
 		},
 <% if gluon_ath10k_mesh == "11s" -%>
 		mesh = {
-			id = '6668682D73756564',
+			id = '<%= ("00000000" + site_code)[-8..-1].each_byte.map { |b| b.to_s(16) }.join.upcase %>',
 			mcast_rate = 12000,
 		},
 <% else -%>
@@ -47,7 +47,7 @@
 		},
 <% if gluon_ath10k_mesh == "11s" -%>
 		mesh = {
-			id = '6668682D73756564',
+			id = '<%= ("00000000" + site_code)[-8..-1].each_byte.map { |b| b.to_s(16) }.join.upcase %>',
 			mcast_rate = 12000,
 		},
 <% else -%>
@@ -70,7 +70,7 @@
 		enabled = true,
 		mtu = <%= mtu %>,
 		fastd = {
-			configurable = true,         
+			configurable = true,
 			methods = {'salsa2012+umac'},
 			groups = {
 				backbone = {