diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9e6ee375ead..b8cacce55a0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,10 +102,10 @@ RPM:
           - aws/fedora-39-aarch64
           - aws/rhel-8.4-ga-x86_64
           - aws/rhel-8.4-ga-aarch64
-          - aws/rhel-8.9-ga-x86_64
-          - aws/rhel-8.9-ga-aarch64
-          - aws/rhel-9.3-ga-x86_64
-          - aws/rhel-9.3-ga-aarch64
+          - aws/rhel-8.10-ga-x86_64
+          - aws/rhel-8.10-ga-aarch64
+          - aws/rhel-9.4-ga-x86_64
+          - aws/rhel-9.4-ga-aarch64
           - aws/centos-stream-8-x86_64
           - aws/centos-stream-8-aarch64
           - aws/centos-stream-9-x86_64
@@ -137,7 +137,7 @@ Container:
   parallel:
     matrix:
       - RUNNER:
-          - aws/rhel-8.9-ga-x86_64
+          - aws/rhel-8.10-ga-x86_64
 
 Packer:
   stage: test
@@ -147,7 +147,7 @@ Packer:
   script:
     - tools/ci-build-worker-packer.sh
   variables:
-    RUNNER: aws/rhel-9.3-ga-x86_64
+    RUNNER: aws/rhel-9.4-ga-x86_64
 
 Prepare-rhel-internal:
   stage: prepare-rhel-internal
@@ -188,10 +188,10 @@ Base:
           - aws/fedora-39-aarch64
           - aws/rhel-8.4-ga-x86_64
           - aws/rhel-8.4-ga-aarch64
-          - aws/rhel-8.9-ga-x86_64
-          - aws/rhel-8.9-ga-aarch64
-          - aws/rhel-9.3-ga-x86_64
-          - aws/rhel-9.3-ga-aarch64
+          - aws/rhel-8.10-ga-x86_64
+          - aws/rhel-8.10-ga-aarch64
+          - aws/rhel-9.4-ga-x86_64
+          - aws/rhel-9.4-ga-aarch64
           - aws/centos-stream-8-x86_64
           - aws/centos-stream-8-aarch64
       - RUNNER:
@@ -224,10 +224,10 @@ Base:
       - RUNNER:
           - aws/rhel-8.4-ga-x86_64
           - aws/rhel-8.4-ga-aarch64
-          - aws/rhel-8.9-ga-x86_64
-          - aws/rhel-8.9-ga-aarch64
-          - aws/rhel-9.3-ga-x86_64
-          - aws/rhel-9.3-ga-aarch64
+          - aws/rhel-8.10-ga-x86_64
+          - aws/rhel-8.10-ga-aarch64
+          - aws/rhel-9.4-ga-x86_64
+          - aws/rhel-9.4-ga-aarch64
           - aws/rhel-8.10-nightly-x86_64
           - aws/rhel-8.10-nightly-aarch64
           - aws/rhel-9.4-nightly-x86_64
@@ -276,8 +276,8 @@ regression-old-worker-new-composer:
   parallel:
     matrix:
       - RUNNER:
-          - aws/rhel-8.9-ga-x86_64
-          - aws/rhel-9.3-ga-x86_64
+          - aws/rhel-8.10-ga-x86_64
+          - aws/rhel-9.4-ga-x86_64
         INTERNAL_NETWORK: ["true"]
   extends: .regression
   variables:
@@ -345,8 +345,8 @@ Trigger-rhel-edge-ci:
     RUNNER:
       - aws/centos-stream-8-x86_64
       - aws/rhel-8.4-ga-x86_64
-      - aws/rhel-8.9-ga-x86_64
-      - aws/rhel-9.3-ga-x86_64
+      - aws/rhel-8.10-ga-x86_64
+      - aws/rhel-9.4-ga-x86_64
       - aws/rhel-8.10-nightly-x86_64
       - aws/rhel-8.10-nightly-aarch64
       - aws/rhel-9.4-nightly-x86_64
