diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8c01a4f86..86d2d86db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -98,6 +98,8 @@ RPM:
           - aws/fedora-37-aarch64
           - aws/fedora-38-x86_64
           - aws/fedora-38-aarch64
+          - aws/fedora-40-x86_64
+          - aws/fedora-40-aarch64
           - aws/rhel-8.4-ga-x86_64
           - aws/rhel-8.4-ga-aarch64
           - aws/rhel-8.8-ga-x86_64
diff --git a/Schutzfile b/Schutzfile
index 45db501e3..c521d2604 100644
--- a/Schutzfile
+++ b/Schutzfile
@@ -153,6 +153,32 @@
       }
     ]
   },
+  "fedora-40": {
+    "dependencies": {
+      "osbuild": {
+        "commit": "36883654cea32446ba60747a47d23ef38ca200f4"
+      }
+    },
+    "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"
+          }
+        ]
+      }
+    ]
+  },
   "rhel-8.4": {
     "dependencies": {
       "osbuild": {
diff --git a/schutzbot/terraform b/schutzbot/terraform
index 46ea0a6f3..b1c3b3d02 100644
--- a/schutzbot/terraform
+++ b/schutzbot/terraform
@@ -1 +1 @@
-93c6080642ad10add2fddbf847e95ef7f42ee48c
+f127f38ebe23ef9a6ef4e6dcaf6d5cd9389f0a08