diff --git a/.github/workflows/test_cluster_mdbf.yml b/.github/workflows/test_cluster_mdbf.yml
index da0ac33..2486d03 100644
--- a/.github/workflows/test_cluster_mdbf.yml
+++ b/.github/workflows/test_cluster_mdbf.yml
@@ -33,6 +33,7 @@ jobs:
       fail-fast: false
       matrix:
         distro:
+          - ubuntu-22.04
           - ubuntu-23.04
           - debian-12
           - fedora-38
@@ -48,6 +49,27 @@ jobs:
           - "11.0"
           - "11.1"
           - "11.2"
+        exclude:
+          - distro: ubuntu-23.04
+            mariadb-version: 10.6
+          - distro: ubuntu-23.04
+            mariadb-version: 10.7
+          - distro: ubuntu-23.04
+            mariadb-version: 10.8
+          - distro: ubuntu-23.04
+            mariadb-version: 10.9
+          - distro: ubuntu-23.04
+            mariadb-version: 10.10
+          - distro: debian-12
+            mariadb-version: 10.6
+          - distro: debian-12
+            mariadb-version: 10.7
+          - distro: debian-12
+            mariadb-version: 10.8
+          - distro: debian-12
+            mariadb-version: 10.9
+          - distro: debian-12
+            mariadb-version: 10.10
     steps:
       - uses: actions/checkout@v4
       - name: Install requirements
diff --git a/.github/workflows/test_mdbf.yml b/.github/workflows/test_mdbf.yml
index 1fd3d92..130cbb2 100644
--- a/.github/workflows/test_mdbf.yml
+++ b/.github/workflows/test_mdbf.yml
@@ -68,6 +68,16 @@ jobs:
             mariadb-version: 10.4
           - distro: ubuntu-23.04
             mariadb-version: 10.5
+          - distro: ubuntu-23.04
+            mariadb-version: 10.6
+          - distro: ubuntu-23.04
+            mariadb-version: 10.7
+          - distro: ubuntu-23.04
+            mariadb-version: 10.8
+          - distro: ubuntu-23.04
+            mariadb-version: 10.9
+          - distro: ubuntu-23.04
+            mariadb-version: 10.10
           - distro: debian-11
             mariadb-version: 10.4
           - distro: debian-12
@@ -76,6 +86,14 @@ jobs:
             mariadb-version: 10.5
           - distro: debian-12
             mariadb-version: 10.6
+          - distro: debian-12
+            mariadb-version: 10.7
+          - distro: debian-12
+            mariadb-version: 10.8
+          - distro: debian-12
+            mariadb-version: 10.9
+          - distro: debian-12
+            mariadb-version: 10.10
           - distro: debian-sid
             mariadb-version: 10.4
           - distro: debian-sid
@@ -88,6 +106,8 @@ jobs:
             mariadb-version: 10.4
           - distro: fedora-38
             mariadb-version: 10.5
+          - distro: fedora-38
+            mariadb-version: 10.7
           - distro: almalinux-9
             mariadb-version: 10.4
           - distro: rockylinux-9