diff --git a/.branch-variables.yml b/.branch-variables.yml
index 143a332c917..6e7f3a71da7 100644
--- a/.branch-variables.yml
+++ b/.branch-variables.yml
@@ -10,5 +10,5 @@ distro_name: "fedora" # "fedora" or "rhel"
 distro_release: "rawhide" # "rawhide" or a number without quotation marks
 
 # The following only applies for rawhide.
-branched_fedora_version: # number without quotation marks, or nothing if CI should not run for branched Fedora
-rawhide_fedora_version: 39 # ditto
+branched_fedora_version: 39 # number without quotation marks, or nothing if CI should not run for branched Fedora
+rawhide_fedora_version: 40 # ditto
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 8c450ef75d7..5e20765c699 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -9,7 +9,7 @@
 # See https://github.com/actions/labeler
 
 # Always apply target fedora version to any changes
-f39:
+f40:
 - '**'
 
 webui:
diff --git a/.github/workflows/container-autoupdate-fedora.yml b/.github/workflows/container-autoupdate-fedora.yml
index 22a87677f29..a2201b46435 100644
--- a/.github/workflows/container-autoupdate-fedora.yml
+++ b/.github/workflows/container-autoupdate-fedora.yml
@@ -26,3 +26,9 @@ jobs:
       container-tag: master
       branch: master
 
+  fedora-39:
+    uses: ./.github/workflows/container-rebuild-action.yml
+    secrets: inherit
+    with:
+      container-tag: fedora-39
+      branch: fedora-39
diff --git a/.github/workflows/l10n-po-update.yml b/.github/workflows/l10n-po-update.yml
index d1da70482f2..52ede5cbdc0 100644
--- a/.github/workflows/l10n-po-update.yml
+++ b/.github/workflows/l10n-po-update.yml
@@ -25,7 +25,7 @@ jobs:
       fail-fast: false
       max-parallel: 1
       matrix:
-        branch: ['master']
+        branch: ['master', 'fedora-39']
 
     steps:
       - name: Set up dependencies
diff --git a/.github/workflows/tests-daily.yml b/.github/workflows/tests-daily.yml
index a05acda9f45..df4a2147755 100644
--- a/.github/workflows/tests-daily.yml
+++ b/.github/workflows/tests-daily.yml
@@ -42,7 +42,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        release: ['master']
+        release: ['master', 'fedora-39']
         include:
           - release: 'master'
             target_branch: 'master'
@@ -52,6 +52,9 @@ jobs:
           #  target_branch: 'master'
           #  ci_tag: 'eln'
           #  build-args: '--build-arg=image=quay.io/fedoraci/fedora:eln-x86_64'
+          - release: 'fedora-39'
+            target_branch: 'fedora-39'
+            ci_tag: 'fedora-39'
 
     env:
       CI_TAG: '${{ matrix.ci_tag }}'
@@ -84,11 +87,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        release: ['master']
+        release: ['master', 'fedora-39']
         include:
           - release: 'master'
             target_branch: 'master'
             ci_tag: 'master'
+          - release: 'fedora-39'
+            target_branch: 'fedora-39'
+            ci_tag: 'fedora-39'
 
     env:
       CI_TAG: '${{ matrix.ci_tag }}'
diff --git a/.github/workflows/try-release-daily.yml b/.github/workflows/try-release-daily.yml
index 00ea51f5e8a..5720e8317b1 100644
--- a/.github/workflows/try-release-daily.yml
+++ b/.github/workflows/try-release-daily.yml
@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: ['master', 'rhel-8', 'rhel-9']
+        branch: ['master', 'rhel-8', 'rhel-9', 'fedora-39']
 
     steps:
       - name: Check out repo