diff --git a/schutzbot/deploy.sh b/schutzbot/deploy.sh
index 3ac756fc..afa71255 100755
--- a/schutzbot/deploy.sh
+++ b/schutzbot/deploy.sh
@@ -21,11 +21,21 @@ fi
 # Add osbuild team ssh keys.
 cat schutzbot/team_ssh_keys.txt | tee -a ~/.ssh/authorized_keys > /dev/null
 
+# Distro version that this script is running on.
+DISTRO_VERSION=${ID}-${VERSION_ID}
+
+if [[ "$ID" == rhel ]] && sudo subscription-manager status; then
+  # If this script runs on subscribed RHEL, install content built using CDN
+  # repositories.
+  DISTRO_VERSION=rhel-${VERSION_ID%.*}-cdn
+fi
+
 # Set up dnf repositories with the RPMs we want to test
+# TODO: use DISTRO_VERSION also for osbuild-composer (not yet supported though)
 sudo tee /etc/yum.repos.d/osbuild.repo << EOF
 [osbuild]
 name=osbuild ${CI_COMMIT_SHA}
-baseurl=${DNF_REPO_BASEURL}/osbuild/${ID}-${VERSION_ID}/${ARCH}/${CI_COMMIT_SHA}
+baseurl=${DNF_REPO_BASEURL}/osbuild/${DISTRO_VERSION}/${ARCH}/${CI_COMMIT_SHA}
 enabled=1
 gpgcheck=0
 # Default dnf repo priority is 99. Lower number means higher priority.
diff --git a/schutzbot/mockbuild.sh b/schutzbot/mockbuild.sh
index cc04bb3b..7b4c45dc 100755
--- a/schutzbot/mockbuild.sh
+++ b/schutzbot/mockbuild.sh
@@ -34,9 +34,19 @@ REPO_BUCKET=osbuild-composer-repos
 # Public URL for the S3 bucket with our artifacts.
 MOCK_REPO_BASE_URL="http://${REPO_BUCKET}.s3.amazonaws.com"
 
+# Distro version in whose buildroot was the RPM built.
+DISTRO_VERSION=${ID}-${VERSION_ID}
+
+if [[ "$ID" == rhel ]] && sudo subscription-manager status; then
+  # If this script runs on a subscribed RHEL, the RPMs are actually built
+  # using the latest CDN content, therefore rhel-*-cdn is used as the distro
+  # version.
+  DISTRO_VERSION=rhel-${VERSION_ID%.*}-cdn
+fi
+
 # Relative path of the repository – used for constructing both the local and
 # remote paths below, so that they're consistent.
-REPO_PATH=osbuild/${ID}-${VERSION_ID}/${ARCH}/${COMMIT}
+REPO_PATH=osbuild/${DISTRO_VERSION}/${ARCH}/${COMMIT}
 
 # Directory to hold the RPMs temporarily before we upload them.
 REPO_DIR=repo/${REPO_PATH}