diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8c776eebcc..2232f7605f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ check-build-coverage:
   stage: verify
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
     PYTHONUNBUFFERED: 1
   script:
@@ -73,7 +73,7 @@ generate-build-config-centos-10-aarch64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -92,7 +92,7 @@ generate-build-config-centos-10-x86_64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -111,7 +111,7 @@ generate-build-config-centos-9-aarch64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -130,7 +130,7 @@ generate-build-config-centos-9-x86_64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -149,7 +149,7 @@ generate-build-config-fedora-39-aarch64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -168,7 +168,7 @@ generate-build-config-fedora-39-x86_64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -187,7 +187,7 @@ generate-build-config-fedora-40-aarch64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -206,7 +206,7 @@ generate-build-config-fedora-40-x86_64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -225,7 +225,7 @@ generate-build-config-fedora-41-aarch64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -244,7 +244,7 @@ generate-build-config-fedora-41-x86_64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -263,7 +263,7 @@ generate-build-config-rhel-10.0-aarch64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -282,7 +282,7 @@ generate-build-config-rhel-10.0-x86_64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -301,7 +301,7 @@ generate-build-config-rhel-7.9-x86_64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -320,7 +320,7 @@ generate-build-config-rhel-8.10-aarch64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -339,7 +339,7 @@ generate-build-config-rhel-8.10-x86_64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -358,7 +358,7 @@ generate-build-config-rhel-8.4-aarch64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -377,7 +377,7 @@ generate-build-config-rhel-8.4-x86_64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -396,7 +396,7 @@ generate-build-config-rhel-8.5-aarch64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -415,7 +415,7 @@ generate-build-config-rhel-8.5-x86_64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -434,7 +434,7 @@ generate-build-config-rhel-8.6-aarch64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -453,7 +453,7 @@ generate-build-config-rhel-8.6-x86_64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -472,7 +472,7 @@ generate-build-config-rhel-8.7-aarch64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -491,7 +491,7 @@ generate-build-config-rhel-8.7-x86_64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -510,7 +510,7 @@ generate-build-config-rhel-8.8-aarch64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -529,7 +529,7 @@ generate-build-config-rhel-8.8-x86_64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -548,7 +548,7 @@ generate-build-config-rhel-8.9-aarch64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -567,7 +567,7 @@ generate-build-config-rhel-8.9-x86_64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -586,7 +586,7 @@ generate-build-config-rhel-9.0-aarch64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -605,7 +605,7 @@ generate-build-config-rhel-9.0-x86_64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -624,7 +624,7 @@ generate-build-config-rhel-9.1-aarch64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -643,7 +643,7 @@ generate-build-config-rhel-9.1-x86_64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -662,7 +662,7 @@ generate-build-config-rhel-9.2-aarch64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -681,7 +681,7 @@ generate-build-config-rhel-9.2-x86_64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -700,7 +700,7 @@ generate-build-config-rhel-9.3-aarch64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -719,7 +719,7 @@ generate-build-config-rhel-9.3-x86_64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -738,7 +738,7 @@ generate-build-config-rhel-9.4-aarch64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -757,7 +757,7 @@ generate-build-config-rhel-9.4-x86_64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -776,7 +776,7 @@ generate-build-config-rhel-9.5-aarch64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -795,7 +795,7 @@ generate-build-config-rhel-9.5-x86_64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -814,7 +814,7 @@ generate-build-config-rhel-9.6-aarch64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -833,7 +833,7 @@ generate-build-config-rhel-9.6-x86_64:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1301,7 +1301,7 @@ generate-ostree-build-config-centos-10-aarch64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1323,7 +1323,7 @@ generate-ostree-build-config-centos-10-x86_64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1345,7 +1345,7 @@ generate-ostree-build-config-centos-9-aarch64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1367,7 +1367,7 @@ generate-ostree-build-config-centos-9-x86_64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1389,7 +1389,7 @@ generate-ostree-build-config-fedora-39-aarch64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1411,7 +1411,7 @@ generate-ostree-build-config-fedora-39-x86_64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1433,7 +1433,7 @@ generate-ostree-build-config-fedora-40-aarch64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1455,7 +1455,7 @@ generate-ostree-build-config-fedora-40-x86_64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1477,7 +1477,7 @@ generate-ostree-build-config-fedora-41-aarch64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1499,7 +1499,7 @@ generate-ostree-build-config-fedora-41-x86_64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1521,7 +1521,7 @@ generate-ostree-build-config-rhel-10.0-aarch64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1543,7 +1543,7 @@ generate-ostree-build-config-rhel-10.0-x86_64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1565,7 +1565,7 @@ generate-ostree-build-config-rhel-7.9-x86_64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1587,7 +1587,7 @@ generate-ostree-build-config-rhel-8.10-aarch64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1609,7 +1609,7 @@ generate-ostree-build-config-rhel-8.10-x86_64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1631,7 +1631,7 @@ generate-ostree-build-config-rhel-8.4-aarch64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1653,7 +1653,7 @@ generate-ostree-build-config-rhel-8.4-x86_64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1675,7 +1675,7 @@ generate-ostree-build-config-rhel-8.5-aarch64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1697,7 +1697,7 @@ generate-ostree-build-config-rhel-8.5-x86_64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1719,7 +1719,7 @@ generate-ostree-build-config-rhel-8.6-aarch64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1741,7 +1741,7 @@ generate-ostree-build-config-rhel-8.6-x86_64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1763,7 +1763,7 @@ generate-ostree-build-config-rhel-8.7-aarch64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1785,7 +1785,7 @@ generate-ostree-build-config-rhel-8.7-x86_64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1807,7 +1807,7 @@ generate-ostree-build-config-rhel-8.8-aarch64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1829,7 +1829,7 @@ generate-ostree-build-config-rhel-8.8-x86_64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1851,7 +1851,7 @@ generate-ostree-build-config-rhel-8.9-aarch64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1873,7 +1873,7 @@ generate-ostree-build-config-rhel-8.9-x86_64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1895,7 +1895,7 @@ generate-ostree-build-config-rhel-9.0-aarch64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1917,7 +1917,7 @@ generate-ostree-build-config-rhel-9.0-x86_64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1939,7 +1939,7 @@ generate-ostree-build-config-rhel-9.1-aarch64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1961,7 +1961,7 @@ generate-ostree-build-config-rhel-9.1-x86_64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1983,7 +1983,7 @@ generate-ostree-build-config-rhel-9.2-aarch64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2005,7 +2005,7 @@ generate-ostree-build-config-rhel-9.2-x86_64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2027,7 +2027,7 @@ generate-ostree-build-config-rhel-9.3-aarch64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2049,7 +2049,7 @@ generate-ostree-build-config-rhel-9.3-x86_64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2071,7 +2071,7 @@ generate-ostree-build-config-rhel-9.4-aarch64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2093,7 +2093,7 @@ generate-ostree-build-config-rhel-9.4-x86_64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2115,7 +2115,7 @@ generate-ostree-build-config-rhel-9.5-aarch64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2137,7 +2137,7 @@ generate-ostree-build-config-rhel-9.5-x86_64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2159,7 +2159,7 @@ generate-ostree-build-config-rhel-9.6-aarch64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-aarch64
+    RUNNER: aws/fedora-41-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2181,7 +2181,7 @@ generate-ostree-build-config-rhel-9.6-x86_64:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2652,7 +2652,7 @@ generate-manifests-centos-10-ppc64le:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2671,7 +2671,7 @@ generate-manifests-centos-10-s390x:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2690,7 +2690,7 @@ generate-manifests-centos-9-ppc64le:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2709,7 +2709,7 @@ generate-manifests-centos-9-s390x:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2728,7 +2728,7 @@ generate-manifests-fedora-39-ppc64le:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2747,7 +2747,7 @@ generate-manifests-fedora-39-s390x:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2766,7 +2766,7 @@ generate-manifests-fedora-40-ppc64le:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2785,7 +2785,7 @@ generate-manifests-fedora-40-s390x:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2804,7 +2804,7 @@ generate-manifests-fedora-41-ppc64le:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2823,7 +2823,7 @@ generate-manifests-fedora-41-s390x:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2842,7 +2842,7 @@ generate-manifests-rhel-10.0-ppc64le:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2861,7 +2861,7 @@ generate-manifests-rhel-10.0-s390x:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2880,7 +2880,7 @@ generate-manifests-rhel-8.10-ppc64le:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2899,7 +2899,7 @@ generate-manifests-rhel-8.10-s390x:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2918,7 +2918,7 @@ generate-manifests-rhel-8.4-ppc64le:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2937,7 +2937,7 @@ generate-manifests-rhel-8.4-s390x:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2956,7 +2956,7 @@ generate-manifests-rhel-8.5-ppc64le:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2975,7 +2975,7 @@ generate-manifests-rhel-8.5-s390x:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2994,7 +2994,7 @@ generate-manifests-rhel-8.6-ppc64le:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3013,7 +3013,7 @@ generate-manifests-rhel-8.6-s390x:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3032,7 +3032,7 @@ generate-manifests-rhel-8.7-ppc64le:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3051,7 +3051,7 @@ generate-manifests-rhel-8.7-s390x:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3070,7 +3070,7 @@ generate-manifests-rhel-8.8-ppc64le:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3089,7 +3089,7 @@ generate-manifests-rhel-8.8-s390x:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3108,7 +3108,7 @@ generate-manifests-rhel-8.9-ppc64le:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3127,7 +3127,7 @@ generate-manifests-rhel-8.9-s390x:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3146,7 +3146,7 @@ generate-manifests-rhel-9.0-ppc64le:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3165,7 +3165,7 @@ generate-manifests-rhel-9.0-s390x:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3184,7 +3184,7 @@ generate-manifests-rhel-9.1-ppc64le:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3203,7 +3203,7 @@ generate-manifests-rhel-9.1-s390x:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3222,7 +3222,7 @@ generate-manifests-rhel-9.2-ppc64le:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3241,7 +3241,7 @@ generate-manifests-rhel-9.2-s390x:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3260,7 +3260,7 @@ generate-manifests-rhel-9.3-ppc64le:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3279,7 +3279,7 @@ generate-manifests-rhel-9.3-s390x:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3298,7 +3298,7 @@ generate-manifests-rhel-9.4-ppc64le:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3317,7 +3317,7 @@ generate-manifests-rhel-9.4-s390x:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3336,7 +3336,7 @@ generate-manifests-rhel-9.5-ppc64le:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3355,7 +3355,7 @@ generate-manifests-rhel-9.5-s390x:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3374,7 +3374,7 @@ generate-manifests-rhel-9.6-ppc64le:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3393,7 +3393,7 @@ generate-manifests-rhel-9.6-s390x:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: aws/fedora-41-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
diff --git a/Schutzfile b/Schutzfile
index 02398958be..fb92c6e4b9 100644
--- a/Schutzfile
+++ b/Schutzfile
@@ -3,7 +3,8 @@
     "rngseed": 1,
     "bootc-image-builder": {
       "ref": "quay.io/centos-bootc/bootc-image-builder@sha256:9893e7209e5f449b86ababfd2ee02a58cca2e5990f77b06c3539227531fc8120"
-    }
+    },
+    "gitlab-ci-runner": "aws/fedora-41"
   },
   "centos-8": {
     "dependencies": {
@@ -113,22 +114,39 @@
     },
     "repos": [
       {
-        "file": "/etc/yum.repos.d/branched.repo",
+        "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-branched-20241101"
+            "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-x86_64-branched-20241101"
+            "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-20241101"
+          }
+        ],
+        "aarch64": [
+          {
+            "title": "updates",
+            "name": "updates",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f41/f41-aarch64-updates-released-20241115"
           }
         ]
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/schutzbot/terraform b/schutzbot/terraform
index c2b82038bd..2ae0b1ea78 100644
--- a/schutzbot/terraform
+++ b/schutzbot/terraform
@@ -1 +1 @@
-b39783c2e634fa0aa0c77d31f9374bc71554db4e
+9c4a3c9573208bf66d8c91a95ee759a39ed0a556
diff --git a/test/scripts/generate-build-config b/test/scripts/generate-build-config
index 0c80c9d924..a217ce1edd 100755
--- a/test/scripts/generate-build-config
+++ b/test/scripts/generate-build-config
@@ -18,7 +18,7 @@ build/{distro}/{arch}/{image_type}/{config_name}:
     - ./test/scripts/upload-results "{distro}" "{image_type}" "{config}"
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-{arch}
+    RUNNER: {runner}-{arch}
     INTERNAL_NETWORK: "{internal}"
 """
 
@@ -66,6 +66,7 @@ def generate_configs(build_requests, pipeline_file):
 
         config_path = os.path.join(testlib.CONFIGS_PATH, config_name+".json")
         pipeline_file.write(JOB_TEMPLATE.format(distro=distro, arch=arch, image_type=image_type,
+                                                runner=testlib.get_common_ci_runner(),
                                                 config_name=config_name, config=config_path,
                                                 internal="true" if "rhel" in distro else "false",
                                                 image_path=image_path))
diff --git a/test/scripts/generate-gitlab-ci b/test/scripts/generate-gitlab-ci
index 733ea5871a..02a21f3f20 100755
--- a/test/scripts/generate-gitlab-ci
+++ b/test/scripts/generate-gitlab-ci
@@ -7,6 +7,7 @@ import imgtestlib as testlib
 
 ARCHITECTURES = ["x86_64", "aarch64"]
 MANIFEST_ONLY_ARCHES = ["ppc64le", "s390x"]
+RUNNER = testlib.get_common_ci_runner()
 
 
 BASE_CONFIG = """---
@@ -36,7 +37,7 @@ check-build-coverage:
   stage: verify
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: {runner}-x86_64
     INTERNAL_NETWORK: "true"
     PYTHONUNBUFFERED: 1
   script:
@@ -70,7 +71,7 @@ generate-build-config-{distro}-{arch}:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-{arch}
+    RUNNER: {runner}-{arch}
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -102,7 +103,7 @@ generate-ostree-build-config-{distro}-{arch}:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-{arch}
+    RUNNER: {runner}-{arch}
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -138,7 +139,7 @@ generate-manifests-{distro}-{arch}:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: {runner}-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -175,10 +176,29 @@ def main():
             continue
 
         combos.add(combo)
-        gen_stage.append(GEN_TEMPLATE.format(distro=img["distro"], arch=img["arch"], cache=cache))
-        trigger_stage.append(TRIGGER_TEMPLATE.format(distro=img["distro"], arch=img["arch"], cache=cache))
-        ostree_gen_stage.append(OSTREE_GEN_TEMPLATE.format(distro=img["distro"], arch=img["arch"], cache=cache))
-        ostree_trigger_stage.append(OSTREE_TRIGGER_TEMPLATE.format(distro=img["distro"], arch=img["arch"], cache=cache))
+        gen_stage.append(GEN_TEMPLATE.format(
+            distro=img["distro"],
+            arch=img["arch"],
+            runner=RUNNER,
+            cache=cache))
+
+        trigger_stage.append(TRIGGER_TEMPLATE.format(
+            distro=img["distro"],
+            arch=img["arch"],
+            runner=RUNNER,
+            cache=cache))
+
+        ostree_gen_stage.append(OSTREE_GEN_TEMPLATE.format(
+            distro=img["distro"],
+            arch=img["arch"],
+            runner=RUNNER,
+            cache=cache))
+
+        ostree_trigger_stage.append(OSTREE_TRIGGER_TEMPLATE.format(
+            distro=img["distro"],
+            arch=img["arch"],
+            runner=RUNNER,
+            cache=cache))
 
     man_only_images = testlib.list_images(arches=MANIFEST_ONLY_ARCHES)
     man_gen_stage = []
@@ -188,10 +208,10 @@ def main():
             continue
 
         combos.add(combo)
-        man_gen_stage.append(MANIFEST_GEN_TEMPLATE.format(distro=img["distro"], arch=img["arch"]))
+        man_gen_stage.append(MANIFEST_GEN_TEMPLATE.format(distro=img["distro"], arch=img["arch"], runner=RUNNER))
 
     with open(config_path, "w", encoding="utf-8") as config_file:
-        config_file.write(BASE_CONFIG)
+        config_file.write(BASE_CONFIG.format(runner=RUNNER))
         config_file.write(testlib.BASE_CONFIG)
         config_file.write("\n".join(gen_stage))
         config_file.write("\n".join(trigger_stage))
diff --git a/test/scripts/generate-ostree-build-config b/test/scripts/generate-ostree-build-config
index e774f6f837..6a97242313 100755
--- a/test/scripts/generate-ostree-build-config
+++ b/test/scripts/generate-ostree-build-config
@@ -20,7 +20,7 @@ build/{distro}/{arch}/{image_type}/{config_name}:
     - ./test/scripts/upload-results "{distro}" "{image_type}" "{config}"
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-{arch}
+    RUNNER: {runner}-{arch}
     INTERNAL_NETWORK: "{internal}"
   needs:
     - pipeline: "$PARENT_PIPELINE_ID"
@@ -312,6 +312,7 @@ def generate_configs(build_requests, container_configs, pipeline_file, configs_d
         run_container_cmd = f"sudo podman run -d --rm -p{container_port}:8080 oci-archive:container.tar"
 
         pipeline_file.write(JOB_TEMPLATE.format(distro=distro, arch=arch, image_type=image_type,
+                                                runner=testlib.get_common_ci_runner(),
                                                 config_name=config_name, config=build_config_path,
                                                 dl_container=dl_container_cmd,
                                                 start_container=run_container_cmd,
diff --git a/test/scripts/imgtestlib.py b/test/scripts/imgtestlib.py
index becc4e6fea..aa17f6e7d6 100644
--- a/test/scripts/imgtestlib.py
+++ b/test/scripts/imgtestlib.py
@@ -497,3 +497,19 @@ def skopeo_inspect_id(image_name: str, arch: str) -> str:
 
     # don't error out, just return an empty string and let the caller handle it
     return ""
+
+
+def get_common_ci_runner():
+    """
+    CI runner for common tasks.
+
+    Currently this is used for all gitlab CI jobs. In the future, we might switch to running build jobs on the same host
+    distro as the target image, but this CI runner will still be used for generic tasks like check-build-coverage.
+    """
+    with open(SCHUTZFILE, encoding="utf-8") as schutzfile:
+        data = json.load(schutzfile)
+
+    if (runner := data.get("common", {}).get("gitlab-ci-runner")) is None:
+        raise KeyError(f"gitlab-ci-runner not defined in {SCHUTZFILE}")
+
+    return runner