diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f6dc35946f9b795a98e5d32a97734f3bcf21e4b7..d15c051b36751036ef0dcfb0aa6755b537dd62ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,7 +67,7 @@ update:
   except:
     - tags
   script:
-    - make -C gluon GLUON_SITEDIR="$CI_PROJECT_DIR" GLUON_TARGET="$GLUON_TARGET" GLUON_BRANCH=stable FFS_BUILD_DATE=$(cat build.date) BROKEN="$BROKEN" V=1 -j`nproc`
+    - make -C gluon GLUON_SITEDIR="$CI_PROJECT_DIR" GLUON_TARGET="$GLUON_TARGET" GLUON_AUTOUPDATER_BRANCH=stable GLUON_AUTOUPDATER_ENABLED=1 FFS_BUILD_DATE=$(cat build.date) BROKEN="$BROKEN" V=1 -j`nproc`
   artifacts: 
     paths:
       - gluon/output/
@@ -187,7 +187,7 @@ target:x86-64:
 package:
   stage: package
   script:
-    - for branch in "stable" "beta" "nightly" "experimental"; do make -C gluon manifest GLUON_BRANCH="$branch" GLUON_SITEDIR="$CI_PROJECT_DIR" FFS_BUILD_DATE=$(cat build.date) V=1; done
+    - for branch in "stable" "beta" "nightly" "experimental"; do make -C gluon manifest GLUON_AUTOUPDATER_BRANCH="$branch" GLUON_AUTOUPDATER_ENABLED=1 GLUON_SITEDIR="$CI_PROJECT_DIR" FFS_BUILD_DATE=$(cat build.date) V=1; done
     - if [ -n "$GLUON_SIGN_KEY" ]; then cd gluon && for branch in "nightly" "experimental"; do ./contrib/sign.sh <(echo "$GLUON_SIGN_KEY") "output/images/sysupgrade/$branch.manifest"; done; fi
   cache:
     paths:
diff --git a/buildall.sh b/buildall.sh
index f784b3024621964e06abee8e104810b92e469b94..4077a0f17fff3f1e0d14d678f58822e53609097c 100755
--- a/buildall.sh
+++ b/buildall.sh
@@ -34,5 +34,5 @@ make -C gluon update GLUON_SITEDIR="$sitedir" V=1
 
 for target in ${TARGETS[@]}; do
 	echo Building $target
-	make -C gluon GLUON_TARGET=$target GLUON_BRANCH=$branch GLUON_SITEDIR="$sitedir" BROKEN=1 V=1 -j`nproc`
+	make -C gluon GLUON_TARGET=$target GLUON_AUTOUPATER_BRANCH=$branch GLUON_AUTOUPDATER_ENABLED=1 GLUON_SITEDIR="$sitedir" BROKEN=1 V=1 -j`nproc`
 done