diff --git a/test/cases/regression-composer-works-behind-satellite.sh b/test/cases/regression-composer-works-behind-satellite.sh
index 768cc5e98..76dd19fd8 100644
--- a/test/cases/regression-composer-works-behind-satellite.sh
+++ b/test/cases/regression-composer-works-behind-satellite.sh
@@ -65,14 +65,16 @@ case "${ID}" in
         echo "Running on RHEL"
         case "${VERSION_ID%.*}" in
             "8" )
-                echo "Running on RHEL 8"
+                echo "Running on RHEL ${VERSION_ID}"
+                # starting in 8.5 the override file contains minor version number as well
+                VERSION_SUFFIX=$(echo "${VERSION_ID}" | tr -d ".")
                 if grep beta /etc/os-release;
                 then
                     DISTRO_NAME="rhel-8-beta"
-                    REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-8-beta.json"
+                    REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}-beta.json"
                 else
                     DISTRO_NAME="rhel-8"
-                    REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-8.json"
+                    REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}.json"
                 fi
                 REPO1_NAME="baseos"
                 REPO2_NAME="appstream"
diff --git a/tools/provision.sh b/tools/provision.sh
index 18b42d80c..ec4bb8021 100755
--- a/tools/provision.sh
+++ b/tools/provision.sh
@@ -85,12 +85,13 @@ case "${ID}-${VERSION_ID}" in
 esac
 
 # overrides for RHEL nightly builds testing
+VERSION_SUFFIX=$(echo "${VERSION_ID}" | tr -d ".")
 if [ -f "rhel-8.json" ]; then
-    sudo cp rhel-8.json "$REPODIR"
+    sudo cp rhel-8.json "$REPODIR/rhel-${VERSION_SUFFIX}.json"
 fi
 
 if [ -f "rhel-8-beta.json" ]; then
-    sudo cp rhel-8-beta.json "$REPODIR"
+    sudo cp rhel-8-beta.json "$REPODIR/rhel-${VERSION_SUFFIX}-beta.json"
 fi
 
 # Generate all X.509 certificates for the tests