diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d1a176cd22..7c9098534e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -162,16 +162,16 @@ stages:
 
 # Fedora
 
-.tsan-fedora-39-amd64: &tsan_fedora_39_amd64_image
-  image: "$CI_REGISTRY_IMAGE:tsan-fedora-39-amd64"
+.tsan-fedora-40-amd64: &tsan_fedora_40_amd64_image
+  image: "$CI_REGISTRY_IMAGE:tsan-fedora-40-amd64"
   <<: *linux_amd64
 
-.fedora-39-amd64: &fedora_39_amd64_image
-  image: "$CI_REGISTRY_IMAGE:fedora-39-amd64"
+.fedora-40-amd64: &fedora_40_amd64_image
+  image: "$CI_REGISTRY_IMAGE:fedora-40-amd64"
   <<: *linux_amd64
 
-.fedora-39-arm64: &fedora_39_arm64_image
-  image: "$CI_REGISTRY_IMAGE:fedora-39-arm64"
+.fedora-40-arm64: &fedora_40_arm64_image
+  image: "$CI_REGISTRY_IMAGE:fedora-40-arm64"
   <<: *linux_arm64
 
 # Ubuntu
@@ -1131,7 +1131,7 @@ unit:gcc:noble:amd64:
     - job: gcc:noble:amd64
       artifacts: true
 
-# Jobs for ASAN builds on Fedora 39 (amd64)
+# Jobs for ASAN builds on Fedora 40 (amd64)
 
 gcc:asan:
   variables:
@@ -1139,20 +1139,20 @@ gcc:asan:
     CFLAGS: "${CFLAGS_COMMON} -fsanitize=address,undefined"
     LDFLAGS: "-fsanitize=address,undefined"
     EXTRA_CONFIGURE: "--with-libidn2 --without-jemalloc"
-  <<: *fedora_39_amd64_image
+  <<: *fedora_40_amd64_image
   <<: *build_job
 
 system:gcc:asan:
   variables:
     LSAN_OPTIONS: "suppressions=$CI_PROJECT_DIR/suppr-lsan.txt"
-  <<: *fedora_39_amd64_image
+  <<: *fedora_40_amd64_image
   <<: *system_test_job
   needs:
     - job: gcc:asan
       artifacts: true
 
 unit:gcc:asan:
-  <<: *fedora_39_amd64_image
+  <<: *fedora_40_amd64_image
   <<: *unit_test_job
   needs:
     - job: gcc:asan
@@ -1181,7 +1181,7 @@ unit:clang:asan:
     - job: clang:asan
       artifacts: true
 
-# Jobs for TSAN builds on Fedora 39 (amd64)
+# Jobs for TSAN builds on Fedora 40 (amd64)
 
 gcc:tsan:
   variables:
@@ -1189,13 +1189,13 @@ gcc:tsan:
     CFLAGS: "${CFLAGS_COMMON} -fsanitize=thread"
     LDFLAGS: "-fsanitize=thread"
     EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock --without-jemalloc"
-  <<: *tsan_fedora_39_amd64_image
+  <<: *tsan_fedora_40_amd64_image
   <<: *build_job
 
 system:gcc:tsan:
   variables:
     TSAN_OPTIONS: "${TSAN_OPTIONS_FEDORA}"
-  <<: *tsan_fedora_39_amd64_image
+  <<: *tsan_fedora_40_amd64_image
   <<: *system_test_tsan_job
   needs:
     - job: gcc:tsan
@@ -1204,7 +1204,7 @@ system:gcc:tsan:
 unit:gcc:tsan:
   variables:
     TSAN_OPTIONS: "${TSAN_OPTIONS_FEDORA}"
-  <<: *tsan_fedora_39_amd64_image
+  <<: *tsan_fedora_40_amd64_image
   <<: *unit_test_tsan_job
   needs:
     - job: gcc:tsan
@@ -1625,8 +1625,8 @@ shotgun:dot:
   only:
     - merge_requests
 
-stress:short:authoritative:fedora:39:amd64:
-  <<: *fedora_39_amd64_image
+stress:short:authoritative:fedora:40:amd64:
+  <<: *fedora_40_amd64_image
   <<: *linux_amd64
   <<: *stress_test_short_job
   variables:
@@ -1637,8 +1637,8 @@ stress:short:authoritative:fedora:39:amd64:
     RATE: 10000
     RUN_TIME: 15
 
-stress:short:recursive:fedora:39:amd64:
-  <<: *fedora_39_amd64_image
+stress:short:recursive:fedora:40:amd64:
+  <<: *fedora_40_amd64_image
   <<: *linux_amd64
   <<: *stress_test_short_job
   variables:
@@ -1649,8 +1649,8 @@ stress:short:recursive:fedora:39:amd64:
     RATE: 10000
     RUN_TIME: 15
 
-stress:short:rpz:fedora:39:amd64:
-  <<: *fedora_39_amd64_image
+stress:short:rpz:fedora:40:amd64:
+  <<: *fedora_40_amd64_image
   <<: *linux_amd64
   <<: *stress_test_short_job
   variables:
@@ -1661,8 +1661,8 @@ stress:short:rpz:fedora:39:amd64:
     RATE: 1500
     RUN_TIME: 15
 
