diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 51ab550f..0e88102f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,8 +52,12 @@ RPM:
       - RUNNER:
           - aws/rhel-8.8-nightly-x86_64
           - aws/rhel-8.8-nightly-aarch64
+          - aws/rhel-8.9-nightly-x86_64
+          - aws/rhel-8.9-nightly-aarch64
           - aws/rhel-9.2-nightly-x86_64
           - aws/rhel-9.2-nightly-aarch64
+          - aws/rhel-9.3-nightly-x86_64
+          - aws/rhel-9.3-nightly-aarch64
         INTERNAL_NETWORK: "true"
 
 OSTree Images:
diff --git a/Schutzfile b/Schutzfile
index 8301c18b..d914894a 100644
--- a/Schutzfile
+++ b/Schutzfile
@@ -342,6 +342,47 @@
       }
     ]
   },
+  "rhel-8.9": {
+    "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.9-20230501"
+          },
+          {
+            "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream",
+            "name": "appstream",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.9-20230501"
+          },
+          {
+            "title": "RHEL-8-RPMREPO-NIGHTLY-CRB",
+            "name": "crb",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-crb-n8.9-20230501"
+          }
+        ],
+        "aarch64": [
+          {
+            "title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS",
+            "name": "baseos",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.9-20230501"
+          },
+          {
+            "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream",
+            "name": "appstream",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.9-20230501"
+          },
+          {
+            "title": "RHEL-8-RPMREPO-NIGHTLY-CRB",
+            "name": "crb",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-crb-n8.9-20230501"
+          }
+        ]
+      }
+    ]
+  },
   "rhel-9.2": {
     "repos": [
       {
@@ -383,6 +424,47 @@
       }
     ]
   },
+  "rhel-9.3": {
+    "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.3-20230501"
+          },
+          {
+            "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
+            "name": "appstream",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.3-20230501"
+          },
+          {
+            "title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
+            "name": "crb",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.3-20230501"
+          }
+        ],
+        "aarch64": [
+          {
+            "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS",
+            "name": "baseos",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.3-20230501"
+          },
+          {
+            "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
+            "name": "appstream",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.3-20230501"
+          },
+          {
+            "title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
+            "name": "crb",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.3-20230501"
+          }
+        ]
+      }
+    ]
+  },
   "centos-stream-8": {
     "repos": [
       {
diff --git a/schutzbot/terraform b/schutzbot/terraform
index 0517c19b..6db5ce03 100644
--- a/schutzbot/terraform
+++ b/schutzbot/terraform
@@ -1 +1 @@
-5ab7bdf6ac30da288d7c1d7e15d257c75fb3c677
+d36bc21dafed5d40b3a2d69c320abad6baa149ef