diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5c4b04ccc..9f7c2ff85 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -109,10 +109,10 @@ RPM:
   parallel:
     matrix:
       - RUNNER:
-          - aws/fedora-39-x86_64
-          - aws/fedora-39-aarch64
           - aws/fedora-40-x86_64
           - aws/fedora-40-aarch64
+          - aws/fedora-41-x86_64
+          - aws/fedora-41-aarch64
           - aws/rhel-8.10-ga-x86_64
           - aws/rhel-8.10-ga-aarch64
           - aws/rhel-9.4-ga-x86_64
@@ -195,8 +195,8 @@ Base:
   parallel:
     matrix:
       - RUNNER:
-          - aws/fedora-39-x86_64
-          - aws/fedora-39-aarch64
+          - aws/fedora-41-x86_64
+          - aws/fedora-41-aarch64
           - aws/rhel-8.10-ga-x86_64
           - aws/rhel-8.10-ga-aarch64
           - aws/rhel-9.4-ga-x86_64
@@ -225,8 +225,8 @@ Base:
   parallel:
     matrix:
       - RUNNER:
-          - aws/fedora-39-x86_64
-          - aws/fedora-39-aarch64
+          - aws/fedora-41-x86_64
+          - aws/fedora-41-aarch64
       - RUNNER:
           - aws/rhel-8.10-ga-x86_64
           - aws/rhel-8.10-ga-aarch64
@@ -371,7 +371,7 @@ Trigger-rhel-edge-ci:
 
 .fedora_runners: &fedora_runners
     RUNNER:
-      - aws/fedora-39-x86_64
+      - aws/fedora-41-x86_64
 
 .integration_fedora:
   extends: .integration_base
@@ -572,11 +572,11 @@ API:
         INTERNAL_NETWORK: ["true"]
       - IMAGE_TYPE: ["iot-commit"]
         RUNNER:
-          - aws/fedora-39-x86_64
+          - aws/fedora-41-x86_64
       - IMAGE_TYPE: ["iot-bootable-container"]
         RUNNER:
-          - aws/fedora-39-x86_64
-          - aws/fedora-39-aarch64
+          - aws/fedora-41-x86_64
+          - aws/fedora-41-aarch64
       - IMAGE_TYPE: ["aws"]
         RUNNER:
           - aws/rhel-8.10-ga-aarch64
@@ -823,7 +823,7 @@ ContainerUpload:
   parallel:
     matrix:
       - RUNNER:
-          - aws/fedora-39-x86_64
+          - aws/fedora-41-x86_64
 
 ContainerEmbedding:
   stage: test
@@ -854,7 +854,7 @@ WorkerExecutor:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/worker-executor.sh
   variables:
-    RUNNER: aws/fedora-39-x86_64
+    RUNNER: aws/fedora-41-x86_64
     IAM_INSTANCE_PROFILE: worker-executor
 
 finish:
diff --git a/Schutzfile b/Schutzfile
index 649a64487..b469022dd 100644
--- a/Schutzfile
+++ b/Schutzfile
@@ -1,47 +1,4 @@
 {
-  "fedora-39": {
-    "dependencies": {
-      "osbuild": {
-        "commit": "9b66ad812380847557aa9911efd7af2d57ad8084"
-      }
-    },
-    "repos": [
-      {
-        "file": "/etc/yum.repos.d/fedora.repo",
-        "x86_64": [
-          {
-            "title": "fedora",
-            "name": "fedora",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f39/f39-x86_64-fedora-20231109"
-          }
-        ],
-        "aarch64": [
-          {
-            "title": "fedora",
-            "name": "fedora",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f39/f39-aarch64-fedora-20231109"
-          }
-        ]
-      },
-      {
-        "file": "/etc/yum.repos.d/fedora-updates.repo",
-        "x86_64": [
-          {
-            "title": "updates",
-            "name": "updates",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f39/f39-x86_64-updates-released-20241203"
-          }
-        ],
-        "aarch64": [
-          {
-            "title": "updates",
-            "name": "updates",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f39/f39-aarch64-updates-released-20241203"
-          }
-        ]
-      }
-    ]
-  },
   "fedora-40": {
     "dependencies": {
       "osbuild": {
@@ -85,6 +42,49 @@
       }
     ]
   },
+  "fedora-41": {
+    "dependencies": {
+      "osbuild": {
+        "commit": "9b66ad812380847557aa9911efd7af2d57ad8084"
+      }
+    },
+    "repos": [
+      {
+        "file": "/etc/yum.repos.d/fedora.repo",
+        "x86_64": [
+          {
+            "title": "fedora",
+            "name": "fedora",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f41/f41-x86_64-fedora-20241107"
+          }
+        ],
+        "aarch64": [
+          {
+            "title": "fedora",
+            "name": "fedora",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f41/f41-aarch64-fedora-20241107"
+          }
+        ]
+      },
+      {
+        "file": "/etc/yum.repos.d/fedora-updates.repo",
+        "x86_64": [
+          {
+            "title": "updates",
+            "name": "updates",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f41/f41-x86_64-updates-released-20250115"
+          }
+        ],
+        "aarch64": [
+          {
+            "title": "updates",
+            "name": "updates",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f41/f41-aarch64-updates-released-20250115"
+          }
+        ]
+      }
+    ]
+  },
   "rhel-8.4": {
     "dependencies": {
       "osbuild": {