diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f8be72676c..1c490d0af1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -175,20 +175,22 @@ stages:
   image: "$CI_REGISTRY_IMAGE:alpine-3.21-amd64"
   <<: *linux_amd64
 
-# Oracle Linux
+# AlmaLinux
 
-.oraclelinux-8-amd64: &oraclelinux_8_amd64_image
-  image: "$CI_REGISTRY_IMAGE:oraclelinux-8-amd64"
+.almalinux-8-amd64: &almalinux_8_amd64_image
+  image: "$CI_REGISTRY_IMAGE:almalinux-8-amd64"
   <<: *linux_amd64
 
+.almalinux-9-amd64: &almalinux_9_amd64_image
+  image: "$CI_REGISTRY_IMAGE:almalinux-9-amd64"
+  <<: *linux_amd64
+
+# Oracle Linux
+
 .oraclelinux-8fips-amd64: &oraclelinux_8fips_amd64_image
   image: "oraclelinux-8fips-x86_64"
   <<: *libvirt_amd64
 
-.oraclelinux-9-amd64: &oraclelinux_9_amd64_image
-  image: "$CI_REGISTRY_IMAGE:oraclelinux-9-amd64"
-  <<: *linux_amd64
-
 .oraclelinux-9fips-amd64: &oraclelinux_9fips_amd64_image
   image: "oraclelinux-9fips-x86_64"
   <<: *libvirt_amd64
@@ -839,54 +841,54 @@ unit:gcc:alpine3.21:amd64:
     - job: gcc:alpine3.21:amd64
       artifacts: true
 
-# Jobs for regular GCC builds on Oracle Linux 8 (amd64)
+# Jobs for regular GCC builds on Alma Linux 8 (amd64)
 
-gcc:oraclelinux8:amd64:
+gcc:almalinux8:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON}"
     EXTRA_CONFIGURE: "--with-libidn2"
-  <<: *oraclelinux_8_amd64_image
+  <<: *almalinux_8_amd64_image
   <<: *build_job
 
-system:gcc:oraclelinux8:amd64:
-  <<: *oraclelinux_8_amd64_image
+system:gcc:almalinux8:amd64:
+  <<: *almalinux_8_amd64_image
   <<: *system_test_job
   <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
   needs:
-    - job: gcc:oraclelinux8:amd64
+    - job: gcc:almalinux8:amd64
       artifacts: true
 
-unit:gcc:oraclelinux8:amd64:
-  <<: *oraclelinux_8_amd64_image
+unit:gcc:almalinux8:amd64:
+  <<: *almalinux_8_amd64_image
   <<: *unit_test_job
   <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
   needs:
-    - job: gcc:oraclelinux8:amd64
+    - job: gcc:almalinux8:amd64
       artifacts: true
 
-# Jobs for regular GCC builds on Oracle Linux 9 (amd64)
+# Jobs for regular GCC builds on Alma Linux 9 (amd64)
 
-gcc:oraclelinux9:amd64:
+gcc:almalinux9:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON}"
     EXTRA_CONFIGURE: "--with-libidn2 --disable-developer"
-  <<: *oraclelinux_9_amd64_image
+  <<: *almalinux_9_amd64_image
   <<: *build_job
 
-system:gcc:oraclelinux9:amd64:
-  <<: *oraclelinux_9_amd64_image
+system:gcc:almalinux9:amd64:
+  <<: *almalinux_9_amd64_image
   <<: *system_test_job
   needs:
-    - job: gcc:oraclelinux9:amd64
+    - job: gcc:almalinux9:amd64
       artifacts: true
 
-unit:gcc:oraclelinux9:amd64:
-  <<: *oraclelinux_9_amd64_image
+unit:gcc:almalinux9:amd64:
+  <<: *almalinux_9_amd64_image
   <<: *unit_test_job
   needs:
-    - job: gcc:oraclelinux9:amd64
+    - job: gcc:almalinux9:amd64
 
 # Jobs for scheduled GCC builds on Oracle Linux 8 & 9 FIPS-aware images with
 # FIPS mode in BIND 9 enabled
@@ -943,7 +945,7 @@ gcc:tarball:nosphinx:
     CFLAGS: "${CFLAGS_COMMON}"
     EXTRA_CONFIGURE: "--with-libidn2 --disable-developer"
     RUN_MAKE_INSTALL: 1
-  <<: *oraclelinux_9_amd64_image
+  <<: *almalinux_9_amd64_image
   <<: *build_job
   before_script:
     - (! command -v sphinx-build >/dev/null)
diff --git a/doc/arm/platforms.inc.rst b/doc/arm/platforms.inc.rst
index 66c2376290..c02a37dc32 100644
--- a/doc/arm/platforms.inc.rst
+++ b/doc/arm/platforms.inc.rst
@@ -46,7 +46,7 @@ following systems:
 -  Debian 12
 -  Ubuntu LTS 22.04, 24.04
 -  Fedora 42
--  Red Hat Enterprise Linux / CentOS / Oracle Linux 8, 9
+-  Red Hat Enterprise Linux / CentOS / Oracle Linux / AlmaLinux 8, 9
 -  FreeBSD 13.4, 14.2
 -  Alpine Linux 3.21