diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e1cc338b4..39c51ce5f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,8 +59,8 @@ RPM:
           - aws/fedora-33-aarch64
           - aws/fedora-34-x86_64
           - aws/fedora-34-aarch64
-          - aws/rhel-8.4-ga-x86_64
-          - aws/rhel-8.4-ga-aarch64
+          - aws/rhel-8.5-ga-x86_64
+          - aws/rhel-8.5-ga-aarch64
           - aws/centos-stream-8-x86_64
           - aws/centos-stream-8-aarch64
       - RUNNER:
@@ -136,8 +136,8 @@ Base:
           # See COMPOSER-919
           # - aws/fedora-34-x86_64
           # - aws/fedora-34-aarch64
-          - aws/rhel-8.4-ga-x86_64
-          - aws/rhel-8.4-ga-aarch64
+          - aws/rhel-8.5-ga-x86_64
+          - aws/rhel-8.5-ga-aarch64
           - aws/centos-stream-8-x86_64
           - aws/centos-stream-8-aarch64
       - RUNNER:
@@ -193,8 +193,8 @@ Regression:
           - aws/centos-stream-8-x86_64
           - aws/centos-stream-8-aarch64
       - RUNNER:
-          - aws/rhel-8.4-ga-x86_64
-          - aws/rhel-8.4-ga-aarch64
+          - aws/rhel-8.5-ga-x86_64
+          - aws/rhel-8.5-ga-aarch64
           - aws/rhel-8.6-nightly-x86_64
           - aws/rhel-8.6-nightly-aarch64
           - aws/rhel-9.0-nightly-x86_64
@@ -223,7 +223,7 @@ OSTree:
           - openstack/fedora-33-x86_64
           # See COMPOSER-919
           # - openstack/fedora-34-x86_64
-          - openstack/rhel-8.4-ga-x86_64
+          - openstack/rhel-8.5-ga-x86_64
           - openstack/rhel-8.6-nightly-x86_64
           - openstack/rhel-9.0-nightly-x86_64
           - openstack/centos-stream-8-x86_64
@@ -303,7 +303,7 @@ Integration:
           - aws/centos-stream-8-x86_64
       - <<: *INTEGRATION_TESTS
         RUNNER:
-          - aws/rhel-8.4-ga-x86_64
+          - aws/rhel-8.5-ga-x86_64
           - aws/rhel-8.6-nightly-x86_64
           - aws/rhel-9.0-nightly-x86_64
         INTERNAL_NETWORK: ["true"]
@@ -347,7 +347,7 @@ API:
           - aws/centos-stream-8-x86_64
       - <<: *API_TESTS
         RUNNER:
-          - aws/rhel-8.4-ga-x86_64
+          - aws/rhel-8.5-ga-x86_64
           - aws/rhel-8.6-nightly-x86_64
           - aws/rhel-9.0-nightly-x86_64
         INTERNAL_NETWORK: ["true"]
@@ -369,7 +369,7 @@ libvirt:
           - openstack/fedora-33-x86_64
           - openstack/centos-stream-8-x86_64
       - RUNNER:
-          - openstack/rhel-8.4-ga-x86_64
+          - openstack/rhel-8.5-ga-x86_64
           - openstack/rhel-8.6-nightly-x86_64
           - openstack/rhel-9.0-nightly-x86_64
         INTERNAL_NETWORK: ["true"]
@@ -384,7 +384,7 @@ RHEL 9 on 8:
     - /usr/libexec/tests/osbuild-composer/koji.sh
   interruptible: true
   variables:
-    RUNNER: aws/rhel-8.4-ga-x86_64
+    RUNNER: aws/rhel-8.5-ga-x86_64
     INTERNAL_NETWORK: "true"
     DISTRO_CODE: rhel-90
 
diff --git a/Schutzfile b/Schutzfile
index 88d4b60e7..51d967491 100644
--- a/Schutzfile
+++ b/Schutzfile
@@ -25,6 +25,13 @@
       }
     }
   },
+  "rhel-8.5": {
+    "dependencies": {
+      "osbuild": {
+        "commit": "f7bf23fabaae6027b1e1147b27870d90d4b1911f"
+      }
+    }
+  },
   "rhel-8.6": {
     "dependencies": {
       "osbuild": {
diff --git a/schutzbot/terraform b/schutzbot/terraform
index e1100a840..ce61bd811 100644
--- a/schutzbot/terraform
+++ b/schutzbot/terraform
@@ -1 +1 @@
-428f543041dc410a592c7f3ead5f2dd4143722ab
+f6460225b97554d56ec86806a00652b5d610e0f2