diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a273a54386..c37986825f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -142,12 +142,12 @@ stages:
 
 # Fedora
 
-.fedora-36-amd64: &fedora_36_amd64_image
-  image: "$CI_REGISTRY_IMAGE:fedora-36-amd64"
+.fedora-37-amd64: &fedora_37_amd64_image
+  image: "$CI_REGISTRY_IMAGE:fedora-37-amd64"
   <<: *linux_amd64
 
-.fedora-36-arm64: &fedora_36_arm64_image
-  image: "$CI_REGISTRY_IMAGE:fedora-36-arm64"
+.fedora-37-arm64: &fedora_37_arm64_image
+  image: "$CI_REGISTRY_IMAGE:fedora-37-arm64"
   <<: *linux_stress_arm64
 
 # Ubuntu
@@ -929,7 +929,7 @@ unit:gcc:jammy:amd64:
     - job: gcc:jammy:amd64
       artifacts: true
 
-# Jobs for ASAN builds on Fedora 36 (amd64)
+# Jobs for ASAN builds on Fedora 37 (amd64)
 
 gcc:asan:
   variables:
@@ -937,20 +937,20 @@ gcc:asan:
     CFLAGS: "${CFLAGS_COMMON} -fsanitize=address,undefined"
     LDFLAGS: "-fsanitize=address,undefined"
     EXTRA_CONFIGURE: "--with-libidn2 --without-jemalloc"
-  <<: *fedora_36_amd64_image
+  <<: *fedora_37_amd64_image
   <<: *build_job
 
 system:gcc:asan:
   variables:
     LSAN_OPTIONS: "suppressions=$CI_PROJECT_DIR/suppr-lsan.txt"
-  <<: *fedora_36_amd64_image
+  <<: *fedora_37_amd64_image
   <<: *system_test_job
   needs:
     - job: gcc:asan
       artifacts: true
 
 unit:gcc:asan:
-  <<: *fedora_36_amd64_image
+  <<: *fedora_37_amd64_image
   <<: *unit_test_job
   needs:
     - job: gcc:asan
@@ -979,7 +979,7 @@ unit:clang:asan:
     - job: clang:asan
       artifacts: true
 
-# Jobs for TSAN builds on Fedora 36 (amd64)
+# Jobs for TSAN builds on Fedora 37 (amd64)
 
 gcc:tsan:
   variables:
@@ -987,13 +987,13 @@ gcc:tsan:
     CFLAGS: "${CFLAGS_COMMON} -fsanitize=thread"
     LDFLAGS: "-fsanitize=thread"
     EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock --without-jemalloc"
-  <<: *fedora_36_amd64_image
+  <<: *fedora_37_amd64_image
   <<: *build_job
 
 system:gcc:tsan:
   variables:
     TSAN_OPTIONS: "${TSAN_OPTIONS_COMMON} external_symbolizer_path=/usr/bin/llvm-symbolizer"
-  <<: *fedora_36_amd64_image
+  <<: *fedora_37_amd64_image
   <<: *system_test_tsan_job
   needs:
     - job: gcc:tsan
@@ -1002,7 +1002,7 @@ system:gcc:tsan:
 unit:gcc:tsan:
   variables:
     TSAN_OPTIONS: "${TSAN_OPTIONS_COMMON} external_symbolizer_path=/usr/bin/llvm-symbolizer"
-  <<: *fedora_36_amd64_image
+  <<: *fedora_37_amd64_image
   <<: *unit_test_tsan_job
   needs:
     - job: gcc:tsan
@@ -1288,8 +1288,8 @@ respdiff-long-third-party:
     when: always
   timeout: 2h
 
-stress:authoritative:fedora:36:amd64:
-  <<: *fedora_36_amd64_image
+stress:authoritative:fedora:37:amd64:
+  <<: *fedora_37_amd64_image
   <<: *linux_stress_amd64
   <<: *stress_job
   variables:
@@ -1302,8 +1302,8 @@ stress:authoritative:fedora:36: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:36:amd64:
-  <<: *fedora_36_amd64_image
+stress:recursive:fedora:37:amd64:
+  <<: *fedora_37_amd64_image
   <<: *linux_stress_amd64
   <<: *stress_job
   variables:
@@ -1316,8 +1316,8 @@ stress:recursive:fedora:36: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:36:amd64:
-  <<: *fedora_36_amd64_image
+stress:rpz:fedora:37:amd64:
+  <<: *fedora_37_amd64_image
   <<: *linux_stress_amd64
   <<: *stress_job
   variables:
@@ -1330,8 +1330,8 @@ stress:rpz:fedora:36: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:36:arm64:
-  <<: *fedora_36_arm64_image
+stress:authoritative:fedora:37:arm64:
+  <<: *fedora_37_arm64_image
   <<: *linux_stress_arm64
   <<: *stress_job
   variables:
@@ -1344,8 +1344,8 @@ stress:authoritative:fedora:36: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:36:arm64:
-  <<: *fedora_36_arm64_image
+stress:recursive:fedora:37:arm64:
+  <<: *fedora_37_arm64_image
   <<: *linux_stress_arm64
   <<: *stress_job
   variables:
@@ -1358,8 +1358,8 @@ stress:recursive:fedora:36: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:36:arm64:
-  <<: *fedora_36_arm64_image
+stress:rpz:fedora:37:arm64:
+  <<: *fedora_37_arm64_image
   <<: *linux_stress_arm64
   <<: *stress_job
   variables:
diff --git a/doc/arm/platforms.inc.rst b/doc/arm/platforms.inc.rst
index fa01231245..46309d99a5 100644
--- a/doc/arm/platforms.inc.rst
+++ b/doc/arm/platforms.inc.rst
@@ -47,7 +47,7 @@ following systems:
 
 -  Debian 11
 -  Ubuntu LTS 20.04, 22.04
--  Fedora 36
+-  Fedora 37
 -  Red Hat Enterprise Linux / CentOS / Oracle Linux 7, 8, 9
 -  FreeBSD 12.3, 13.1
 -  OpenBSD 7.2