diff --git a/koji-setup/koji-bootstrap-build.sh b/koji-setup/koji-bootstrap-build.sh
index fdbddad..d306445 100755
--- a/koji-setup/koji-bootstrap-build.sh
+++ b/koji-setup/koji-bootstrap-build.sh
@@ -96,8 +96,10 @@ sudo -u kojiadmin koji regen-repo dist-"$TAG"-build
 for REPO in contribs addons updates updates-testing testing ; do
     TAG="sme$RELEASE-$REPO"
     sudo -u kojiadmin koji add-tag --parent dist-sme$RELEASE-os dist-"$TAG"
-    sudo -u kojiadmin koji regen-repo dist-"$TAG"-build
 done
+# Only build for smeos and smecontribs - others are staging
+sudo -u kojiadmin koji add-tag --parent dist-sme$RELEASE-contribs dist-sme$RELEASE-build
+sudo -u kojiadmin koji regen-repo dist-sme$RELEASE-contribs-build
 # Releases sme11 and sme12 are based on Rocky 8
 PKGMANAGER="dnf"
 BOOTSTRAPIMAGE="rocky:8"
@@ -131,6 +133,8 @@ for RELEASE in 11 12 ; do
     for REPO in contribs addons updates updates-testing testing ; do
         TAG="sme$RELEASE-$REPO"
         sudo -u kojiadmin koji add-tag --parent dist-sme$RELEASE-os dist-"$TAG"
-        sudo -u kojiadmin koji regen-repo dist-"$TAG"-build
     done
+    # Only build for smeos and smecontribs - others are staging
+    sudo -u kojiadmin koji add-tag --parent dist-sme$RELEASE-contribs dist-sme$RELEASE-build
+    sudo -u kojiadmin koji regen-repo dist-sme$RELEASE-contribs-build
 done