diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 076acdbd..f16e1c0d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,6 +42,8 @@ RPM:
           - aws/fedora-38-aarch64
           - aws/fedora-39-x86_64
           - aws/fedora-39-aarch64
+          - aws/fedora-40-x86_64
+          - aws/fedora-40-aarch64
           - aws/centos-stream-8-x86_64
           - aws/centos-stream-8-aarch64
           - aws/centos-stream-9-x86_64
diff --git a/Schutzfile b/Schutzfile
index b4c39764..0f7b48ae 100644
--- a/Schutzfile
+++ b/Schutzfile
@@ -171,6 +171,27 @@
       }
     ]
   },
+  "fedora-40": {
+    "repos": [
+      {
+        "file": "/etc/yum.repos.d/fedora.repo",
+        "x86_64": [
+          {
+            "title": "fedora",
+            "name": "fedora",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f40/f40-x86_64-rawhide-20231201"
+          }
+        ],
+        "aarch64": [
+          {
+            "title": "fedora",
+            "name": "fedora",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f40/f40-aarch64-rawhide-20231201"
+          }
+        ]
+      }
+    ]
+  },
   "centos-stream-9": {
     "repos": [
       {
@@ -431,4 +452,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/schutzbot/terraform b/schutzbot/terraform
index 46ea0a6f..b1c3b3d0 100644
--- a/schutzbot/terraform
+++ b/schutzbot/terraform
@@ -1 +1 @@
-93c6080642ad10add2fddbf847e95ef7f42ee48c
+f127f38ebe23ef9a6ef4e6dcaf6d5cd9389f0a08