diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b25905e9..7b2ebeba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,8 +40,10 @@ RPM:
           - aws/centos-stream-8-aarch64
           - aws/centos-stream-9-x86_64
           - aws/centos-stream-9-aarch64
-          - aws/rhel-8.5-ga-x86_64
-          - aws/rhel-8.5-ga-aarch64
+          - aws/rhel-8.6-ga-x86_64
+          - aws/rhel-8.6-ga-aarch64
+          - aws/rhel-9.0-ga-x86_64
+          - aws/rhel-9.0-ga-aarch64
       - RUNNER:
           - aws/rhel-8.6-nightly-x86_64
           - aws/rhel-8.6-nightly-aarch64
diff --git a/schutzbot/terraform b/schutzbot/terraform
index 450dfcc5..bc8996c5 100644
--- a/schutzbot/terraform
+++ b/schutzbot/terraform
@@ -1 +1 @@
-7993024714534f70cd412e3181b2ab08082ecd86
+98bf823964bec1ddfe35bca003afaa680a8e0d28