diff --git a/run-openqa-tests.sh b/run-openqa-tests.sh
deleted file mode 100755
index 1b2d0cbc..00000000
--- a/run-openqa-tests.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-set -e
-
-ROCKY_FLAVOR="${ROCKY_FLAVOR:-boot-iso}"
-ROCKY_VERSION="${ROCKY_VERSION:-8.6}"
-ROCKY_ARCH="${ROCKY_ARCH:=x86_64}"
-ROCKY_PACKAGE_SET="${ROCKY_PACKAGE_SET:=minimal}"
-ROCKY_EXTRA_ARGS="${ROCKY_EXTRA_ARGS:-}"
-BUILD_PREFIX="${ROCKY_VERSION}_${ROCKY_FLAVOR}"
-BUILD_NAME="${BUILD_PREFIX}_$(date +%Y%m%d.%H%M%S).0"
-
-if [[ "$ROCKY_FLAVOR" == "dvd-iso" || "$ROCKY_FLAVOR" == "universal" ]]; then
-    ISO_TYPE=dvd1
-elif [[ "$ROCKY_FLAVOR" == "minimal-iso" ]]; then
-    ISO_TYPE=minimal
-elif [[ "$ROCKY_FLAVOR" == "boot-iso" ]]; then
-    ISO_TYPE=boot
-else
-    echo "Usage: $0 [universal|dvd-iso|minimal-iso|boot-iso]"
-    exit 1
-fi
-
-export PS4='# '
-set -o xtrace
-openqa-cli api \
-    -X POST isos \
-    ISO="Rocky-$ROCKY_VERSION-$ROCKY_ARCH-$ISO_TYPE.iso" \
-    ARCH="$ROCKY_ARCH" \
-    DISTRI=rocky \
-    FLAVOR="$ROCKY_FLAVOR" \
-    VERSION="$ROCKY_VERSION" \
-    BUILD="$BUILD_NAME" \
-    PACKAGE_SET="$ROCKY_PACKAGE_SET" \
-    IDENTIFICATION=false \
-    "${ROCKY_EXTRA_ARGS}"
diff --git a/build-report.sh b/scripts/build-report.sh
similarity index 100%
rename from build-report.sh
rename to scripts/build-report.sh
diff --git a/scripts/cancel-build.sh b/scripts/cancel-build.sh
new file mode 100755
index 00000000..a5b78a08
--- /dev/null
+++ b/scripts/cancel-build.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+BUILD="$1"
+
+## Usage: Cancels all outstanding openQA jobs for the specified build
+# scripts/cancel-build.sh 20221014.133700-My-Named-Build
+
+jobs_in_build=$(openqa-cli api jobs build="$BUILD" | jq -r '.jobs[].id' | xargs)
+
+for id in $jobs_in_build
+do
+    openqa-cli api -X POST "jobs/$id/cancel"
+done
diff --git a/scripts/run-all-flavors.sh b/scripts/run-all-flavors.sh
new file mode 100755
index 00000000..fc12e8d7
--- /dev/null
+++ b/scripts/run-all-flavors.sh
@@ -0,0 +1,75 @@
+#!/bin/bash
+set -e
+
+MAJOR_VERSION=9
+MINOR_VERSION=0
+
+## Usage: Posts ISOs to openQA for each of the universal, dvd-iso, package-set, minimal-iso, and boot-iso FLAVORs.
+# scripts/run-all-flavors.sh
+
+ROCKY_VERSION="$MAJOR_VERSION.$MINOR_VERSION"
+ROCKY_ARCH="${ROCKY_ARCH:=x86_64}"
+ROCKY_EXTRA_ARGS="${ROCKY_EXTRA_ARGS:-}"
+BUILD_PREFIX="-$(date +%Y%m%d.%H%M%S).0-$(git branch --show-current)"
+ISO_PREFIX="Rocky-$ROCKY_VERSION-$ROCKY_ARCH"
+DVD_ISOTYPE=dvd1
+
+if [[ "$MAJOR_VERSION" -gt "8" ]]; then
+    DVD_ISOTYPE=dvd
+fi
+
+# Update fif templates
+./fifloader.py --clean --load templates.fif.json templates-updates.fif.json
+
+# POST all the flavors
+export PS4='# '
+set -o xtrace
+openqa-cli api \
+    -X POST isos \
+    ISO="$ISO_PREFIX-$DVD_ISOTYPE.iso" \
+    ARCH="$ROCKY_ARCH" \
+    DISTRI=rocky \
+    FLAVOR=universal \
+    VERSION="$ROCKY_VERSION" \
+    BUILD="$BUILD_PREFIX-universal-$ROCKY_VERSION" \
+    "${ROCKY_EXTRA_ARGS}"
+
+openqa-cli api \
+    -X POST isos \
+    ISO="$ISO_PREFIX-$DVD_ISOTYPE.iso" \
+    ARCH="$ROCKY_ARCH" \
+    DISTRI=rocky \
+    FLAVOR="dvd-iso" \
+    VERSION="$ROCKY_VERSION" \
+    BUILD="$BUILD_PREFIX-dvd-$ROCKY_VERSION" \
+    "${ROCKY_EXTRA_ARGS}"
+
+openqa-cli api \
+    -X POST isos \
+    ISO="$ISO_PREFIX-$DVD_ISOTYPE.iso" \
+    ARCH="$ROCKY_ARCH" \
+    DISTRI=rocky \
+    FLAVOR=package-set \
+    VERSION="$ROCKY_VERSION" \
+    BUILD="$BUILD_PREFIX-packageset-$ROCKY_VERSION" \
+    "${ROCKY_EXTRA_ARGS}"
+
+openqa-cli api \
+    -X POST isos \
+    ISO="$ISO_PREFIX-minimal.iso" \
+    ARCH="$ROCKY_ARCH" \
+    DISTRI=rocky \
+    FLAVOR=minimal-iso \
+    VERSION="$ROCKY_VERSION" \
+    BUILD="$BUILD_PREFIX-minimal-$ROCKY_VERSION" \
+    "${ROCKY_EXTRA_ARGS}"
+
+openqa-cli api \
+    -X POST isos \
+    ISO="$ISO_PREFIX-boot.iso" \
+    ARCH="$ROCKY_ARCH" \
+    DISTRI=rocky \
+    FLAVOR=boot-iso \
+    VERSION="$ROCKY_VERSION" \
+    BUILD="$BUILD_PREFIX-boot-$ROCKY_VERSION" \
+    "${ROCKY_EXTRA_ARGS}"
diff --git a/scripts/run-openqa-tests.sh b/scripts/run-openqa-tests.sh
new file mode 100755
index 00000000..7f8fa91b
--- /dev/null
+++ b/scripts/run-openqa-tests.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+set -e
+
+MAJOR_VERSION=9
+MINOR_VERSION=0
+
+## Usage: Post an ISO for the specified FLAVOR. Defaults to boot-iso.
+#
+## Run the boot-iso FLAVOR
+# scripts/run-openqa-tests.sh
+#
+## Run the package-set FLAVOR
+# ROCKY_FLAVOR=package-set scripts/run-openqa-tests.sh
+#
+## Run the localization test suites
+# ROCKY_FLAVOR ROCKY_EXTRA_ARGS=TEST=install_arabic_language,install_asian_language,install_european_language,install_cyrillic_language scripts/run-openqa-tests.sh
+
+ROCKY_FLAVOR="${ROCKY_FLAVOR:-boot-iso}"
+ROCKY_VERSION="$MAJOR_VERSION.$MINOR_VERSION"
+ROCKY_ARCH="${ROCKY_ARCH:=x86_64}"
+ROCKY_EXTRA_ARGS="${ROCKY_EXTRA_ARGS:-}"
+BUILD_PREFIX="-$(date +%Y%m%d.%H%M%S).0-$(git branch --show-current)"
+BUILD_NAME="$BUILD_PREFIX-$ROCKY_FLAVOR-$ROCKY_VERSION"
+
+ISO_PREFIX="Rocky-$ROCKY_VERSION-$ROCKY_ARCH"
+
+if [[ "$ROCKY_FLAVOR" == "dvd-iso" || "$ROCKY_FLAVOR" == "universal" ]]; then
+    if [[ "$MAJOR_VERSION" -gt "8" ]]; then
+        ISO_TYPE=dvd
+    else
+        ISO_TYPE=dvd1
+    fi
+elif [[ "$ROCKY_FLAVOR" == "minimal-iso" ]]; then
+    ISO_TYPE=minimal
+elif [[ "$ROCKY_FLAVOR" == "boot-iso" || "$ROCKY_FLAVOR" == "package-set" ]]; then
+    # package-set also works with dvd image
+    ISO_TYPE=boot
+else
+    echo "Usage: $0 [universal|dvd-iso|minimal-iso|package-set|boot-iso]"
+    exit 1
+fi
+
+ROCKY_ISO="$ISO_PREFIX-$ISO_TYPE.iso"
+
+# Update fif templates
+./fifloader.py --clean --load templates.fif.json templates-updates.fif.json
+
+# Run the tests
+export PS4='# '
+set -o xtrace
+openqa-cli api \
+    -X POST isos \
+    ISO="$ROCKY_ISO" \
+    ARCH="$ROCKY_ARCH" \
+    DISTRI=rocky \
+    FLAVOR="$ROCKY_FLAVOR" \
+    VERSION="$ROCKY_VERSION" \
+    BUILD="$BUILD_NAME" \
+    "$ROCKY_EXTRA_ARGS"