diff --git a/schutzbot/Jenkinsfile b/schutzbot/Jenkinsfile
index 0fd97626..d24eadfb 100644
--- a/schutzbot/Jenkinsfile
+++ b/schutzbot/Jenkinsfile
@@ -95,6 +95,17 @@ pipeline {
                         sh "schutzbot/mockbuild.sh"
                     }
                 }
+                stage('RHEL 8.5') {
+                    agent { label "rhel85cloudbase && x86_64 && psi" }
+                    environment {
+                        AWS_CREDS = credentials('aws-credentials-osbuildci')
+                        RHEL85_NIGHTLY_REPO = credentials('rhel85-nightly-repo')
+                    }
+                    steps {
+                        sh "schutzbot/ci_details.sh"
+                        sh "schutzbot/mockbuild.sh"
+                    }
+                }
                 stage('CS8') {
                     agent { label "cs8cloudbase && x86_64 && aws" }
                     environment {
diff --git a/schutzbot/mockbuild.sh b/schutzbot/mockbuild.sh
index 1c086d0f..47e6168c 100755
--- a/schutzbot/mockbuild.sh
+++ b/schutzbot/mockbuild.sh
@@ -69,7 +69,7 @@ greenprint "📤 RPMS will be uploaded to: ${REPO_URL}"
 # Build source RPMs.
 greenprint "🔧 Building source RPMs."
 make srpm
-# rhel 8.4 will run off of the nightly repos and does not have a redhat subscription
+# rhel 8.4 and 8.5 will run off of the internal repos and does not have a redhat subscription
 if [[ $VERSION_ID == 8.4 ]]; then
     greenprint "📋 Updating RHEL 8 mock template for unsubscribed image"
     sudo sed -i '/# repos/q' /etc/mock/templates/rhel-8.tpl
@@ -78,6 +78,14 @@ if [[ $VERSION_ID == 8.4 ]]; then
     cat "$RHEL84_NIGHTLY_REPO" | sudo tee -a /etc/mock/templates/rhel-8.tpl > /dev/null
     # We need triple quotes at the end of the template to mark the end of the repo list.
     echo '"""' | sudo tee -a /etc/mock/templates/rhel-8.tpl
+elif [[ $VERSION_ID == 8.5 ]]; then
+    greenprint "📋 Updating RHEL 8 mock template for unsubscribed image"
+    sudo sed -i '/# repos/q' /etc/mock/templates/rhel-8.tpl
+    # remove the subscription check
+    sudo sed -i "s/config_opts\['redhat_subscription_required'\] = True/config_opts['redhat_subscription_required'] = False/" /etc/mock/templates/rhel-8.tpl
+    cat "$RHEL85_NIGHTLY_REPO" | sudo tee -a /etc/mock/templates/rhel-8.tpl > /dev/null
+    # We need triple quotes at the end of the template to mark the end of the repo list.
+    echo '"""' | sudo tee -a /etc/mock/templates/rhel-8.tpl
 fi
 
 # Compile RPMs in a mock chroot