diff --git a/schutzbot/Jenkinsfile b/schutzbot/Jenkinsfile
index 10655109..d2afccc2 100644
--- a/schutzbot/Jenkinsfile
+++ b/schutzbot/Jenkinsfile
@@ -40,10 +40,6 @@ pipeline {
                     steps {
                         sh "schutzbot/ci_details.sh"
                         sh "schutzbot/mockbuild.sh"
-                        stash (
-                            includes: 'osbuild-mock.repo',
-                            name: 'fedora32'
-                        )
                     }
                 }
                 stage('Fedora 33') {
@@ -54,10 +50,6 @@ pipeline {
                     steps {
                         sh "schutzbot/ci_details.sh"
                         sh "schutzbot/mockbuild.sh"
-                        stash (
-                            includes: 'osbuild-mock.repo',
-                            name: 'fedora33'
-                        )
                     }
                 }
                 stage('RHEL 8 CDN') {
@@ -69,10 +61,6 @@ pipeline {
                     steps {
                         sh "schutzbot/ci_details.sh"
                         sh "schutzbot/mockbuild.sh"
-                        stash (
-                            includes: 'osbuild-mock.repo',
-                            name: 'rhel8cdn'
-                        )
                     }
                 }
             }
@@ -90,7 +78,6 @@ pipeline {
                         DISTRO_CODE = "fedora32"
                     }
                     steps {
-                        unstash 'fedora32'
                         run_tests()
                     }
                     post {
@@ -107,7 +94,6 @@ pipeline {
                         DISTRO_CODE = "fedora33"
                     }
                     steps {
-                        unstash 'fedora33'
                         run_tests()
                     }
                     post {
@@ -125,7 +111,6 @@ pipeline {
                         DISTRO_CODE = "rhel8"
                     }
                     steps {
-                        unstash 'rhel8cdn'
                         run_tests()
                     }
                     post {
diff --git a/schutzbot/deploy.sh b/schutzbot/deploy.sh
index 23fc5400..9bd848a0 100755
--- a/schutzbot/deploy.sh
+++ b/schutzbot/deploy.sh
@@ -20,6 +20,7 @@ function retry {
 
 # Get OS details.
 source /etc/os-release
+ARCH=$(uname -m)
 
 # Register RHEL if we are provided with a registration script.
 if [[ -n "${RHN_REGISTRATION_SCRIPT:-}" ]] && ! sudo subscription-manager status; then
@@ -49,9 +50,16 @@ fi
 # Add osbuild team ssh keys.
 cat schutzbot/team_ssh_keys.txt | tee -a ~/.ssh/authorized_keys > /dev/null
 
-# Set up a dnf repository for the RPMs we built via mock.
-sudo cp osbuild-mock.repo /etc/yum.repos.d/osbuild-mock.repo
-sudo dnf repository-packages osbuild-mock list
+# Set up a dnf repository with the RPMs we want to test
+sudo tee /etc/yum.repos.d/osbuild.repo << EOF
+[osbuild]
+name=osbuild ${GIT_COMMIT}
+baseurl=http://osbuild-composer-repos.s3-website.us-east-2.amazonaws.com/osbuild/${ID}-${VERSION_ID}/${ARCH}/${GIT_COMMIT}
+enabled=1
+gpgcheck=0
+# Default dnf repo priority is 99. Lower number means higher priority.
+priority=5
+EOF
 
 if [[ $ID == rhel ]]; then
     # Set up EPEL repository (for ansible and koji)
diff --git a/schutzbot/mockbuild.sh b/schutzbot/mockbuild.sh
index 01e057c4..a9c3710c 100755
--- a/schutzbot/mockbuild.sh
+++ b/schutzbot/mockbuild.sh
@@ -90,15 +90,3 @@ greenprint "☁ Uploading RPMs to S3"
 pushd repo
     s3cmd --acl-public sync . s3://${REPO_BUCKET}/
 popd
-
-# Create a repository file.
-greenprint "📜 Generating dnf repository file"
-tee osbuild-mock.repo << EOF
-[osbuild-mock]
-name=osbuild mock ${COMMIT}
-baseurl=${REPO_URL}
-enabled=1
-gpgcheck=0
-# Default dnf repo priority is 99. Lower number means higher priority.
-priority=5
-EOF