diff --git a/koji-setup/koji-bootstrap-build.sh b/koji-setup/koji-bootstrap-build.sh
index cd221b6..8058a1b 100755
--- a/koji-setup/koji-bootstrap-build.sh
+++ b/koji-setup/koji-bootstrap-build.sh
@@ -72,8 +72,6 @@ CHROOTSETUPCMD=' install @buildsys-build  @buildsys scl-utils-build python27-bui
 TAG="sme$RELEASE-os"
 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
 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"
 sudo -u kojiadmin koji edit-tag -x rpm.macro.distribution="$DISTRIBUTION" dist-"$TAG"
@@ -100,7 +98,10 @@ sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build sclo-rh http://mir
 sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build buildsys-core http://buildsys.koozali.org/build/10/smeserver-core/\$arch/
 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
+sudo -u kojiadmin koji regen-repo dist-"sme$RELEASE"-build --nowait
+# add the build tag for this RELEASE (parent is the os target)
+sudo -u kojiadmin koji add-tag --parent dist-"$TAG" --arches="$RPM_ARCH" dist-"sme$RELEASE"-build
+sudo -u kojiadmin koji add-target "$TAG" dist-"sme$RELEASE"-build dist-"$TAG"
 # 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
@@ -108,16 +109,7 @@ sudo -u kojiadmin koji regen-repo dist-"$TAG"-build --nowait
 # 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"
-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 add-tag-inheritance dist-$TAG-build dist-sme$RELEASE-os --priority 10
-sudo -u kojiadmin koji edit-tag dist-"$TAG" -x mock.bootstrap_image="$BOOTSTRAPIMAGE"
-sudo -u kojiadmin koji edit-tag dist-"$TAG" -x mock.chroot_setup_cmd="$CHROOTSETUPCMD"
-sudo -u kojiadmin koji add-group dist-"$TAG"-build build
-sudo -u kojiadmin koji add-group dist-"$TAG"-build srpm-build
-sudo -u kojiadmin koji add-group-pkg dist-"$TAG"-build build install scl-utils-build python27-build epel-rpm-macros bash bzip2 coreutils cpio diffutils findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which yum-utils xz
-sudo -u kojiadmin koji add-group-pkg dist-"$TAG"-build srpm-build rpm-build coreutils cpio curl-bin elfutils file git git-lfs glibc-utils grep gzip make pigz plzip rpm sed shadow tar unzip wget xz
-sudo -u kojiadmin koji regen-repo dist-$TAG-build --nowait
 # setup the rest of the sme10 repos
 for REPO in addons updates updates-testing testing ; do
     TAG="sme$RELEASE-$REPO"
@@ -125,9 +117,10 @@ for REPO in addons updates updates-testing testing ; do
 done
 
 # Release sme11 is based on Rocky 8 (EL8)
-RELEASE="11"
+RELEASE="sme11"
 DISTRIBUTION="SME Server v$RELEASE"
 TAG="sme$RELEASE-os"
+PARENT="$TAG"
 EL="8"
 DIST=".el$EL.sme"
 PKGMANAGER="dnf"
@@ -147,56 +140,38 @@ sudo -u kojiadmin koji add-external-repo remi$EL http://rpms.remirepo.net/enterp
 sudo -u kojiadmin koji add-external-repo remi-modular$EL http://rpms.remirepo.net/enterprise/$EL/modular/\$arch/    
 sudo -u kojiadmin koji add-external-repo remi-safe$EL http://rpms.remirepo.net/enterprise/$EL/safe/\$arch/    
 # Setup the os repo - parent of others who will inherit most properties
