diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1cac3876..115a342d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,8 +37,8 @@ RPM:
           - aws/centos-stream-8-x86_64
           - aws/centos-stream-8-aarch64
       - RUNNER:
-          - aws/rhel-8-x86_64
-          - aws/rhel-8-aarch64
+          - aws/rhel-8.4-ga-x86_64
+          - aws/rhel-8.4-ga-aarch64
         REGISTER: "true"
       - RUNNER:
           - aws/rhel-8.5-nightly-x86_64
@@ -62,12 +62,13 @@ Testing:
           - aws/fedora-33-aarch64
         INTERNAL_NETWORK: "true"
       - RUNNER:
-          - aws/rhel-8-x86_64
+          - aws/rhel-8.4-ga-x86_64
         REGISTER: "true"
-        DISTRO_CODE: "rhel_8"
         INTERNAL_NETWORK: "true"
       - RUNNER:
-          - aws/rhel-8.5-x86_64
+          - aws/rhel-8.5-nightly-x86_64
+        INTERNAL_NETWORK: "true"
+      - RUNNER:
           - aws/rhel-9.0-beta-nightly-x86_64
         INTERNAL_NETWORK: "true"
 
diff --git a/schutzbot/deploy.sh b/schutzbot/deploy.sh
index dfcc824d..34e42978 100755
--- a/schutzbot/deploy.sh
+++ b/schutzbot/deploy.sh
@@ -4,8 +4,8 @@ set -euxo pipefail
 DNF_REPO_BASEURL=http://osbuild-composer-repos.s3.amazonaws.com
 
 # The osbuild-composer commit to run reverse-dependency test against.
-# Currently: Test: regenerate all image test cases
-OSBUILD_COMPOSER_COMMIT=2aedd3da05975cbd3ed507f0edcc3a973804d6ff
+# Currently: Image tests: skip rpm-ostree-1-autovar.conf tmpfiles.d config on Fedora
+OSBUILD_COMPOSER_COMMIT=9497ef8ca9e05a177dc8ec5cbb80b98ad450b041
 
 # Get OS details.
 source /etc/os-release