diff --git a/ffho/ffho-site-generate/luasrc/lib/gluon/upgrade/005-set-site-config b/ffho/ffho-site-generate/luasrc/lib/gluon/upgrade/005-set-site-config
index e499fb844582466a3a174a6b6d6477a1c3186dd7..39cfd42a04c8309ff9ed65d2b9c2febbdd1300da 100755
--- a/ffho/ffho-site-generate/luasrc/lib/gluon/upgrade/005-set-site-config
+++ b/ffho/ffho-site-generate/luasrc/lib/gluon/upgrade/005-set-site-config
@@ -16,18 +16,22 @@ if site_code ~= currentsite then
   local configured = false
   for _, site in pairs(sites) do
     if site.site_code == currentsite then
+      local subst = {}
+      subst['%%SN'] = site.site_name
+      subst['%%SC'] = site.site_code
+
       if site.subst then
         config = tools.replace_patterns(config, site.subst)
       end
+
       if (site.site_select or {}).group and groups and groups[site.site_select.group] then
         group = groups[site.site_select.group]
+        subst['%%GN'] = site.site_select.group
         if group.subst then
           config = tools.replace_patterns(config, group.subst)
         end
       end
-      local subst = {}
-      subst['%%SN'] = site.site_name
-      subst['%%SC'] = site.site_code
+
       config = tools.replace_patterns(config, subst)
 
       local file = '/lib/gluon/site.json'