diff --git a/test/data/manifest-checksums/rhel_9.0-x86_64-azure_sap_rhui-empty_rhel b/test/data/manifest-checksums/rhel_9.0-x86_64-azure_sap_rhui-empty_rhel
index 64031b2fef..b2f07f66cf 100644
--- a/test/data/manifest-checksums/rhel_9.0-x86_64-azure_sap_rhui-empty_rhel
+++ b/test/data/manifest-checksums/rhel_9.0-x86_64-azure_sap_rhui-empty_rhel
@@ -1 +1 @@
-d20c9953533ae3ccb4aad2acf1a8df300580e6fb
+0c19e77e52e25f21dbf696f889a7b3b2198f87bf
diff --git a/test/data/manifest-checksums/rhel_9.2-x86_64-azure_sap_rhui-empty_rhel b/test/data/manifest-checksums/rhel_9.2-x86_64-azure_sap_rhui-empty_rhel
index eb6c6848dc..00bcb9b85a 100644
--- a/test/data/manifest-checksums/rhel_9.2-x86_64-azure_sap_rhui-empty_rhel
+++ b/test/data/manifest-checksums/rhel_9.2-x86_64-azure_sap_rhui-empty_rhel
@@ -1 +1 @@
-9b5db59b41857a6e4f6e9e315c8895fbb657f22b
+4a4122a02f44b4f22ee230c7a280b2cb1952f260
diff --git a/test/data/manifest-checksums/rhel_9.4-x86_64-azure_sap_rhui-empty_rhel b/test/data/manifest-checksums/rhel_9.4-x86_64-azure_sap_rhui-empty_rhel
index b3e2ba3afa..57336daabd 100644
--- a/test/data/manifest-checksums/rhel_9.4-x86_64-azure_sap_rhui-empty_rhel
+++ b/test/data/manifest-checksums/rhel_9.4-x86_64-azure_sap_rhui-empty_rhel
@@ -1 +1 @@
-faaae45ad0687fb42db7b4b1a8032732ab3af616
+429581e2d1885b39567eed6d8a990feea90ea404
diff --git a/test/data/manifest-checksums/rhel_9.6-x86_64-azure_sap_rhui-empty_rhel b/test/data/manifest-checksums/rhel_9.6-x86_64-azure_sap_rhui-empty_rhel
index ff76da9db1..25eae25c13 100644
--- a/test/data/manifest-checksums/rhel_9.6-x86_64-azure_sap_rhui-empty_rhel
+++ b/test/data/manifest-checksums/rhel_9.6-x86_64-azure_sap_rhui-empty_rhel
@@ -1 +1 @@
-a6e60d7a3db53c63ca56ff9e447c983e5c228d9b
+59809c2ddabe40c3742a4ed009e16846dbd326cb
diff --git a/test/data/manifest-checksums/rhel_9.7-x86_64-azure_sap_rhui-empty_rhel b/test/data/manifest-checksums/rhel_9.7-x86_64-azure_sap_rhui-empty_rhel
index a8657b8571..cc16e2eec2 100644
--- a/test/data/manifest-checksums/rhel_9.7-x86_64-azure_sap_rhui-empty_rhel
+++ b/test/data/manifest-checksums/rhel_9.7-x86_64-azure_sap_rhui-empty_rhel
@@ -1 +1 @@
-9b80e314a3bb44276c00ea3ad633fc303bcefbd7
+01e3b83c0397bcb3858159665779552a869fca7c
diff --git a/test/data/manifest-checksums/rhel_9.8-x86_64-azure_sap_rhui-empty_rhel b/test/data/manifest-checksums/rhel_9.8-x86_64-azure_sap_rhui-empty_rhel
index e8a7354061..cf916a810d 100644
--- a/test/data/manifest-checksums/rhel_9.8-x86_64-azure_sap_rhui-empty_rhel
+++ b/test/data/manifest-checksums/rhel_9.8-x86_64-azure_sap_rhui-empty_rhel
@@ -1 +1 @@
-b3b55c5efb06d181243cfd1d0b78d15065759b88
+99f1714448f9536ab9a111a1c763458940e4e74c
diff --git a/test/data/repositories/rhel-9.0.json b/test/data/repositories/rhel-9.0.json
index b319d42142..09f76717bf 100644
--- a/test/data/repositories/rhel-9.0.json
+++ b/test/data/repositories/rhel-9.0.json
@@ -165,7 +165,7 @@
     },
     {
       "name": "rhui-azure-sap",
-      "baseurl": "http://download.eng.bos.redhat.com/devel/stratosphere-rhui-sync/rhui-microsoft-azure-rhel9-sap-ha/",
+      "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-sap-rhui-azure-20250901",
       "image_type_tags": [
         "azure-sap-rhui"
       ],
diff --git a/test/data/repositories/rhel-9.2.json b/test/data/repositories/rhel-9.2.json
index 10f56fb57b..bed53eb385 100644
--- a/test/data/repositories/rhel-9.2.json
+++ b/test/data/repositories/rhel-9.2.json
@@ -178,7 +178,7 @@
     },
     {
       "name": "rhui-azure-sap",
-      "baseurl": "http://download.eng.bos.redhat.com/devel/stratosphere-rhui-sync/rhui-microsoft-azure-rhel9-sap-ha/",
+      "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-sap-rhui-azure-20250901",
       "image_type_tags": [
         "azure-sap-rhui"
       ],
diff --git a/test/data/repositories/rhel-9.4.json b/test/data/repositories/rhel-9.4.json
index cd97294233..08c976aa8c 100644
--- a/test/data/repositories/rhel-9.4.json
+++ b/test/data/repositories/rhel-9.4.json
@@ -178,7 +178,7 @@
     },
     {
       "name": "rhui-azure-sap",
-      "baseurl": "http://download.eng.bos.redhat.com/devel/stratosphere-rhui-sync/rhui-microsoft-azure-rhel9-sap-ha/",
+      "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-sap-rhui-azure-20250901",
       "image_type_tags": [
         "azure-sap-rhui"
       ],
diff --git a/test/data/repositories/rhel-9.6.json b/test/data/repositories/rhel-9.6.json
index 9b8a010d88..62c2a92c78 100644
--- a/test/data/repositories/rhel-9.6.json
+++ b/test/data/repositories/rhel-9.6.json
@@ -179,7 +179,7 @@
     },
     {
       "name": "rhui-azure-sap",
-      "baseurl": "http://download.eng.bos.redhat.com/devel/stratosphere-rhui-sync/rhui-microsoft-azure-rhel9-sap-ha/",
+      "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-sap-rhui-azure-20250901",
       "image_type_tags": [
         "azure-sap-rhui"
       ],
diff --git a/test/data/repositories/rhel-9.7.json b/test/data/repositories/rhel-9.7.json
index c8f348931a..361264af32 100644
--- a/test/data/repositories/rhel-9.7.json
+++ b/test/data/repositories/rhel-9.7.json
@@ -179,7 +179,7 @@
     },
     {
       "name": "rhui-azure-sap",
-      "baseurl": "http://download.eng.bos.redhat.com/devel/stratosphere-rhui-sync/rhui-microsoft-azure-rhel9-sap-ha/",
+      "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-sap-rhui-azure-20250901",
       "image_type_tags": [
         "azure-sap-rhui"
       ],
diff --git a/test/data/repositories/rhel-9.8.json b/test/data/repositories/rhel-9.8.json
index 1674d6631f..dfa0bab680 100644
--- a/test/data/repositories/rhel-9.8.json
+++ b/test/data/repositories/rhel-9.8.json
@@ -179,7 +179,7 @@
     },
     {
       "name": "rhui-azure-sap",
-      "baseurl": "http://download.eng.bos.redhat.com/devel/stratosphere-rhui-sync/rhui-microsoft-azure-rhel9-sap-ha/",
+      "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-sap-rhui-azure-20250901",
       "image_type_tags": [
         "azure-sap-rhui"
       ],
diff --git a/tools/define-compose-url.sh b/tools/define-compose-url.sh
deleted file mode 100755
index d1febe3d7e..0000000000
--- a/tools/define-compose-url.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-set -euxo pipefail
-source /etc/os-release
-
-# This isn't needed when not running on RHEL
-if [[ $ID != rhel ]]; then
-  return 0
-fi
-
-if [[ $ID == rhel && ${VERSION_ID%.*} == 8 ]]; then
-  COMPOSE_ID=$(curl -L http://download.eng.bos.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-"${VERSION_ID}"/COMPOSE_ID)
-
-  # default to a nightly tree but respect values passed from ENV so we can test rel-eng composes as well
-  COMPOSE_URL="${COMPOSE_URL:-http://download.eng.bos.redhat.com/rhel-8/nightly/RHEL-8/$COMPOSE_ID}"
-
-elif [[ $ID == rhel && ${VERSION_ID} == "9.1" ]]; then
-  # RHEL 9.1 currently doesn't have a 'latest' compose; use most recent date-stamped build
-  COMPOSE_ID="RHEL-9.1.0-20221027.3/COMPOSE_ID"
-
-  # default to a nightly tree but respect values passed from ENV so we can test rel-eng composes as well
-  COMPOSE_URL="${COMPOSE_URL:-http://download.eng.bos.redhat.com/rhel-9/nightly/RHEL-9/$COMPOSE_ID}"
-elif [[ $ID == rhel && ${VERSION_ID%.*} == 9 ]]; then
-  COMPOSE_ID=$(curl -L http://download.eng.bos.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-"${VERSION_ID}"/COMPOSE_ID)
-
-  # default to a nightly tree but respect values passed from ENV so we can test rel-eng composes as well
-  COMPOSE_URL="${COMPOSE_URL:-http://download.eng.bos.redhat.com/rhel-9/nightly/RHEL-9/$COMPOSE_ID}"
-fi
-
-# in case COMPOSE_URL was defined from the outside refresh COMPOSE_ID file,
-# used for slack messages in case of success/failure
-curl -L "$COMPOSE_URL/COMPOSE_ID" > COMPOSE_ID
-
-echo "INFO: Testing COMPOSE_ID=$COMPOSE_ID at COMPOSE_URL=$COMPOSE_URL"
-
-# Make sure the compose URL really exists
-RETURN_CODE=$(curl --silent -o -I -L -s -w "%{http_code}" "${COMPOSE_URL}")
-if [ "$RETURN_CODE" != 200 ]
-then
-    echo "Compose URL $COMPOSE_URL returned error code $RETURN_CODE, exiting."
-    exit 1
-fi