diff --git a/.github/workflows/test_mdbf.yml b/.github/workflows/test_mdbf.yml
index b2d4a93..02956f0 100644
--- a/.github/workflows/test_mdbf.yml
+++ b/.github/workflows/test_mdbf.yml
@@ -59,6 +59,8 @@ jobs:
             mariadb-version: 10.5
           - distro: fedora-41
             mariadb-version: 10.6
+          - distro: fedora-41
+            mariadb-version: 10.11
           - distro: fedora-41
             mariadb-version: 11.4
 
diff --git a/README.md b/README.md
index 81b1008..e1e7fa3 100644
--- a/README.md
+++ b/README.md
@@ -130,7 +130,7 @@ deployments and you are encouraged to use your own values.
 
 ```yaml
 mariadb_user: "default value depends on OS"
-mariadb_package: "default value depends on OS"
+mariadb_server_package: "default value depends on OS"
 mariadb_config_file: "default value depends on OS"
 mariadb_data_dir: "default value depends on OS"
 mariadb_port: 3306
diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
index 7a18b77..aed1e5e 100644
--- a/molecule/default/verify.yml
+++ b/molecule/default/verify.yml
@@ -16,15 +16,15 @@
 
     - name: Verify pkg status
       ansible.builtin.package:
-        name: "{{ mariadb_package }}"
+        name: "{{ mariadb_server_package }}"
         state: present
       check_mode: true
       register: pkg_status
 
-    - name: Check that {{ mariadb_package }} already installed
+    - name: Check that {{ mariadb_server_package }} already installed
       ansible.builtin.assert:
         that: not pkg_status.changed
-        fail_msg: "{{ mariadb_package }} is not installed"
+        fail_msg: "{{ mariadb_server_package }} is not installed"
 
     - name: Register {{ mariadb_config_file }}
       ansible.builtin.stat:
diff --git a/tasks/setup_alpine.yml b/tasks/setup_alpine.yml
index 8fac2b9..ac81078 100644
--- a/tasks/setup_alpine.yml
+++ b/tasks/setup_alpine.yml
@@ -2,7 +2,7 @@
 - name: Install packages (package)
   ansible.builtin.package:
     name:
-      - "{{ mariadb_package }}"
+      - "{{ mariadb_server_package }}"
       - mariadb-backup
       - mariadb-client
       - py3-pymysql
diff --git a/tasks/setup_debian.yml b/tasks/setup_debian.yml
index 8cb2fea..e02c339 100644
--- a/tasks/setup_debian.yml
+++ b/tasks/setup_debian.yml
@@ -78,7 +78,7 @@
 - name: Install packages (apt)
   ansible.builtin.apt:
     package:
-      - "{{ mariadb_package }}"
+      - "{{ mariadb_server_package }}"
       - mariadb-backup
       - python3-pymysql
     state: present
diff --git a/tasks/setup_redhat.yml b/tasks/setup_redhat.yml
index 5ae6ca3..134dd7c 100644
--- a/tasks/setup_redhat.yml
+++ b/tasks/setup_redhat.yml
@@ -23,10 +23,20 @@
 - name: Install packages (dnf)
   ansible.builtin.dnf:
     name:
-      - "{{ mariadb_package }}"
+      - "{{ mariadb_server_package }}"
       - mariadb-backup
       - python3-PyMySQL
     state: present
+  when: not mariadb_use_official_repo
+
+- name: Install packages (dnf/mdbf repo)
+  ansible.builtin.dnf:
+    name:
+      - "{{ mariadb_server_package_mdbf }}"
+      - MariaDB-backup
+      - python3-PyMySQL
+    state: present
+  when: mariadb_use_official_repo
 
 - name: Check if mariadb command exists
   ansible.builtin.stat:
diff --git a/vars/Alpine.yml b/vars/Alpine.yml
index 7e124d3..4936fa9 100644
--- a/vars/Alpine.yml
+++ b/vars/Alpine.yml
@@ -1,6 +1,6 @@
 ---
 mariadb_user: mysql
-mariadb_package: mariadb
+mariadb_server_package: mariadb
 mariadb_config_file: "/etc/my.cnf.d/mariadb-server.cnf"
 mariadb_data_dir: "/var/lib/mysql"
 mariadb_pid_file: "/run/mysqld/mariadb.pid"
diff --git a/vars/Debian.yml b/vars/Debian.yml
index 2ac21f7..13341db 100644
--- a/vars/Debian.yml
+++ b/vars/Debian.yml
@@ -1,6 +1,6 @@
 ---
 mariadb_user: mysql
-mariadb_package: mariadb-server
+mariadb_server_package: mariadb-server
 mariadb_config_file: "/etc/mysql/mariadb.cnf"
 mariadb_data_dir: "/var/lib/mysql"
 mariadb_pid_file: "/run/mysqld/mysqld.pid"
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
index 5ffce8b..683a2e8 100644
--- a/vars/RedHat.yml
+++ b/vars/RedHat.yml
@@ -1,6 +1,7 @@
 ---
 mariadb_user: mysql
-mariadb_package: mariadb-server
+mariadb_server_package: mariadb-server
+mariadb_server_package_mdbf: MariaDB-server
 mariadb_config_file: "/etc/my.cnf.d/mariadb-server.cnf"
 mariadb_data_dir: "/var/lib/mysql"
 mariadb_pid_file: "/run/mysqld.pid"