diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 709851c566d..8cdd25cbe4e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -92,10 +92,10 @@ RPM:
   parallel:
     matrix:
       - RUNNER:
-          - aws/fedora-38-x86_64
-          - aws/fedora-38-aarch64
           - aws/fedora-39-x86_64
           - aws/fedora-39-aarch64
+          - aws/fedora-40-x86_64
+          - aws/fedora-40-aarch64
           - aws/rhel-8.4-ga-x86_64
           - aws/rhel-8.4-ga-aarch64
           - aws/rhel-8.9-ga-x86_64
@@ -175,8 +175,6 @@ Base:
   parallel:
     matrix:
       - RUNNER:
-          - aws/fedora-38-x86_64
-          - aws/fedora-38-aarch64
           - aws/fedora-39-x86_64
           - aws/fedora-39-aarch64
           - aws/rhel-8.4-ga-x86_64
@@ -204,8 +202,6 @@ Base:
   parallel:
     matrix:
       - RUNNER:
-          - aws/fedora-38-x86_64
-          - aws/fedora-38-aarch64
           - aws/fedora-39-x86_64
           - aws/fedora-39-aarch64
       - RUNNER:
@@ -340,7 +336,6 @@ Trigger-rhel-edge-ci:
 
 .fedora_runners: &fedora_runners
     RUNNER:
-      - aws/fedora-38-x86_64
       - aws/fedora-39-x86_64
 
 .integration_fedora:
@@ -479,9 +474,7 @@ filesystem.sh:
   parallel:
     matrix:
     - RUNNER:
-      # don't execute on fedora-39 yet until https://lkml.kernel.org/linux-xfs/20230823220225.3591135-1-david@fromorbit.com/#t is in the kernel
-      # see also https://github.com/osbuild/osbuild-composer/pull/3820#issuecomment-1881587335 for more details
-      - aws/fedora-38-x86_64
+      - aws/fedora-40-x86_64
     - *rhel_runners
 
   variables:
@@ -523,7 +516,6 @@ API:
         INTERNAL_NETWORK: ["true"]
       - IMAGE_TYPE: ["iot-commit"]
         RUNNER:
-          - aws/fedora-38-x86_64
           - aws/fedora-39-x86_64
       - IMAGE_TYPE: ["iot-bootable-container"]
         RUNNER:
@@ -573,8 +565,7 @@ API-module-hotfixes:
   parallel:
     matrix:
       - RUNNER:
-          - rhos-01/fedora-38-x86_64
-          # - rhos-01/fedora-39-x86_64
+          - rhos-01/fedora-40-x86_64
       - RUNNER:
           - gcp/rhel-8.9-ga-x86_64
           - gcp/rhel-9.3-ga-x86_64
@@ -728,7 +719,6 @@ ContainerUpload:
   parallel:
     matrix:
       - RUNNER:
-          - aws/fedora-38-x86_64
           - aws/fedora-39-x86_64
 
 ContainerEmbedding:
diff --git a/schutzbot/terraform b/schutzbot/terraform
index 3b2e23226b9..b56076f0282 100644
--- a/schutzbot/terraform
+++ b/schutzbot/terraform
@@ -1 +1 @@
-86cb482645e99849de51a067b4af02fa9aca54a8
+445f5effb0cd29f2b0610bcec88acc22475f6326