diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 64e2ace7fb..7aa23e0a56 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -221,6 +221,44 @@ generate-build-config-fedora-40-x86_64:
       - .cache/osbuild-images
 
 
+generate-build-config-fedora-41-aarch64:
+  stage: gen
+  extends: .terraform
+  variables:
+    RUNNER: aws/fedora-40-aarch64
+    INTERNAL_NETWORK: "true"
+  script:
+    - sudo ./test/scripts/setup-osbuild-repo
+    - sudo ./test/scripts/install-dependencies
+    - ./test/scripts/generate-build-config --distro fedora-41 --arch aarch64 build-config.yml
+  artifacts:
+    paths:
+      - build-config.yml
+  cache:
+    key: testcache
+    paths:
+      - .cache/osbuild-images
+
+
+generate-build-config-fedora-41-x86_64:
+  stage: gen
+  extends: .terraform
+  variables:
+    RUNNER: aws/fedora-40-x86_64
+    INTERNAL_NETWORK: "true"
+  script:
+    - sudo ./test/scripts/setup-osbuild-repo
+    - sudo ./test/scripts/install-dependencies
+    - ./test/scripts/generate-build-config --distro fedora-41 --arch x86_64 build-config.yml
+  artifacts:
+    paths:
+      - build-config.yml
+  cache:
+    key: testcache
+    paths:
+      - .cache/osbuild-images
+
+
 generate-build-config-rhel-10.0-aarch64:
   stage: gen
   extends: .terraform
@@ -859,6 +897,28 @@ image-build-trigger-fedora-40-x86_64:
     - generate-build-config-fedora-40-x86_64
 
 
+image-build-trigger-fedora-41-aarch64:
+  stage: build
+  trigger:
+    include:
+      - artifact: build-config.yml
+        job: generate-build-config-fedora-41-aarch64
+    strategy: depend
+  needs:
+    - generate-build-config-fedora-41-aarch64
+
+
+image-build-trigger-fedora-41-x86_64:
+  stage: build
+  trigger:
+    include:
+      - artifact: build-config.yml
+        job: generate-build-config-fedora-41-x86_64
+    strategy: depend
+  needs:
+    - generate-build-config-fedora-41-x86_64
+
+
 image-build-trigger-rhel-10.0-aarch64:
   stage: build
   trigger:
@@ -1353,6 +1413,50 @@ generate-ostree-build-config-fedora-40-x86_64:
       - .cache/osbuild-images
 
 
+generate-ostree-build-config-fedora-41-aarch64:
+  stage: ostree-gen
+  extends: .terraform
+  variables:
+    RUNNER: aws/fedora-40-aarch64
+    INTERNAL_NETWORK: "true"
+  script:
+    - sudo ./test/scripts/setup-osbuild-repo
+    - sudo ./test/scripts/install-dependencies
+    - ./test/scripts/generate-ostree-build-config --distro fedora-41 --arch aarch64 build-config.yml build-configs
+  artifacts:
+    paths:
+      - build-config.yml
+      - build-configs
+  needs:
+    - image-build-trigger-fedora-41-aarch64
+  cache:
+    key: testcache
+    paths:
+      - .cache/osbuild-images
+
+
+generate-ostree-build-config-fedora-41-x86_64:
+  stage: ostree-gen
+  extends: .terraform
+  variables:
+    RUNNER: aws/fedora-40-x86_64
+    INTERNAL_NETWORK: "true"
+  script:
+    - sudo ./test/scripts/setup-osbuild-repo
+    - sudo ./test/scripts/install-dependencies
+    - ./test/scripts/generate-ostree-build-config --distro fedora-41 --arch x86_64 build-config.yml build-configs
+  artifacts:
+    paths:
+      - build-config.yml
+      - build-configs
+  needs:
+    - image-build-trigger-fedora-41-x86_64
+  cache:
+    key: testcache
+    paths:
+      - .cache/osbuild-images
+
+
 generate-ostree-build-config-rhel-10.0-aarch64:
   stage: ostree-gen
   extends: .terraform
@@ -2078,6 +2182,28 @@ image-build-ostree-trigger-fedora-40-x86_64:
     - generate-ostree-build-config-fedora-40-x86_64
 
 
+image-build-ostree-trigger-fedora-41-aarch64:
+  stage: ostree-build
+  trigger:
+    include:
+      - artifact: build-config.yml
+        job: generate-ostree-build-config-fedora-41-aarch64
+    strategy: depend
+  needs:
+    - generate-ostree-build-config-fedora-41-aarch64
+
+
+image-build-ostree-trigger-fedora-41-x86_64:
+  stage: ostree-build
+  trigger:
+    include:
+      - artifact: build-config.yml
+        job: generate-ostree-build-config-fedora-41-x86_64
+    strategy: depend
+  needs:
+    - generate-ostree-build-config-fedora-41-x86_64
+
+
 image-build-ostree-trigger-rhel-10.0-aarch64:
   stage: ostree-build
   trigger:
@@ -2548,6 +2674,44 @@ generate-manifests-fedora-40-s390x:
       done
 
 
+generate-manifests-fedora-41-ppc64le:
+  stage: gen
+  extends: .terraform
+  variables:
+    RUNNER: aws/fedora-40-x86_64
+    INTERNAL_NETWORK: "true"
+  script:
+    - sudo ./test/scripts/setup-osbuild-repo
+    - sudo ./test/scripts/install-dependencies
+    - go run ./cmd/gen-manifests --arches ppc64le --distros fedora-41 --workers 10 --metadata=false --output ./manifests
+    - for manifest in ./manifests/*; do
+        if osbuild --inspect $manifest > output; then
+          echo "$manifest OK";
+        else
+          cat output;
+        fi;
+      done
+
+
+generate-manifests-fedora-41-s390x:
+  stage: gen
+  extends: .terraform
+  variables:
+    RUNNER: aws/fedora-40-x86_64
+    INTERNAL_NETWORK: "true"
+  script:
+    - sudo ./test/scripts/setup-osbuild-repo
+    - sudo ./test/scripts/install-dependencies
+    - go run ./cmd/gen-manifests --arches s390x --distros fedora-41 --workers 10 --metadata=false --output ./manifests
+    - for manifest in ./manifests/*; do
+        if osbuild --inspect $manifest > output; then
+          echo "$manifest OK";
+        else
+          cat output;
+        fi;
+      done
+
+
 generate-manifests-rhel-10.0-ppc64le:
   stage: gen
   extends: .terraform