diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b2991f345d..be73798105 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ check-build-coverage:
   stage: verify
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/rhel-9.4-x86_64
     INTERNAL_NETWORK: "true"
     PYTHONUNBUFFERED: 1
   script:
@@ -73,7 +73,7 @@ generate-build-config-rhel-9.4-aarch64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/rhel-9.4-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -92,7 +92,7 @@ generate-build-config-rhel-9.4-x86_64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/rhel-9.4-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -131,7 +131,7 @@ generate-ostree-build-config-rhel-9.4-aarch64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/rhel-9.4-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -153,7 +153,7 @@ generate-ostree-build-config-rhel-9.4-x86_64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/rhel-9.4-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -195,7 +195,7 @@ generate-manifests-rhel-9.4-ppc64le:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/rhel-9.4-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -214,7 +214,7 @@ generate-manifests-rhel-9.4-s390x:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/rhel-9.4-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
diff --git a/Schutzfile b/Schutzfile
index a701bb0c05..ad1992cbf4 100644
--- a/Schutzfile
+++ b/Schutzfile
@@ -19,7 +19,7 @@
       }
     }
   },
-  "fedora-39": {
+  "rhel-9.4": {
     "dependencies": {
       "osbuild": {
         "commit": "b42e1afddc37dae3199e039f2a3d3cb10f01485c"
@@ -27,82 +27,42 @@
     },
     "repos": [
       {
-        "file": "/etc/yum.repos.d/fedora.repo",
+        "file": "/etc/yum.repos.d/rhel9internal.repo",
         "x86_64": [
           {
-            "title": "fedora",
-            "name": "fedora",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f39/f39-x86_64-fedora-20231109"
-          }
-        ],
-        "aarch64": [
-          {
-            "title": "fedora",
-            "name": "fedora",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f39/f39-aarch64-fedora-20231109"
-          }
-        ]
-      },
-      {
-        "file": "/etc/yum.repos.d/fedora-updates.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-20240822"
+          },
           {
-            "title": "updates",
-            "name": "updates",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f39/f39-x86_64-updates-released-20240924"
-          }
-        ],
-        "aarch64": [
-          {
-            "title": "updates",
-            "name": "updates",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f39/f39-aarch64-updates-released-20240924"
-          }
-        ]
-      }
-    ]
-  },
-  "fedora-40": {
-    "dependencies": {
-      "osbuild": {
-        "commit": "b42e1afddc37dae3199e039f2a3d3cb10f01485c"
-      }
-    },
-    "repos": [
-      {
-        "file": "/etc/yum.repos.d/fedora.repo",
-        "x86_64": [
+            "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
+            "name": "appstream",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.4-20240822"
+          },
           {
-            "title": "fedora",
-            "name": "fedora",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f40/f40-x86_64-fedora-20240514"
+            "title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
+            "name": "crb",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.4-20240822"
           }
         ],
         "aarch64": [
           {
-            "title": "fedora",
-            "name": "fedora",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f40/f40-aarch64-fedora-20240514"
-          }
-        ]
-      },
-      {
-        "file": "/etc/yum.repos.d/fedora-updates.repo",
-        "x86_64": [
+            "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS",
+            "name": "baseos",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.4-20240822"
+          },
           {
-            "title": "updates",
-            "name": "updates",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f40/f40-x86_64-updates-released-20240924"
-          }
-        ],
-        "aarch64": [
+            "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
+            "name": "appstream",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.4-20240822"
+          },
           {
-            "title": "updates",
-            "name": "updates",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f40/f40-aarch64-updates-released-20240924"
+            "title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
+            "name": "crb",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.4-20240822"
           }
         ]
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/test/scripts/generate-gitlab-ci b/test/scripts/generate-gitlab-ci
index 733ea5871a..fb4b778669 100755
--- a/test/scripts/generate-gitlab-ci
+++ b/test/scripts/generate-gitlab-ci
@@ -36,7 +36,7 @@ check-build-coverage:
   stage: verify
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/rhel-9.4-x86_64
     INTERNAL_NETWORK: "true"
     PYTHONUNBUFFERED: 1
   script:
@@ -70,7 +70,7 @@ generate-build-config-{distro}-{arch}:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-{arch}
+    RUNNER: aws/rhel-9.4-{arch}
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -102,7 +102,7 @@ generate-ostree-build-config-{distro}-{arch}:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-{arch}
+    RUNNER: aws/rhel-9.4-{arch}
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -138,7 +138,7 @@ generate-manifests-{distro}-{arch}:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/rhel-9.4-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo