diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c6d03ca4..e3b46a80 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,8 +36,8 @@ RPM:
       - RUNNER:
           - aws/rhel-8.6-nightly-x86_64
           - aws/rhel-8.6-nightly-aarch64
-          - aws/rhel-9.0-beta-nightly-x86_64
-          - aws/rhel-9.0-beta-nightly-aarch64
+          - aws/rhel-9.0-nightly-x86_64
+          - aws/rhel-9.0-nightly-aarch64
         INTERNAL_NETWORK: "true"
 
 Testing:
@@ -53,7 +53,8 @@ Testing:
           - aws/fedora-33-aarch64
           - aws/rhel-8.4-ga-x86_64
           - aws/rhel-8.6-nightly-x86_64
-          - aws/rhel-9.0-beta-nightly-x86_64
+          # See https://github.com/osbuild/osbuild-composer/issues/1819 and related issues
+          # - aws/rhel-9.0-nightly-x86_64
         INTERNAL_NETWORK: "true"
 
 finish:
diff --git a/schutzbot/terraform b/schutzbot/terraform
index 6a4d22d3..ed7c5613 100644
--- a/schutzbot/terraform
+++ b/schutzbot/terraform
@@ -1 +1 @@
-2e4d6e908a7eac1487003779f4d20be3ed4af9bf
+75d786e792a7b58634689b24ac379678b444fa65