diff --git a/needles/anaconda/help/rocky-anaconda_help_localization_link-20230513.json b/needles/anaconda/help/rocky-anaconda_help_localization_link-20230513.json
new file mode 100644
index 00000000..0740ce76
--- /dev/null
+++ b/needles/anaconda/help/rocky-anaconda_help_localization_link-20230513.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "xpos": 66,
+      "ypos": 295,
+      "width": 441,
+      "type": "match",
+      "height": 20
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "ENV-LANGUAGE-english",
+    "anaconda_help_localization_link"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/help/rocky-anaconda_help_localization_link-20230513.png b/needles/anaconda/help/rocky-anaconda_help_localization_link-20230513.png
new file mode 100644
index 00000000..d6dbd8e0
Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help_localization_link-20230513.png differ
diff --git a/needles/anaconda/install_process/arabic/rocky-anaconda_install_user_created-20230513.json b/needles/anaconda/install_process/arabic/rocky-anaconda_install_user_created-20230513.json
new file mode 100644
index 00000000..3fa50bd1
--- /dev/null
+++ b/needles/anaconda/install_process/arabic/rocky-anaconda_install_user_created-20230513.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "width": 36,
+      "ypos": 145,
+      "xpos": 250,
+      "height": 11,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-arabic",
+    "anaconda_install_user_created"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/install_process/arabic/rocky-anaconda_install_user_created-20230513.png b/needles/anaconda/install_process/arabic/rocky-anaconda_install_user_created-20230513.png
new file mode 100644
index 00000000..9fc531f1
Binary files /dev/null and b/needles/anaconda/install_process/arabic/rocky-anaconda_install_user_created-20230513.png differ
diff --git a/needles/anaconda/install_process/japanese/rocky-install_done_reboot_japanese-20230513.json b/needles/anaconda/install_process/japanese/rocky-install_done_reboot_japanese-20230513.json
new file mode 100644
index 00000000..79e50ba9
--- /dev/null
+++ b/needles/anaconda/install_process/japanese/rocky-install_done_reboot_japanese-20230513.json
@@ -0,0 +1,24 @@
+{
+  "area": [
+    {
+      "ypos": 634,
+      "xpos": 716,
+      "width": 305,
+      "height": 14,
+      "type": "match"
+    },
+    {
+      "type": "match",
+      "height": 14,
+      "ypos": 698,
+      "width": 105,
+      "xpos": 875
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-japanese",
+    "anaconda_install_done"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/install_process/japanese/rocky-install_done_reboot_japanese-20230513.png b/needles/anaconda/install_process/japanese/rocky-install_done_reboot_japanese-20230513.png
new file mode 100644
index 00000000..06fabfd1
Binary files /dev/null and b/needles/anaconda/install_process/japanese/rocky-install_done_reboot_japanese-20230513.png differ
diff --git a/needles/anaconda/install_process/russian/rocky-anaconda_install_user_created-20230513.json b/needles/anaconda/install_process/russian/rocky-anaconda_install_user_created-20230513.json
new file mode 100644
index 00000000..af575995
--- /dev/null
+++ b/needles/anaconda/install_process/russian/rocky-anaconda_install_user_created-20230513.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "xpos": 398,
+      "ypos": 145,
+      "width": 36,
+      "type": "match",
+      "height": 11
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-russian",
+    "anaconda_install_user_created"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/install_process/russian/rocky-anaconda_install_user_created-20230513.png b/needles/anaconda/install_process/russian/rocky-anaconda_install_user_created-20230513.png
new file mode 100644
index 00000000..21775bae
Binary files /dev/null and b/needles/anaconda/install_process/russian/rocky-anaconda_install_user_created-20230513.png differ
diff --git a/needles/anaconda/main_hub/arabic/rocky-anaconda_main_hub_network_host_name_connected-20230513.json b/needles/anaconda/main_hub/arabic/rocky-anaconda_main_hub_network_host_name_connected-20230513.json
new file mode 100644
index 00000000..eaf7c1c4
--- /dev/null
+++ b/needles/anaconda/main_hub/arabic/rocky-anaconda_main_hub_network_host_name_connected-20230513.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "xpos": 224,
+      "ypos": 361,
+      "width": 45,
+      "height": 11,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-arabic",
+    "anaconda_network_connected"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/main_hub/arabic/rocky-anaconda_main_hub_network_host_name_connected-20230513.png b/needles/anaconda/main_hub/arabic/rocky-anaconda_main_hub_network_host_name_connected-20230513.png
new file mode 100644
index 00000000..0baa91cb
Binary files /dev/null and b/needles/anaconda/main_hub/arabic/rocky-anaconda_main_hub_network_host_name_connected-20230513.png differ
diff --git a/needles/anaconda/main_hub/french/rocky-anaconda_main_hub_network_host_name_connected-20230513.json b/needles/anaconda/main_hub/french/rocky-anaconda_main_hub_network_host_name_connected-20230513.json
new file mode 100644
index 00000000..6b50e703
--- /dev/null
+++ b/needles/anaconda/main_hub/french/rocky-anaconda_main_hub_network_host_name_connected-20230513.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "xpos": 783,
+      "ypos": 364,
+      "width": 60,
+      "height": 10,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-french",
+    "anaconda_network_connected"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/main_hub/french/rocky-anaconda_main_hub_network_host_name_connected-20230513.png b/needles/anaconda/main_hub/french/rocky-anaconda_main_hub_network_host_name_connected-20230513.png
new file mode 100644
index 00000000..cfbd8dcc
Binary files /dev/null and b/needles/anaconda/main_hub/french/rocky-anaconda_main_hub_network_host_name_connected-20230513.png differ
diff --git a/needles/anaconda/main_hub/japanese/rocky-anaconda_main_hub_network_host_name_connected-20230513.json b/needles/anaconda/main_hub/japanese/rocky-anaconda_main_hub_network_host_name_connected-20230513.json
new file mode 100644
index 00000000..72bf01f8
--- /dev/null
+++ b/needles/anaconda/main_hub/japanese/rocky-anaconda_main_hub_network_host_name_connected-20230513.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "xpos": 785,
+      "ypos": 362,
+      "width": 50,
+      "height": 10,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-japanese",
+    "anaconda_network_connected"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/main_hub/japanese/rocky-anaconda_main_hub_network_host_name_connected-20230513.png b/needles/anaconda/main_hub/japanese/rocky-anaconda_main_hub_network_host_name_connected-20230513.png
new file mode 100644
index 00000000..a47e3958
Binary files /dev/null and b/needles/anaconda/main_hub/japanese/rocky-anaconda_main_hub_network_host_name_connected-20230513.png differ
diff --git a/needles/anaconda/main_hub/rocky-anaconda_main_hub_network_host_name_connected-20230513.json b/needles/anaconda/main_hub/rocky-anaconda_main_hub_network_host_name_connected-20230513.json
new file mode 100644
index 00000000..36136d78
--- /dev/null
+++ b/needles/anaconda/main_hub/rocky-anaconda_main_hub_network_host_name_connected-20230513.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "xpos": 719,
+      "height": 18,
+      "type": "match",
+      "ypos": 359,
+      "width": 105
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "ENV-LANGUAGE-english",
+    "anaconda_network_connected"
+  ]
+}
diff --git a/needles/anaconda/main_hub/rocky-anaconda_main_hub_network_host_name_connected-20230513.png b/needles/anaconda/main_hub/rocky-anaconda_main_hub_network_host_name_connected-20230513.png
new file mode 100644
index 00000000..39cceee8
Binary files /dev/null and b/needles/anaconda/main_hub/rocky-anaconda_main_hub_network_host_name_connected-20230513.png differ
diff --git a/needles/anaconda/main_hub/russian/rocky-anaconda_main_hub_network_host_name_connected-20230513.json b/needles/anaconda/main_hub/russian/rocky-anaconda_main_hub_network_host_name_connected-20230513.json
new file mode 100644
index 00000000..34eb57d5
--- /dev/null
+++ b/needles/anaconda/main_hub/russian/rocky-anaconda_main_hub_network_host_name_connected-20230513.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "xpos": 778,
+      "ypos": 364,
+      "width": 68,
+      "height": 10,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-russian",
+    "anaconda_network_connected"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/main_hub/russian/rocky-anaconda_main_hub_network_host_name_connected-20230513.png b/needles/anaconda/main_hub/russian/rocky-anaconda_main_hub_network_host_name_connected-20230513.png
new file mode 100644
index 00000000..f8232283
Binary files /dev/null and b/needles/anaconda/main_hub/russian/rocky-anaconda_main_hub_network_host_name_connected-20230513.png differ
diff --git a/needles/anaconda/universal/arabic/rocky-spoke_done_arabic-untranslated-20230513.json b/needles/anaconda/universal/arabic/rocky-spoke_done_arabic-untranslated-20230513.json
new file mode 100644
index 00000000..8e9b21b2
--- /dev/null
+++ b/needles/anaconda/universal/arabic/rocky-spoke_done_arabic-untranslated-20230513.json
@@ -0,0 +1,21 @@
+{
+  "area": [
+    {
+      "height": 21,
+      "type": "match",
+      "width": 42,
+      "xpos": 965,
+      "ypos": 34,
+      "click_point": {
+        "xpos": 21,
+        "ypos": 10.5
+      }
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-arabic",
+    "anaconda_spoke_done"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/universal/arabic/rocky-spoke_done_arabic-untranslated-20230513.png b/needles/anaconda/universal/arabic/rocky-spoke_done_arabic-untranslated-20230513.png
new file mode 100644
index 00000000..38cc246a
Binary files /dev/null and b/needles/anaconda/universal/arabic/rocky-spoke_done_arabic-untranslated-20230513.png differ
diff --git a/needles/anaconda/universal/russian/rocky-spoke_done_russian-20230513.json b/needles/anaconda/universal/russian/rocky-spoke_done_russian-20230513.json
new file mode 100644
index 00000000..59edbed4
--- /dev/null
+++ b/needles/anaconda/universal/russian/rocky-spoke_done_russian-20230513.json
@@ -0,0 +1,20 @@
+{
+  "area": [
+    {
+      "width": 56,
+      "ypos": 34,
+      "xpos": 17,
+      "height": 21,
+      "type": "match",
+      "click_point": {
+        "xpos": 28,
+        "ypos": 10.5
+      }
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "LANGUAGE-russian",
+    "anaconda_spoke_done"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/universal/russian/rocky-spoke_done_russian-20230513.png b/needles/anaconda/universal/russian/rocky-spoke_done_russian-20230513.png
new file mode 100644
index 00000000..4932bba8
Binary files /dev/null and b/needles/anaconda/universal/russian/rocky-spoke_done_russian-20230513.png differ
diff --git a/needles/cockpit/rocky-autoupdate_planned_time-20230517.json b/needles/cockpit/rocky-autoupdate_planned_time-20230517.json
new file mode 100644
index 00000000..e2bb196c
--- /dev/null
+++ b/needles/cockpit/rocky-autoupdate_planned_time-20230517.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "ypos": 475,
+      "xpos": 529,
+      "width": 40,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "autoupdate_planned_time"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-autoupdate_planned_time-20230517.png b/needles/cockpit/rocky-autoupdate_planned_time-20230517.png
new file mode 100644
index 00000000..81e27d9f
Binary files /dev/null and b/needles/cockpit/rocky-autoupdate_planned_time-20230517.png differ
diff --git a/needles/cockpit/rocky-cockpit_services_detail-20230517.json b/needles/cockpit/rocky-cockpit_services_detail-20230517.json
new file mode 100644
index 00000000..e2d1368f
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_services_detail-20230517.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "height": 28,
+      "type": "match",
+      "ypos": 585,
+      "xpos": 264,
+      "width": 133
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "ENV-LANGUAGE-english",
+    "cockpit_services_detail"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_services_detail-20230517.png b/needles/cockpit/rocky-cockpit_services_detail-20230517.png
new file mode 100644
index 00000000..655111b9
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_services_detail-20230517.png differ
diff --git a/needles/cockpit/rocky-logs-20230517.json b/needles/cockpit/rocky-logs-20230517.json
new file mode 100644
index 00000000..a9a26ce1
--- /dev/null
+++ b/needles/cockpit/rocky-logs-20230517.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "ypos": 362,
+      "width": 39,
+      "xpos": 14,
+      "height": 18,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "ENV-LANGUAGE-english",
+    "cockpit_logs"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-logs-20230517.png b/needles/cockpit/rocky-logs-20230517.png
new file mode 100644
index 00000000..05274a50
Binary files /dev/null and b/needles/cockpit/rocky-logs-20230517.png differ
diff --git a/needles/console/rocky-boot_enter_passphrase-20230513.json b/needles/console/rocky-boot_enter_passphrase-20230513.json
new file mode 100644
index 00000000..2c910f33
--- /dev/null
+++ b/needles/console/rocky-boot_enter_passphrase-20230513.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "ypos": 618,
+      "xpos": 16,
+      "width": 143,
+      "height": 10,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-english",
+    "boot_enter_passphrase"
+  ]
+}
\ No newline at end of file
diff --git a/needles/console/rocky-boot_enter_passphrase-20230513.png b/needles/console/rocky-boot_enter_passphrase-20230513.png
new file mode 100644
index 00000000..0fc1ab36
Binary files /dev/null and b/needles/console/rocky-boot_enter_passphrase-20230513.png differ
diff --git a/needles/console/rocky-bootloader_uefi-20230513.json b/needles/console/rocky-bootloader_uefi-20230513.json
new file mode 100644
index 00000000..0b37a7c7
--- /dev/null
+++ b/needles/console/rocky-bootloader_uefi-20230513.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "width": 113,
+      "ypos": 575,
+      "xpos": 427,
+      "type": "match",
+      "height": 19
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "ENV-LANGUAGE-english",
+    "bootloader_uefi"
+  ]
+}
\ No newline at end of file
diff --git a/needles/console/rocky-bootloader_uefi-20230513.png b/needles/console/rocky-bootloader_uefi-20230513.png
new file mode 100644
index 00000000..580d87ab
Binary files /dev/null and b/needles/console/rocky-bootloader_uefi-20230513.png differ
diff --git a/needles/console/rocky-bootloader_uefi-20230803.json b/needles/console/rocky-bootloader_uefi-20230803.json
new file mode 100644
index 00000000..2febb713
--- /dev/null
+++ b/needles/console/rocky-bootloader_uefi-20230803.json
@@ -0,0 +1,18 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "ypos": 611,
+      "width": 113,
+      "xpos": 210,
+      "height": 19
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "ENV-LANGUAGE-english",
+    "bootloader",
+    "bootloader_uefi"
+  ]
+}
diff --git a/needles/console/rocky-bootloader_uefi-20230803.png b/needles/console/rocky-bootloader_uefi-20230803.png
new file mode 100644
index 00000000..7c793fa6
Binary files /dev/null and b/needles/console/rocky-bootloader_uefi-20230803.png differ
diff --git a/needles/console/rocky-bootloader_uefi-20230804.json b/needles/console/rocky-bootloader_uefi-20230804.json
new file mode 100644
index 00000000..5badb664
--- /dev/null
+++ b/needles/console/rocky-bootloader_uefi-20230804.json
@@ -0,0 +1,18 @@
+{
+  "area": [
+    {
+      "width": 113,
+      "ypos": 611,
+      "type": "match",
+      "height": 19,
+      "xpos": 210
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "ENV-LANGUAGE-english",
+    "bootloader",
+    "bootloader_uefi"
+  ]
+}
diff --git a/needles/console/rocky-bootloader_uefi-20230804.png b/needles/console/rocky-bootloader_uefi-20230804.png
new file mode 100644
index 00000000..da79400f
Binary files /dev/null and b/needles/console/rocky-bootloader_uefi-20230804.png differ
diff --git a/needles/gnome/japanese/rocky-getting_started-20230513.json b/needles/gnome/japanese/rocky-getting_started-20230513.json
new file mode 100644
index 00000000..692dca2f
--- /dev/null
+++ b/needles/gnome/japanese/rocky-getting_started-20230513.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "height": 157,
+      "width": 163,
+      "ypos": 224,
+      "xpos": 445
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "getting_started"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/japanese/rocky-getting_started-20230513.png b/needles/gnome/japanese/rocky-getting_started-20230513.png
new file mode 100644
index 00000000..091a0ace
Binary files /dev/null and b/needles/gnome/japanese/rocky-getting_started-20230513.png differ
diff --git a/scripts/run-all-flavors.sh b/scripts/run-all-flavors.sh
index fc12e8d7..cda3a704 100755
--- a/scripts/run-all-flavors.sh
+++ b/scripts/run-all-flavors.sh
@@ -1,16 +1,18 @@
 #!/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
+# Test a beta build with alternative repo URL
+#   ROCKY_EXTRA_ARGS="GRUB=ip=dhcp GRUBADD=inst.repo=https://dl.rockylinux.org/stg/rocky/8.8-BETA/BaseOS/x86_64/os DNF_CONTENTDIR=stg CURRREL=8 IDENTIFICATION=false" scripts/run-all-flavors.sh
 
-ROCKY_VERSION="$MAJOR_VERSION.$MINOR_VERSION"
+ROCKY_VERSION="9.2"
+
+MAJOR_VERSION=${ROCKY_VERSION:0:1}
+MINOR_VERSION=${ROCKY_VERSION:2:1}
 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="-$(date +%Y%m%d).0-$(git branch --show-current)-$ROCKY_VERSION"
 ISO_PREFIX="Rocky-$ROCKY_VERSION-$ROCKY_ARCH"
 DVD_ISOTYPE=dvd1
 
@@ -31,8 +33,8 @@ openqa-cli api \
     DISTRI=rocky \
     FLAVOR=universal \
     VERSION="$ROCKY_VERSION" \
-    BUILD="$BUILD_PREFIX-universal-$ROCKY_VERSION" \
-    "${ROCKY_EXTRA_ARGS}"
+    BUILD="$BUILD_NAME" \
+    ${ROCKY_EXTRA_ARGS}
 
 openqa-cli api \
     -X POST isos \
@@ -41,8 +43,8 @@ openqa-cli api \
     DISTRI=rocky \
     FLAVOR="dvd-iso" \
     VERSION="$ROCKY_VERSION" \
-    BUILD="$BUILD_PREFIX-dvd-$ROCKY_VERSION" \
-    "${ROCKY_EXTRA_ARGS}"
+    BUILD="$BUILD_NAME" \
+    ${ROCKY_EXTRA_ARGS}
 
 openqa-cli api \
     -X POST isos \
@@ -51,8 +53,8 @@ openqa-cli api \
     DISTRI=rocky \
     FLAVOR=package-set \
     VERSION="$ROCKY_VERSION" \
-    BUILD="$BUILD_PREFIX-packageset-$ROCKY_VERSION" \
-    "${ROCKY_EXTRA_ARGS}"
+    BUILD="$BUILD_NAME" \
+    ${ROCKY_EXTRA_ARGS}
 
 openqa-cli api \
     -X POST isos \
@@ -61,8 +63,8 @@ openqa-cli api \
     DISTRI=rocky \
     FLAVOR=minimal-iso \
     VERSION="$ROCKY_VERSION" \
-    BUILD="$BUILD_PREFIX-minimal-$ROCKY_VERSION" \
-    "${ROCKY_EXTRA_ARGS}"
+    BUILD="$BUILD_NAME" \
+    ${ROCKY_EXTRA_ARGS}
 
 openqa-cli api \
     -X POST isos \
@@ -71,5 +73,5 @@ openqa-cli api \
     DISTRI=rocky \
     FLAVOR=boot-iso \
     VERSION="$ROCKY_VERSION" \
-    BUILD="$BUILD_PREFIX-boot-$ROCKY_VERSION" \
-    "${ROCKY_EXTRA_ARGS}"
+    BUILD="$BUILD_NAME" \
+    ${ROCKY_EXTRA_ARGS}
diff --git a/scripts/run-openqa-tests.sh b/scripts/run-openqa-tests.sh
index 7f8fa91b..124977f3 100755
--- a/scripts/run-openqa-tests.sh
+++ b/scripts/run-openqa-tests.sh
@@ -1,9 +1,6 @@
 #!/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
@@ -15,13 +12,14 @@ MINOR_VERSION=0
 ## 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_VERSION="9.2"
+
+MAJOR_VERSION=${ROCKY_VERSION:0:1}
+MINOR_VERSION=${ROCKY_VERSION:2:1}
 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"
-
+BUILD_NAME="-$(date +%Y%m%d).0-$(git branch --show-current)-$ROCKY_VERSION"
 ISO_PREFIX="Rocky-$ROCKY_VERSION-$ROCKY_ARCH"
 
 if [[ "$ROCKY_FLAVOR" == "dvd-iso" || "$ROCKY_FLAVOR" == "universal" ]]; then
diff --git a/templates.fif.json b/templates.fif.json
index eb916ba9..7980f693 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -82,7 +82,7 @@
             },
             "version": "*"
         },