-stress:short:authoritative:fedora:39:arm64:
-  <<: *fedora_39_arm64_image
+stress:short:authoritative:fedora:40:arm64:
+  <<: *fedora_40_arm64_image
   <<: *linux_arm64
   <<: *stress_test_short_job
   variables:
@@ -1673,8 +1673,8 @@ stress:short:authoritative:fedora:39:arm64:
     RATE: 10000
     RUN_TIME: 15
 
-stress:short:recursive:fedora:39:arm64:
-  <<: *fedora_39_arm64_image
+stress:short:recursive:fedora:40:arm64:
+  <<: *fedora_40_arm64_image
   <<: *linux_arm64
   <<: *stress_test_short_job
   variables:
@@ -1685,8 +1685,8 @@ stress:short:recursive:fedora:39:arm64:
     RATE: 10000
     RUN_TIME: 15
 
-stress:short:rpz:fedora:39:arm64:
-  <<: *fedora_39_arm64_image
+stress:short:rpz:fedora:40:arm64:
+  <<: *fedora_40_arm64_image
   <<: *linux_arm64
   <<: *stress_test_short_job
   variables:
@@ -1738,8 +1738,8 @@ stress:short:rpz:freebsd13:amd64:
     when: always
   timeout: 2h
 
-stress:authoritative:fedora:39:amd64:
-  <<: *fedora_39_amd64_image
+stress:authoritative:fedora:40:amd64:
+  <<: *fedora_40_amd64_image
   <<: *linux_amd64
   <<: *stress_test_long_job
   variables:
@@ -1753,8 +1753,8 @@ stress:authoritative:fedora:39:amd64:
     variables:
       - $CI_COMMIT_TAG || ($BIND_STRESS_TEST_OS =~ /linux/i && $BIND_STRESS_TEST_MODE =~ /authoritative/i && $BIND_STRESS_TEST_ARCH =~ /amd64/i)
 
-stress:recursive:fedora:39:amd64:
-  <<: *fedora_39_amd64_image
+stress:recursive:fedora:40:amd64:
+  <<: *fedora_40_amd64_image
   <<: *linux_amd64
   <<: *stress_test_long_job
   variables:
@@ -1768,8 +1768,8 @@ stress:recursive:fedora:39:amd64:
     variables:
       - $CI_COMMIT_TAG || ($BIND_STRESS_TEST_OS =~ /linux/i && $BIND_STRESS_TEST_MODE =~ /recursive/i && $BIND_STRESS_TEST_ARCH =~ /amd64/i)
 
-stress:rpz:fedora:39:amd64:
-  <<: *fedora_39_amd64_image
+stress:rpz:fedora:40:amd64:
+  <<: *fedora_40_amd64_image
   <<: *linux_amd64
   <<: *stress_test_long_job
   variables:
@@ -1783,8 +1783,8 @@ stress:rpz:fedora:39:amd64:
     variables:
       - $CI_COMMIT_TAG || ($BIND_STRESS_TEST_OS =~ /linux/i && $BIND_STRESS_TEST_MODE =~ /rpz/i && $BIND_STRESS_TEST_ARCH =~ /amd64/i)
 
-stress:authoritative:fedora:39:arm64:
-  <<: *fedora_39_arm64_image
+stress:authoritative:fedora:40:arm64:
+  <<: *fedora_40_arm64_image
   <<: *linux_arm64
   <<: *stress_test_long_job
   variables:
@@ -1798,8 +1798,8 @@ stress:authoritative:fedora:39:arm64:
     variables:
       - $CI_COMMIT_TAG || ($BIND_STRESS_TEST_OS =~ /linux/i && $BIND_STRESS_TEST_MODE =~ /authoritative/i && $BIND_STRESS_TEST_ARCH =~ /arm64/i)
 
-stress:recursive:fedora:39:arm64:
-  <<: *fedora_39_arm64_image
+stress:recursive:fedora:40:arm64:
+  <<: *fedora_40_arm64_image
   <<: *linux_arm64
   <<: *stress_test_long_job
   variables:
@@ -1813,8 +1813,8 @@ stress:recursive:fedora:39:arm64:
     variables:
       - $CI_COMMIT_TAG || ($BIND_STRESS_TEST_OS =~ /linux/i && $BIND_STRESS_TEST_MODE =~ /recursive/i && $BIND_STRESS_TEST_ARCH =~ /arm64/i)
 
-stress:rpz:fedora:39:arm64:
-  <<: *fedora_39_arm64_image
+stress:rpz:fedora:40:arm64:
+  <<: *fedora_40_arm64_image
   <<: *linux_arm64
   <<: *stress_test_long_job
   variables:
diff --git a/doc/arm/platforms.inc.rst b/doc/arm/platforms.inc.rst
index 744567a5c8..685ecb1388 100644
--- a/doc/arm/platforms.inc.rst
+++ b/doc/arm/platforms.inc.rst
@@ -47,7 +47,7 @@ following systems:
 
 -  Debian 11, 12
 -  Ubuntu LTS 20.04, 22.04, 24.04
--  Fedora 39
+-  Fedora 40
 -  Red Hat Enterprise Linux / CentOS / Oracle Linux 7, 8, 9
 -  FreeBSD 13.3, 14.0
 -  Alpine Linux 3.19