diff --git a/common_factories.py b/common_factories.py
index ff7e9822..ac5df710 100644
--- a/common_factories.py
+++ b/common_factories.py
@@ -70,7 +70,7 @@ def run(self):
             )
 
             if tests:
-                test_args = " ".join(tests)
+                test_args = " ".join(set(tests))
                 self.setProperty("tests_to_run", test_args)
 
         return results.SUCCESS
@@ -463,7 +463,7 @@ def getRpmAutobakeFactory(mtrDbPool):
 baseurl=%(kw:url)s/%(prop:tarbuildnum)s/%(prop:buildername)s/rpms
 gpgcheck=0
 EOF
-            if [ "%(prop:rpm_type)s" = rhel8 ] || [ "%(prop:rpm_type)s" = centosstream8 ]; then
+            if [ "%(prop:rpm_type)s" = rhel8 ] || [ "%(prop:rpm_type)s" = centosstream8 ] || [ "%(prop:rpm_type)s" = alma8 ] || [ "%(prop:rpm_type)s" = rocky8 ]; then
                 echo "module_hotfixes = 1" >> MariaDB.repo
             fi
         """,
diff --git a/constants.py b/constants.py
index 01bfa9ed..f7eec62e 100644
--- a/constants.py
+++ b/constants.py
@@ -134,6 +134,7 @@
     "amd64-fedora-39",
     "amd64-freebsd-14",
     "amd64-rhel-9",
+    "amd64-sles-15",
     "ppc64be-aix-71",
     "ppc64le-centos-stream9",
     "ppc64le-debian-11",
diff --git a/master-docker-nonstandard-2/master.cfg b/master-docker-nonstandard-2/master.cfg
index 98179be0..1e2dba8b 100644
--- a/master-docker-nonstandard-2/master.cfg
+++ b/master-docker-nonstandard-2/master.cfg
@@ -144,6 +144,7 @@ addWorker(
     "quay.io/mariadb-foundation/bb-worker:debian12-386",
     jobs=20,
     save_packages=False,
+    shm_size="30G",
 )
 
 addWorker(
@@ -153,6 +154,7 @@ addWorker(
     "quay.io/mariadb-foundation/bb-worker:debian12-386",
     jobs=20,
     save_packages=False,
+    shm_size="30G",
 )
 
 addWorker(
diff --git a/master-nonlatent/master.cfg b/master-nonlatent/master.cfg
index 81c9ad14..5a831d80 100644
--- a/master-nonlatent/master.cfg
+++ b/master-nonlatent/master.cfg
@@ -1063,7 +1063,7 @@ c["builders"].append(
     util.BuilderConfig(
         name="aarch64-macos-compile-only",
         workernames=["bbw1-mac", "bbw2-mac"],
-        tags=["MacOS", "quick"],
+        tags=["MacOS", "quick", "protected"],
         collapseRequests=True,
         nextBuild=nextBuild,
         factory=get_macos_factory(compile_only=True),
diff --git a/scripts/bash_lib.sh b/scripts/bash_lib.sh
index 853483ee..ff5eca17 100644
--- a/scripts/bash_lib.sh
+++ b/scripts/bash_lib.sh
@@ -303,7 +303,8 @@ rpm_setup_mariadb_mirror() {
 [mariadb]
 name=MariaDB
 baseurl=$baseurl
-# //TEMP following is probably not needed for all OS
+# //TEMP following is not needed for all OS
+# - rhel8 based OS (almalinux 8, rockylinux 8, centos 8)
 module_hotfixes = 1
 gpgkey=https://rpm.mariadb.org/RPM-GPG-KEY-MariaDB
 gpgcheck=1
diff --git a/utilities.py b/utilities.py
deleted file mode 100644
index 53e04aa9..00000000
--- a/utilities.py
+++ /dev/null
@@ -1,39 +0,0 @@
-from buildbot.plugins import *
-from buildbot.steps.shell import ShellCommand
-
-# This file is for storing all utility functions used within buildbot's master.cfg
-# The goal is to clean up the master.cfg such that only basic declarative logic is
-# needed in master.cfg
-def checkoutUsingGitWorktree():
-    return ShellCommand(
-             name="fetch_using_git",
-             description="fetching using git",
-             descriptionDone="fetch and git checked out...done",
-             haltOnFailure=True,
-             command=["bash", "-xc", util.Interpolate("""
-  d=/mnt/packages/
-  cd "$d"
-  revision="%(prop:revision)s"
-  branch="%(prop:branch)s"
-  basebranch=${branch#*-}
-  basebranch=${basebranch%%-*}
-  [ ! -d mariadb-server ] && git clone https://github.com/MariaDB/server.git mariadb-server
-
-  # PR? curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/MariaDB/server/pulls/333  | jq .base.ref
-  # git fetch origin "$branch"?
-  [[ $basebranch =~ [0-9]+\.[0-9]+ ]] || exit 1
-  if [ ! -d mariadb-server-$basebranch ]
-  then
-      cd mariadb-server
-      git worktree add ../mariadb-server-$basebranch $basebranch
-      git submodule update --init --recursive --jobs 6
-      cd ..
-  fi
-
-  cd mariadb-server-$basebranch
-  git fetch origin
-  git clean -dfx
-  git checkout $revision
-  git submodule update --recursive
-""")])
-
diff --git a/utils.py b/utils.py
index 4b8b062f..f07fe06d 100644
--- a/utils.py
+++ b/utils.py
@@ -461,15 +461,11 @@ def hasEco(props):
 def hasCompat(step):
     builderName = str(step.getProperty("buildername"))
 
-    # For s390x there are no compat files
-    if "s390x" in builderName:
+    # For s390x and the listed distros there are no compat files
+    if any(builderName.find(sub) != -1 for sub in {"s390x", "fedora", "alma", "rocky"}):
         return False
     if "rhel" in builderName or "centos" in builderName:
         return step.getProperty("rpm_type")[-1] in ["7", "8"]
-    if "fedora" in builderName:
-        return step.getProperty("rpm_type")[-1] in ["35", "36"]
-    if "alma" in builderName or "rocky" in builderName:
-        return False
     return True