diff --git a/koji-setup/koji-bootstrap-build.sh b/koji-setup/koji-bootstrap-build.sh
index 823d986..e0053eb 100755
--- a/koji-setup/koji-bootstrap-build.sh
+++ b/koji-setup/koji-bootstrap-build.sh
@@ -70,9 +70,9 @@ PKGMANAGER="yum"
 BOOTSTRAPIMAGE="centos:7"
 CHROOTSETUPCMD=' install @buildsys-build  @buildsys scl-utils-build python27-build rpm-build '
 TAG="sme$RELEASE-os"
-sudo -u kojiadmin koji add-tag dist-"$TAG"
+sudo -u kojiadmin koji add-tag --arches="$RPM_ARCH" dist-"$TAG"
 sudo -u kojiadmin koji edit-tag dist-"$TAG" -x mock.package_manager=$PKGMANAGER
-sudo -u kojiadmin koji add-tag --parent dist-"$TAG" --arches "$RPM_ARCH" dist-"$TAG"-build
+sudo -u kojiadmin koji add-tag --parent dist-"$TAG" --arches="$RPM_ARCH" dist-"$TAG"-build
 sudo -u kojiadmin koji add-target dist-"$TAG" dist-"$TAG"-build
 sudo -u kojiadmin koji edit-tag -x mock.bootstrap_image="$BOOTSTRAPIMAGE" dist-"$TAG"
 sudo -u kojiadmin koji edit-tag -x mock.chroot_setup_cmd="$CHROOTSETUPCMD" dist-"$TAG"
@@ -101,6 +101,10 @@ sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build buildsys-core http
 sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build buildsys-contribs http://buildsys.koozali.org/build/10/smeserver-contribs/\$arch/
 sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build groups http://buildsys.koozali.org/build/10/smeserver-groups/\$arch/
 sudo -u kojiadmin koji regen-repo dist-"$TAG"-build --nowait
+# Add in all packages that make up this repo
+# do an api call against gitea to list all the repos in smeserver organisation
+# sudo -u kojiadmin koji add-pkg dist-"$TAG" $pkglist
+
 # Only build for smeos and smecontribs - others are staging
 TAG="sme$RELEASE-contribs"
 sudo -u kojiadmin koji add-tag --parent dist-sme$RELEASE-os dist-"$TAG"
@@ -140,7 +144,7 @@ for RELEASE in 11 12 ; do
 # Setup the os repo - parent of others who will inherit most properties
     DISTRIBUTION="SME Server v$RELEASE"
     TAG="sme$RELEASE-os"
-    sudo -u kojiadmin koji add-tag dist-"$TAG"
+    sudo -u kojiadmin koji add-tag --arches="$RPM_ARCH" dist-"$TAG"
     sudo -u kojiadmin koji edit-tag dist-"$TAG" -x mock.package_manager="$PKGMANAGER"
     sudo -u kojiadmin koji add-tag --parent dist-"$TAG" --arches="$RPM_ARCH" dist-"$TAG"-build
     sudo -u kojiadmin koji add-target dist-"$TAG" dist-"$TAG"-build