@@ -389,20 +389,20 @@ koji.sh (cloud upload):
   parallel:
     matrix:
       - RUNNER:
-          - aws/rhel-8.9-ga-x86_64
-          - aws/rhel-9.3-ga-x86_64
+          - aws/rhel-8.10-ga-x86_64
+          - aws/rhel-9.4-ga-x86_64
         INTERNAL_NETWORK: ["true"]
         CLOUD_TARGET: aws
         IMAGE_TYPE: aws-rhui
       - RUNNER:
-          - aws/rhel-8.9-ga-x86_64
-          - aws/rhel-9.3-ga-x86_64
+          - aws/rhel-8.10-ga-x86_64
+          - aws/rhel-9.4-ga-x86_64
         INTERNAL_NETWORK: ["true"]
         CLOUD_TARGET: azure
         IMAGE_TYPE: azure-rhui
       - RUNNER:
-          - aws/rhel-8.9-ga-x86_64
-          - aws/rhel-9.3-ga-x86_64
+          - aws/rhel-8.10-ga-x86_64
+          - aws/rhel-9.4-ga-x86_64
         INTERNAL_NETWORK: ["true"]
         CLOUD_TARGET: gcp
         IMAGE_TYPE: gcp-rhui
@@ -418,8 +418,8 @@ koji.sh (cloudapi):
     matrix:
       - *fedora_runners
       - RUNNER:
-          - aws/rhel-8.9-ga-x86_64
-          - aws/rhel-9.3-ga-x86_64
+          - aws/rhel-8.10-ga-x86_64
+          - aws/rhel-9.4-ga-x86_64
         INTERNAL_NETWORK: ["true"]
 
 aws.sh:
@@ -540,8 +540,8 @@ API:
     matrix:
       - <<: *API_TESTS
         RUNNER:
-          - aws/rhel-8.9-ga-x86_64
-          - aws/rhel-9.3-ga-x86_64
+          - aws/rhel-8.10-ga-x86_64
+          - aws/rhel-9.4-ga-x86_64
           - aws/rhel-8.10-nightly-x86_64
           - aws/rhel-9.4-nightly-x86_64
         INTERNAL_NETWORK: ["true"]
@@ -555,8 +555,8 @@ API:
           - aws/fedora-39-aarch64
       - IMAGE_TYPE: ["aws"]
         RUNNER:
-          - aws/rhel-8.9-ga-aarch64
-          - aws/rhel-9.3-ga-aarch64
+          - aws/rhel-8.10-ga-aarch64
+          - aws/rhel-9.4-ga-aarch64
         INTERNAL_NETWORK: ["true"]
 
 API-module-hotfixes:
@@ -574,14 +574,14 @@ API-module-hotfixes:
       - IMAGE_TYPE:
           - aws
         RUNNER:
-          - aws/rhel-8.9-ga-x86_64
-          - aws/rhel-8.9-ga-aarch64
+          - aws/rhel-8.10-ga-x86_64
+          - aws/rhel-8.10-ga-aarch64
         INTERNAL_NETWORK: ["true"]
         TEST_MODULE_HOTFIXES: [1]
       - IMAGE_TYPE:
           - vsphere
         RUNNER:
-          - aws/rhel-8.9-ga-x86_64
+          - aws/rhel-8.10-ga-x86_64
         INTERNAL_NETWORK: ["true"]
         TEST_MODULE_HOTFIXES: [1]
 
@@ -601,8 +601,8 @@ API-module-hotfixes:
           # - rhos-01/fedora-39-x86_64
       - RUNNER:
           - gcp/centos-stream-8-x86_64
-          - gcp/rhel-8.9-ga-x86_64
-          - gcp/rhel-9.3-ga-x86_64
+          - gcp/rhel-8.10-ga-x86_64
+          - gcp/rhel-9.4-ga-x86_64
           - gcp/rhel-8.10-nightly-x86_64
           - gcp/rhel-9.4-nightly-x86_64
           - gcp/centos-stream-9-x86_64
