diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c871064..9c77e8b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,7 +33,7 @@ jobs:
         os:
           - fedora-kmods
         version:
-          - 39
+          - 40
 
     steps:
       - name: Checkout repository
@@ -69,7 +69,7 @@ jobs:
           - fedora-custom
           - fedora-silverblue
         version:
-          - 39
+          - 40
 
     container:
       image: quay.io/fedora/fedora-minimal:${{ matrix.version }}
diff --git a/Containerfile.fedora-kmods b/Containerfile.fedora-kmods
index fb83b07..13f3c98 100644
--- a/Containerfile.fedora-kmods
+++ b/Containerfile.fedora-kmods
@@ -1,4 +1,4 @@
-ARG FEDORA_VERSION=${FEDORA_VERSION:-39}
+ARG FEDORA_VERSION=${FEDORA_VERSION:-40}
 
 FROM quay.io/fedora/fedora-minimal:${FEDORA_VERSION} AS build
 
diff --git a/fedora-custom.yaml b/fedora-custom.yaml
index ffe10b0..6e55ad4 100644
--- a/fedora-custom.yaml
+++ b/fedora-custom.yaml
@@ -1,18 +1,18 @@
 ---
-releasever: 39
+releasever: 40
 basearch: x86_64
 
 repos:
   - fedora
   - fedora-updates
-  # - fedora-updates-testing  # remove after fedora 39 stable launch
+  # - fedora-updates-testing  # remove after stable launch
   - fedora-cisco-openh264
   - rpmfusion-free
   - rpmfusion-free-updates
-  # - rpmfusion-free-updates-testing  # remove after fedora 39 stable launch
+  # - rpmfusion-free-updates-testing  # remove after stable launch
   - rpmfusion-nonfree
   - rpmfusion-nonfree-updates
-  # - rpmfusion-nonfree-updates-testing  # remove after fedora 39 stable launch
+  # - rpmfusion-nonfree-updates-testing  # remove after stable launch
   - tailscale-stable
 
 recommends: true
diff --git a/fedora-minimal.yaml b/fedora-minimal.yaml
index f43f354..8c31649 100644
--- a/fedora-minimal.yaml
+++ b/fedora-minimal.yaml
@@ -1,5 +1,5 @@
 ---
-releasever: 39
+releasever: 40
 basearch: x86_64
 
 repos:
diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml
index cbd0db2..e8202ff 100644
--- a/fedora-silverblue.yaml
+++ b/fedora-silverblue.yaml
@@ -1,9 +1,9 @@
 ---
-automatic-version-prefix: "39"
+automatic-version-prefix: "40"
 basearch: x86_64
-mutate-os-release: "39"
-ref: fedora/39/x86_64/silverblue
-releasever: 39
+mutate-os-release: "40"
+ref: fedora/40/x86_64/silverblue
+releasever: 40
 
 repos:
   - fedora