diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 706781a929..7943a67b0b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -181,44 +181,6 @@ generate-build-config-centos-9-x86_64:
       - .cache/osbuild-images
 
 
-generate-build-config-fedora-38-aarch64:
-  stage: gen
-  extends: .terraform
-  variables:
-    RUNNER: aws/fedora-39-aarch64
-    INTERNAL_NETWORK: "true"
-  script:
-    - sudo ./test/scripts/setup-osbuild-repo
-    - sudo ./test/scripts/install-dependencies
-    - ./test/scripts/generate-build-config --distro fedora-38 --arch aarch64 build-config.yml
-  artifacts:
-    paths:
-      - build-config.yml
-  cache:
-    key: testcache
-    paths:
-      - .cache/osbuild-images
-
-
-generate-build-config-fedora-38-x86_64:
-  stage: gen
-  extends: .terraform
-  variables:
-    RUNNER: aws/fedora-39-x86_64
-    INTERNAL_NETWORK: "true"
-  script:
-    - sudo ./test/scripts/setup-osbuild-repo
-    - sudo ./test/scripts/install-dependencies
-    - ./test/scripts/generate-build-config --distro fedora-38 --arch x86_64 build-config.yml
-  artifacts:
-    paths:
-      - build-config.yml
-  cache:
-    key: testcache
-    paths:
-      - .cache/osbuild-images
-
-
 generate-build-config-fedora-39-aarch64:
   stage: gen
   extends: .terraform
@@ -873,28 +835,6 @@ image-build-trigger-centos-9-x86_64:
     - generate-build-config-centos-9-x86_64
 
 
-image-build-trigger-fedora-38-aarch64:
-  stage: build
-  trigger:
-    include:
-      - artifact: build-config.yml
-        job: generate-build-config-fedora-38-aarch64
-    strategy: depend
-  needs:
-    - generate-build-config-fedora-38-aarch64
-
-
-image-build-trigger-fedora-38-x86_64:
-  stage: build
-  trigger:
-    include:
-      - artifact: build-config.yml
-        job: generate-build-config-fedora-38-x86_64
-    strategy: depend
-  needs:
-    - generate-build-config-fedora-38-x86_64
-
-
 image-build-trigger-fedora-39-aarch64:
   stage: build
   trigger:
@@ -1367,50 +1307,6 @@ generate-ostree-build-config-centos-9-x86_64:
       - .cache/osbuild-images
 
 
-generate-ostree-build-config-fedora-38-aarch64:
-  stage: ostree-gen
-  extends: .terraform
-  variables:
-    RUNNER: aws/fedora-39-aarch64
-    INTERNAL_NETWORK: "true"
-  script:
-    - sudo ./test/scripts/setup-osbuild-repo
-    - sudo ./test/scripts/install-dependencies
-    - ./test/scripts/generate-ostree-build-config --distro fedora-38 --arch aarch64 build-config.yml build-configs
-  artifacts:
-    paths:
-      - build-config.yml
-      - build-configs
-  needs:
-    - image-build-trigger-fedora-38-aarch64
-  cache:
-    key: testcache
-    paths:
-      - .cache/osbuild-images
-
-
-generate-ostree-build-config-fedora-38-x86_64:
-  stage: ostree-gen
-  extends: .terraform
-  variables:
-    RUNNER: aws/fedora-39-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-38 --arch x86_64 build-config.yml build-configs
-  artifacts:
-    paths:
-      - build-config.yml
-      - build-configs
-  needs:
-    - image-build-trigger-fedora-38-x86_64
-  cache:
-    key: testcache
-    paths:
-      - .cache/osbuild-images
-
-
 generate-ostree-build-config-fedora-39-aarch64:
   stage: ostree-gen
   extends: .terraform
@@ -2158,28 +2054,6 @@ image-build-ostree-trigger-centos-9-x86_64:
     - generate-ostree-build-config-centos-9-x86_64
 
 
-image-build-ostree-trigger-fedora-38-aarch64:
-  stage: ostree-build
-  trigger:
-    include:
-      - artifact: build-config.yml
-        job: generate-ostree-build-config-fedora-38-aarch64
-    strategy: depend
-  needs:
-    - generate-ostree-build-config-fedora-38-aarch64
-
-
-image-build-ostree-trigger-fedora-38-x86_64:
-  stage: ostree-build
-  trigger:
-    include:
-      - artifact: build-config.yml
-        job: generate-ostree-build-config-fedora-38-x86_64
-    strategy: depend
-  needs:
-    - generate-ostree-build-config-fedora-38-x86_64
-
-
 image-build-ostree-trigger-fedora-39-aarch64:
   stage: ostree-build
   trigger:
@@ -2615,44 +2489,6 @@ generate-manifests-centos-9-s390x:
       done
 
 
-generate-manifests-fedora-38-ppc64le:
-  stage: gen
-  extends: .terraform
-  variables:
-    RUNNER: aws/fedora-39-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-38 --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-38-s390x:
-  stage: gen
-  extends: .terraform
-  variables:
-    RUNNER: aws/fedora-39-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-38 --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-39-ppc64le:
   stage: gen
   extends: .terraform