@@ -625,8 +625,8 @@ ubi-wsl.sh:
   parallel:
     matrix:
       - RUNNER:
-          - aws/rhel-8.9-ga-x86_64
-          - aws/rhel-9.3-ga-x86_64
+          - aws/rhel-8.10-ga-x86_64
+          - aws/rhel-9.4-ga-x86_64
         INTERNAL_NETWORK: "true"
 
 weldr-distro-dot-notation+aliases:
@@ -681,7 +681,7 @@ RHEL 9 on 8:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/koji.sh
   variables:
-    RUNNER: aws/rhel-8.9-ga-x86_64
+    RUNNER: aws/rhel-8.10-ga-x86_64
     INTERNAL_NETWORK: "true"
     DISTRO_CODE: rhel-91
 
@@ -694,8 +694,7 @@ Multi-tenancy:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/multi-tenancy.sh
   variables:
-    # only 8.7 GA b/c the Image Builder service runs on RHEL 8
-    RUNNER: aws/rhel-8.9-ga-x86_64
+    RUNNER: aws/rhel-8.10-ga-x86_64
     INTERNAL_NETWORK: "true"
 
 Upgrade:
diff --git a/Schutzfile b/Schutzfile
index 0443eaa94e5..cd7749a89d2 100644
--- a/Schutzfile
+++ b/Schutzfile
@@ -171,46 +171,7 @@
       "osbuild": {
         "commit": "4dbf8e2d593b769bf4797a18a9c6462696990af3"
       }
-    },
-    "repos": [
-      {
-        "file": "/etc/yum.repos.d/rhel8internal.repo",
-        "x86_64": [
-          {
-            "title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS",
-            "name": "baseos",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.10-20240514"
-          },
-          {
-            "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream",
-            "name": "appstream",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.10-20240514"
-          },
-          {
-            "title": "RHEL-8-RPMREPO-NIGHTLY-CRB",
-            "name": "crb",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-crb-n8.10-20240514"
-          }
-        ],
-        "aarch64": [
-          {
-            "title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS",
-            "name": "baseos",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.10-20240514"
-          },
-          {
-            "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream",
-            "name": "appstream",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.10-20240514"
-          },
-          {
-            "title": "RHEL-8-RPMREPO-NIGHTLY-CRB",
-            "name": "crb",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-crb-n8.10-20240514"
-          }
-        ]
-      }
-    ]
+    }
   },
   "rhel-9.2": {
     "dependencies": {
@@ -231,46 +192,7 @@
       "osbuild": {
         "commit": "4dbf8e2d593b769bf4797a18a9c6462696990af3"
       }
-    },
-    "repos": [
-      {
-        "file": "/etc/yum.repos.d/rhel9internal.repo",
-        "x86_64": [
-          {
-            "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS",
-            "name": "baseos",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.4-20240514"
-          },
-          {
-            "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
-            "name": "appstream",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.4-20240514"
-          },
-          {
-            "title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
-            "name": "crb",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.4-20240514"
-          }
-        ],
-        "aarch64": [
-          {
-            "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS",
-            "name": "baseos",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.4-20240514"
-          },
-          {
-            "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
-            "name": "appstream",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.4-20240514"
-          },
-          {
-            "title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
-            "name": "crb",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.4-20240514"
-          }
-        ]
-      }
-    ]
+    }
   },
   "centos-8": {
     "dependencies": {
@@ -392,4 +314,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/schutzbot/terraform b/schutzbot/terraform
index 45fe9764435..7dfb5b3ced4 100644
--- a/schutzbot/terraform
+++ b/schutzbot/terraform
@@ -1 +1 @@
-6dded52809c87637e77bb0819877351955af1cd2
+1ea4a1210630ea0afa67d3047eaa09e72965bcc1