diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0755c7f9..012c5a0c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,11 +66,10 @@ Composer Tests:
           - aws/fedora-35-aarch64
           - aws/rhel-8.6-ga-x86_64
           - aws/rhel-8.6-ga-aarch64
-          #- aws/rhel-8.6-nightly-x86_64
-          #- aws/rhel-8.6-nightly-aarch64
-          # See https://github.com/osbuild/osbuild-composer/issues/1819 and related issues
-          # - aws/rhel-9.0-nightly-x86_64
-          # - aws/rhel-9.0-nightly-aarch64
+          - aws/rhel-8.7-nightly-x86_64
+          - aws/rhel-8.7-nightly-aarch64
+          - aws/rhel-9.1-nightly-x86_64
+          - aws/rhel-9.1-nightly-aarch64
         INTERNAL_NETWORK: "true"
 
 OSTree Images:
@@ -84,8 +83,8 @@ OSTree Images:
       - RUNNER:
           - aws/fedora-35-x86_64
           - aws/rhel-8.6-ga-x86_64
-          #- aws/rhel-8.6-nightly-x86_64
-          #- aws/rhel-9.0-nightly-x86_64
+          - aws/rhel-8.7-nightly-x86_64
+          - aws/rhel-9.1-nightly-x86_64
         INTERNAL_NETWORK: "true"
 
 SonarQube:
diff --git a/schutzbot/ci_details.sh b/schutzbot/ci_details.sh
index d287051a..fced7533 100755
--- a/schutzbot/ci_details.sh
+++ b/schutzbot/ci_details.sh
@@ -34,7 +34,7 @@ EOF
 echo -e "\033[0m"
 
 echo "List of system repositories:"
-yum repolist -v
+sudo yum repolist -v
 
 echo "------------------------------------------------------------------------------"
 
diff --git a/schutzbot/deploy.sh b/schutzbot/deploy.sh
index 1586d2f5..46c9330a 100755
--- a/schutzbot/deploy.sh
+++ b/schutzbot/deploy.sh
@@ -4,8 +4,8 @@ set -euxo pipefail
 DNF_REPO_BASEURL=http://osbuild-composer-repos.s3.amazonaws.com
 
 # The osbuild-composer commit to run reverse-dependency test against.
-# Currently: test: add image test cases for Fedora 34 and 35
-OSBUILD_COMPOSER_COMMIT=1401a7a6595f86812008b6bfdacdf7289945a6f3
+# Currently: CI: temporarily siwtch RHOS-01 to non-ssd instances
+OSBUILD_COMPOSER_COMMIT=b297ee8d403bb48363c44773f495ef30acbf7d1a
 
 # Get OS details.
 source /etc/os-release
diff --git a/schutzbot/terraform b/schutzbot/terraform
index f3814859..16ebe2de 100644
--- a/schutzbot/terraform
+++ b/schutzbot/terraform
@@ -1 +1 @@
-70fcf86fa49a058f54b6c6b7b9061ed7d65e4606
+01a826d9797d9e3b5e370a20c1bfa43edd542a55