diff --git a/schutzbot/rhel-9-mock-configs/templates/rhel-9.tpl b/schutzbot/rhel-9-mock-configs/templates/rhel-9.tpl
index 6452dcf70..6bc9f82c7 100644
--- a/schutzbot/rhel-9-mock-configs/templates/rhel-9.tpl
+++ b/schutzbot/rhel-9-mock-configs/templates/rhel-9.tpl
@@ -30,19 +30,19 @@ user_agent={{ user_agent }}
 
 [rhel9-baseos]
 name=RHEL 9 BaseOS
-baseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9-Beta/latest-RHEL-9/compose/BaseOS/$basearch/os/
+baseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9-Beta/RHEL-9.0.0-20211017.6/compose/BaseOS/$basearch/os/
 enabled=1
 gpgcheck=0
 
 [rhel9-appstream]
 name=RHEL 9 AppStream
-baseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9-Beta/latest-RHEL-9/compose/AppStream/$basearch/os/
+baseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9-Beta/RHEL-9.0.0-20211017.6/compose/AppStream/$basearch/os/
 enabled=1
 gpgcheck=0
 
 [rhel9-crb]
 name=RHEL 9 CRB
-baseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9-Beta/latest-RHEL-9/compose/CRB/$basearch/os/
+baseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9-Beta/RHEL-9.0.0-20211017.6/compose/CRB/$basearch/os/
 enabled=1
 gpgcheck=0
 
diff --git a/schutzbot/terraform b/schutzbot/terraform
index 6f6e110f2..362c37f32 100644
--- a/schutzbot/terraform
+++ b/schutzbot/terraform
@@ -1 +1 @@
-40c40e64dc5df8d2e4d12b587833d5ff725940d2
+a13e0a5e14f11b9e16fc51647afc3dc879b2cd0d