diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ca25a61c..5a9829f88 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,6 +82,8 @@ RPM:
       - RUNNER:
           - aws/fedora-35-x86_64
           - aws/fedora-35-aarch64
+          - aws/fedora-36-x86_64
+          - aws/fedora-36-aarch64
           - aws/rhel-8.6-ga-x86_64
           - aws/rhel-8.6-ga-aarch64
           - aws/rhel-9.0-ga-x86_64
diff --git a/Schutzfile b/Schutzfile
index 4c3595b89..e05cd8b85 100644
--- a/Schutzfile
+++ b/Schutzfile
@@ -76,6 +76,83 @@
       }
     ]
   },
+  "fedora-36": {
+    "dependencies": {
+      "osbuild": {
+        "commit": "527be5081c21a313afb0c0cdeb4c3edadcf2225c"
+      }
+    },
+    "repos": [
+      {
+        "file": "/etc/yum.repos.d/fedora.repo",
+        "x86_64": [
+          {
+            "title": "fedora",
+            "name": "fedora",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-fedora-20220617"
+          }
+        ],
+        "aarch64": [
+          {
+            "title": "fedora",
+            "name": "fedora",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-aarch64-fedora-20220617"
+          }
+        ]
+      },
+      {
+        "file": "/etc/yum.repos.d/fedora-modular.repo",
+        "x86_64": [
+          {
+            "title": "fedora-modular",
+            "name": "fedora-modular",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-fedora-modular-20220617"
+          }
+        ],
+        "aarch64": [
+          {
+            "title": "fedora-modular",
+            "name": "fedora-modular",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-aarch64-fedora-modular-20220617"
+          }
+        ]
+      },
+      {
+        "file": "/etc/yum.repos.d/fedora-updates.repo",
+        "x86_64": [
+          {
+            "title": "updates",
+            "name": "updates",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-updates-released-20220617"
+          }
+        ],
+        "aarch64": [
+          {
+            "title": "updates",
+            "name": "updates",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-aarch64-updates-released-20220617"
+          }
+        ]
+      },
+      {
+        "file": "/etc/yum.repos.d/fedora-updates-modular.repo",
+        "x86_64": [
+          {
+            "title": "updates-modular",
+            "name": "updates-modular",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-updates-released-modular-20220617"
+          }
+        ],
+        "aarch64": [
+          {
+            "title": "updates-modular",
+            "name": "updates-modular",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-aarch64-updates-released-modular-20220617"
+          }
+        ]
+      }
+    ]
+  },
   "rhel-8.4": {
     "dependencies": {
       "osbuild": {
diff --git a/schutzbot/terraform b/schutzbot/terraform
index f94c9a046..f38148599 100644
--- a/schutzbot/terraform
+++ b/schutzbot/terraform
@@ -1 +1 @@
-dcd2ac1741598fe74b854143576fb77908b84cc9
+70fcf86fa49a058f54b6c6b7b9061ed7d65e4606