diff --git a/.github/workflows/test_cluster.yml b/.github/workflows/test_cluster.yml
index 61bf3ea..fd17a08 100644
--- a/.github/workflows/test_cluster.yml
+++ b/.github/workflows/test_cluster.yml
@@ -35,16 +35,14 @@ jobs:
       fail-fast: false
       matrix:
         distro:
-          # - ubuntu-18.04
           - ubuntu-20.04
           - ubuntu-22.04
+          - ubuntu-24.04
           - debian-11
           - debian-12
           - fedora-40
           - fedora-41
-          # - almalinux-8
           - almalinux-9
-          # - rockylinux-8
           - rockylinux-9
           - alpine-3.20
           - alpine-3.21
diff --git a/.github/workflows/test_default.yml b/.github/workflows/test_default.yml
index b1cffed..e8db626 100644
--- a/.github/workflows/test_default.yml
+++ b/.github/workflows/test_default.yml
@@ -35,20 +35,16 @@ jobs:
       fail-fast: false
       matrix:
         distro:
-          # - ubuntu-18.04
           - ubuntu-20.04
           - ubuntu-22.04
+          - ubuntu-24.04
           - debian-11
           - debian-12
           - debian-sid
           - fedora-40
           - fedora-41
-          # - almalinux-8
           - almalinux-9
-          # - rockylinux-8
           - rockylinux-9
-          - alpine-3.17
-          - alpine-3.18
           - alpine-3.19
           - alpine-3.20
           - alpine-3.21
diff --git a/.github/workflows/test_mdbf.yml b/.github/workflows/test_mdbf.yml
index dc3c625..c222d68 100644
--- a/.github/workflows/test_mdbf.yml
+++ b/.github/workflows/test_mdbf.yml
@@ -42,12 +42,9 @@ jobs:
           - debian-11
           - debian-12
           - debian-sid
-          - fedora-39
           - fedora-40
-          - fedora-41
-          # - almalinux-8
+          # - fedora-41
           - almalinux-9
-          # - rockylinux-8
           - rockylinux-9
         mariadb-version:
           - "10.5"