-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
-sudo -u kojiadmin koji add-group dist-"$TAG"-build build
-sudo -u kojiadmin koji add-group dist-"$TAG"-build srpm-build
-sudo -u kojiadmin koji edit-tag -x mock.bootstrap_image="$BOOTSTRAPIMAGE" dist-"$TAG"
-sudo -u kojiadmin koji edit-tag -x rpm.macro.distribution="$DISTRIBUTION" dist-"$TAG"
-sudo -u kojiadmin koji edit-tag -x rpm.macro.dist="$DIST" dist-"$TAG"
-sudo -u kojiadmin koji edit-tag -x rpm.macro.packager="$PACKAGER" dist-"$TAG"
-sudo -u kojiadmin koji edit-tag -x rpm.macro.vendor="$VENDOR" dist-"$TAG"
-sudo -u kojiadmin koji add-group-pkg dist-"$TAG"-build build epel-rpm-macros bash bzip2 coreutils cpio diffutils findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which yum-utils xz
-sudo -u kojiadmin koji add-group-pkg dist-"$TAG"-build srpm-build coreutils cpio elfutils file grep gzip make pigz rpm rpm-build sed tar unzip wget xz
-sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare os$EL
-sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare remi-safe$EL
-sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare remi-modular$EL
-sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare appstream$EL
-sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare powertools$EL 
-sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare epel$EL 
-sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare openfusion$EL
-sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare rpmfusion$EL
-sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare remi$EL
-sudo -u kojiadmin koji regen-repo dist-"$TAG"-build --nowait
-# Only need 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"
-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 add-tag-inheritance dist-$TAG-build dist-sme$RELEASE-os --priority 10    
-sudo -u kojiadmin koji edit-tag dist-"$TAG" -x mock.bootstrap_image="$BOOTSTRAPIMAGE"
-sudo -u kojiadmin koji add-group dist-"$TAG"-build build
-sudo -u kojiadmin koji add-group dist-"$TAG"-build srpm-build
-sudo -u kojiadmin koji add-group-pkg dist-"$TAG"-build build epel-rpm-macros bash bzip2 coreutils cpio diffutils findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which yum-utils xz
-sudo -u kojiadmin koji add-group-pkg dist-"$TAG"-build srpm-build rpm-build coreutils cpio elfutils file grep gzip make perl pigz rpm sed tar unzip wget xz
-sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare smeos$EL
-sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare os$EL
-sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare remi-safe$EL
-sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare remi-modular$EL
-sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare appstream$EL
-sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare powertools$EL 
-sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare epel$EL 
-sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare openfusion$EL
-sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare rpmfusion$EL
-sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare remi$EL
-sudo -u kojiadmin koji regen-repo dist-$TAG-build --nowait
-# setup the rest of the repos
-for REPO in 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 add-tag --arches="$RPM_ARCH" dist-"$PARENT"
+sudo -u kojiadmin koji edit-tag -x mock.package_manager="$PKGMANAGER" dist-"$PARENT"
+sudo -u kojiadmin koji edit-tag -x mock.bootstrap_image="$BOOTSTRAPIMAGE" dist-"$PARENT"
+sudo -u kojiadmin koji edit-tag -x rpm.macro.distribution="$DISTRIBUTION" dist-"$PARENT"
+sudo -u kojiadmin koji edit-tag -x rpm.macro.dist="$DIST" dist-"$PARENT"
+sudo -u kojiadmin koji edit-tag -x rpm.macro.packager="$PACKAGER" dist-"$PARENT"
+sudo -u kojiadmin koji edit-tag -x rpm.macro.vendor="$VENDOR" dist-"$PARENT"
+# add build tag for all $RELEASE targets
+BUILDTAG="$RELEASE-build"
+sudo -u kojiadmin koji add-tag --parent dist-"$PARENT" --arches="$RPM_ARCH" dist-"$BUILDTAG"
+sudo -u kojiadmin koji add-group dist-"$BUILDTAG" build
+sudo -u kojiadmin koji add-group dist-"$BUILDTAG" srpm-build
+sudo -u kojiadmin koji add-group-pkg dist-"$BUILDTAG" build epel-rpm-macros bash bzip2 coreutils cpio diffutils findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which yum-utils xz
+sudo -u kojiadmin koji add-group-pkg dist-"$BUILDTAG" srpm-build coreutils cpio elfutils file grep gzip make pigz rpm rpm-build sed tar unzip wget xz
+sudo -u kojiadmin koji add-external-repo -t dist-"$BUILDTAG" -m bare os$EL
+sudo -u kojiadmin koji add-external-repo -t dist-"$BUILDTAG" -m bare remi-safe$EL
+sudo -u kojiadmin koji add-external-repo -t dist-"$BUILDTAG" -m bare remi-modular$EL
+sudo -u kojiadmin koji add-external-repo -t dist-"$BUILDTAG" -m bare appstream$EL
+sudo -u kojiadmin koji add-external-repo -t dist-"$BUILDTAG" -m bare powertools$EL 
+sudo -u kojiadmin koji add-external-repo -t dist-"$BUILDTAG" -m bare epel$EL 
+sudo -u kojiadmin koji add-external-repo -t dist-"$BUILDTAG" -m bare openfusion$EL
+sudo -u kojiadmin koji add-external-repo -t dist-"$BUILDTAG" -m bare rpmfusion$EL
+sudo -u kojiadmin koji add-external-repo -t dist-"$BUILDTAG" -m bare remi$EL
+sudo -u kojiadmin koji regen-repo dist-"$BUILDTAG" --nowait
+# setup the rest of the repos - all inherit values from os
+for REPO in contribs contribs-testing addons updates updates-testing testing ; do
+    TAG="$RELEASE-$REPO"
+    sudo -u kojiadmin koji add-tag --parent "dist-$PARENT" "dist-$TAG"
 done
+# set up the smeserver and smecontribs targets
+sudo -u kojiadmin koji add-target $RELEASE-test $BUILDTAG "dist-$RELEASE-testing"
+sudo -u kojiadmin koji add-target $RELEASE-contribs-test $BUILDTAG "dist-$RELEASE-contribs-testing"
 
 # Release sme12 is based on Rocky 9 (EL9)
 RELEASE="12"