diff --git a/README b/README
index 2a679ae..afa232a 100644
--- a/README
+++ b/README
@@ -3,6 +3,7 @@ install and configure mariadb on CentOS 7
 variables:
 
 mariadb_data_dir - default /var/lib/mysql
+mariadb_version - default to 10.6.4
 mariadb_user - default mysql
 mariadb_root_password - lookup from group_names[0]}}/{{ inventory_hostname }}_mysql
 mariadb_root_home - default /root
diff --git a/defaults/main.yml b/defaults/main.yml
index 41cab4e..ff234a5 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,4 +1,5 @@
 ---
+mariadb_version: 10.6.4
 mariadb_data_dir: /var/lib/mysql
 mariadb_root_home: /root
 mariadb_user: mysql
diff --git a/tasks/main.yml b/tasks/main.yml
index 68e1585..e2800aa 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,6 +1,7 @@
 ---
   - name: OS vars
     include_vars: "{{ ansible_distribution|lower }}.yml"
+
   - name: install prerequisite
     package:
       name: "{{ packages_list }}"
@@ -9,6 +10,7 @@
   - name: set some vars
     set_fact:
       mariadb_root_password: "{{ lookup( 'keepass', '{{ group_names[0]}}/{{ inventory_hostname }}_mysql', 'password' ) }}"
+    when: (mariadb_root_password is not defined) or (mariadb_root_password|length ==0)
 
   - name: install on CentOS
     block:
@@ -19,10 +21,10 @@
         mode: 0700
 
     - name: install repo 2
-      command: /tmp/configure_mariadb_repo --os-type=rhel --os-version=7 --skip-maxscale
+      command: "/tmp/configure_mariadb_repo --os-type=rhel --os-version={{ ansible_distribution_major_version }} --skip-maxscale --mariadb-server-version={{ mariadb_version }}"
 
     - name: install mariadb server package
-      yum:
+      package:
         name:
         - "mariadb"
         - mariadb-server
@@ -44,6 +46,7 @@
     command: "/usr/bin/mysql_install_db --datadir={{ mariadb_data_dir }} --user={{ mariadb_user }}"
     args:
       creates: "{{ mariadb_data_dir }}/mysql"
+
   - name: setup logging
     file:
       path: "{{ mariadb_server_log }}"