diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d859c01..3fd482d7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,6 +33,8 @@ RPM:
           - aws/fedora-35-aarch64
           - aws/centos-stream-8-x86_64
           - 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
       - RUNNER:
diff --git a/schutzbot/mockbuild.sh b/schutzbot/mockbuild.sh
index d7c83e45..88fd1d28 100755
--- a/schutzbot/mockbuild.sh
+++ b/schutzbot/mockbuild.sh
@@ -21,8 +21,8 @@ fi
 # Mock configuration file to use for building RPMs.
 MOCK_CONFIG="${ID}-${VERSION_ID%.*}-$(uname -m)"
 
-if [[ $ID == centos && ${VERSION_ID%.*} == 8 ]]; then
-  MOCK_CONFIG="centos-stream-8-$(uname -m)"
+if [[ $ID == centos ]]; then
+    MOCK_CONFIG="centos-stream-${VERSION_ID%.*}-$(uname -m)"
 fi
 
 # The commit this script operates on.
@@ -61,18 +61,11 @@ if curl --silent --fail --head --output /dev/null "${REPO_URL}/repodata/repomd.x
 fi
 
 # Mock and s3cmd is only available in EPEL for RHEL.
-if [[ $ID == rhel || $ID == centos ]] && [[ ${VERSION_ID%.*} == 8 ]] && ! rpm -q epel-release; then
+if [[ $ID == rhel || $ID == centos ]] && ! rpm -q epel-release; then
     greenprint "📦 Setting up EPEL repository"
     curl -Ls --retry 5 --output /tmp/epel.rpm \
-        https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
+        https://dl.fedoraproject.org/pub/epel/epel-release-latest-${VERSION_ID%.*}.noarch.rpm
     sudo rpm -Uvh /tmp/epel.rpm
-elif [[ $ID == rhel || $ID == centos ]] && [[ ${VERSION_ID%.*} == 9 ]]; then
-    # we have our own small epel for EL9, let's install it
-
-    # install Red Hat certificate, otherwise dnf copr fails
-    curl -LO --insecure https://hdn.corp.redhat.com/rhel8-csb/RPMS/noarch/redhat-internal-cert-install-0.1-23.el7.csb.noarch.rpm
-    sudo dnf install -y ./redhat-internal-cert-install-0.1-23.el7.csb.noarch.rpm dnf-plugins-core
-    sudo dnf copr enable -y copr.devel.redhat.com/osbuild-team/epel-el9 "rhel-9.dev-$ARCH"
 fi
 
 # Install requirements for building RPMs in mock.
diff --git a/schutzbot/terraform b/schutzbot/terraform
index 238392b1..450dfcc5 100644
--- a/schutzbot/terraform
+++ b/schutzbot/terraform
@@ -1 +1 @@
-4918c081e231ac8175f97bdfce06456fa3c32761
+7993024714534f70cd412e3181b2ab08082ecd86