-	"rocky-boot-iso-aarch64-*": {
+        "rocky-boot-iso-aarch64-*": {
             "arch": "aarch64",
             "distri": "rocky",
             "flavor": "boot-iso",
@@ -210,7 +210,7 @@
             "machine": "uefi",
             "product": "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*"
         },
-	"rocky-boot-iso-aarch64-*-aarch64": {
+        "rocky-boot-iso-aarch64-*-aarch64": {
             "machine": "aarch64",
             "product": "rocky-boot-iso-aarch64-*"
         },
@@ -422,7 +422,7 @@
                 "POSTINSTALL": "autocloud"
             }
         },
-	"install_resize_lvm": {
+        "install_resize_lvm": {
             "profiles": {
                 "rocky-dvd-iso-aarch64-*-aarch64": 40,
                 "rocky-dvd-iso-x86_64-*-64bit": 40
@@ -926,8 +926,8 @@
         },
         "install_scsi_updates_img": {
             "profiles": {
-              "rocky-universal-aarch64-*-aarch64": 20,
-              "rocky-universal-x86_64-*-64bit": 20
+                "rocky-universal-aarch64-*-aarch64": 20,
+                "rocky-universal-x86_64-*-64bit": 20
             },
             "settings": {
                 "CDMODEL": "scsi-cd",
@@ -1418,6 +1418,36 @@
                 "WORKER_CLASS": "tap"
             }
         },
+        "slurm22": {
+            "profiles": {
+                "rocky-dvd-iso-aarch64-*-aarch64": 10,
+                "rocky-dvd-iso-x86_64-*-64bit": 10
+            },
+            "settings": {
+                "BOOTFROM": "c",
+                "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
+                "POSTINSTALL": "slurm",
+                "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%",
+                "ROOT_PASSWORD": "weakpassword",
+                "USER_LOGIN": "false",
+                "SLURM_VERSION": "22"
+            }
+        },
+        "slurm23": {
+            "profiles": {
+                "rocky-dvd-iso-aarch64-*-aarch64": 10,
+                "rocky-dvd-iso-x86_64-*-64bit": 10
+            },
+            "settings": {
+                "BOOTFROM": "c",
+                "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
+                "POSTINSTALL": "slurm",
+                "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%",
+                "ROOT_PASSWORD": "weakpassword",
+                "USER_LOGIN": "false",
+                "SLURM_VERSION": "23"
+            }
+        },
         "support_server": {
             "profiles": {
                 "rocky-dvd-iso-aarch64-*-aarch64": 10,
diff --git a/tests/base_update_cli.pm b/tests/base_update_cli.pm
index dd832663..b59416e1 100644
--- a/tests/base_update_cli.pm
+++ b/tests/base_update_cli.pm
@@ -2,24 +2,37 @@ use base "installedtest";
 use strict;
 use testapi;
 use packagetest;
+use utils;
 
 sub run {
     my $self = shift;
+
     # switch to TTY3 for both, graphical and console tests
     $self->root_console(tty => 3);
+
     # enable test repos and install test packages
     prepare_test_packages;
+
     # check rpm agrees they installed good
     verify_installed_packages;
     if (get_var("DISTRI") eq "rocky") {
-        # pandoc-common is in PowerTools in RockyLinux
-        assert_script_run 'dnf config-manager --set-enabled powertools', 60;
+        if (get_version_major() < 9) {
+            # pandoc-common is in PowerTools in Rocky Linux 8
+            assert_script_run 'dnf config-manager --set-enabled powertools', 60;
+        }
+        else {
+            # pandoc-common is in CRB in Rocky Linux 8
+            assert_script_run 'dnf config-manager --set-enabled crb', 60;
+        }
     }
+
     # update the fake pandoc-common (should come from the real repo)
     # this can take a long time if we get unlucky with the metadata refresh
     assert_script_run 'dnf -y --disablerepo=openqa-testrepo* --disablerepo=updates-testing update pandoc-common', 600;
+
     # check we got the updated version
     verify_updated_packages;
+
     # now remove pandoc-common, and see if we can do a straight
     # install from the default repos
     assert_script_run 'dnf -y remove pandoc-common';
diff --git a/tests/slurm.pm b/tests/slurm.pm
new file mode 100644
index 00000000..3dfceca0
--- /dev/null
+++ b/tests/slurm.pm
@@ -0,0 +1,65 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+sub slurm_setup {
+    # install HPC repository
+    my $version = get_var("SLURM_VERSION");
+    assert_script_run "dnf -y install rocky-release-hpc", 120;
+
+    # Set up munge
+    assert_script_run "dnf -y install munge", 120;
+    assert_script_run "dd if=/dev/urandom bs=1 count=1024 >/etc/munge/munge.key";
+    assert_script_run "chmod 400 /etc/munge/munge.key";
+    assert_script_run "chown munge.munge /etc/munge/munge.key";
+    assert_script_run "systemctl enable --now munge.service";
+
+    # install slurm
+    if (get_var("CURRREL") eq '8') {
+        assert_script_run "dnf config-manager --set-enabled powertools";
+    }
+    assert_script_run "dnf install -y slurm$version-slurmdbd slurm$version-slurmrestd slurm$version-slurmctld slurm$version-slurmd";
+
+    # Since this is a single node system, we don't have to modify the conf files. We will for larger multi-node tests.
+    # start services
+    assert_script_run "systemctl enable --now slurmctld slurmdbd slurmrestd slurmd";
+}
+
+sub run {
+    my $self = shift;
+
+    # do all the install stuff
+    slurm_setup();
+
+    # if everything is configured right, sinfo should show the following output
+    # $ sinfo
+    #   PARTITION AVAIL  TIMELIMIT  NODES  STATE NODELIST
+    #   debug*       up   infinite      1   idle localhost
+    validate_script_output "sinfo", sub { m/debug.*localhost/ };
+
+    # write a boring job script
+    assert_script_run "echo '#!/bin/bash\n#SBATCH --job-name=antarctica_time\nsleep 120\nTZ=NZST date' > job.sh";
+
+    ## schedule a job and run it to completion
+    assert_script_run "sbatch job.sh";
+    validate_script_output "squeue", sub { m/antar/ };
+    sleep 121;
+    # after 121 seconds, job should have completed and no longer exist in the queue
+    validate_script_output "squeue", sub { $_ !~ m/antar/ };
+
+    ## cancel a job
+    assert_script_run "sbatch job.sh";
+    validate_script_output "squeue", sub { m/antar/ };
+    assert_script_run "scancel 2";
+    # job should no longer be in the queue
+    validate_script_output "squeue", sub { $_ !~ m/antar/ };
+}
+
+sub test_flags {
+    return {fatal => 1};
+}
+
+1;
+
+# vim: set sw=4 et: