diff --git a/package/gluon-core/files/lib/gluon/upgrade/core/initial/010-gluon-system b/package/gluon-core/generate/lib/gluon/upgrade/core/initial/010-gluon-system
similarity index 92%
rename from package/gluon-core/files/lib/gluon/upgrade/core/initial/010-gluon-system
rename to package/gluon-core/generate/lib/gluon/upgrade/core/initial/010-gluon-system
index 635b5a53..d2803ff9 100755
--- a/package/gluon-core/files/lib/gluon/upgrade/core/initial/010-gluon-system
+++ b/package/gluon-core/generate/lib/gluon/upgrade/core/initial/010-gluon-system
@@ -34,7 +34,7 @@ EOF
 esac
 
 uci -q batch <<EOF
-	set system.@system[0].hostname='gluon-${macaddr//:/}'
+	set system.@system[0].hostname='@hostname_prefix@-${macaddr//:/}'
 	set system.@system[0].timezone='CET-1CEST,M3.5.0,M10.5.0/3'
 	commit system
 EOF