diff --git a/handlers/main.yml b/handlers/main.yml
index 7fcd5e9..f996c3d 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -2,6 +2,6 @@
 
 - name: restart mariadb
   service:
-    name: mariadb
+    name: "{{ mariadb_service_name }}"
     state: restarted
   when: mariadb_notify_restart
diff --git a/tasks/galera/bootstrap.yml b/tasks/galera/bootstrap.yml
index b61a87f..2616c0d 100644
--- a/tasks/galera/bootstrap.yml
+++ b/tasks/galera/bootstrap.yml
@@ -15,7 +15,7 @@
 
     - name: SERVICE | Stop MariaDB
       service:
-        name: mariadb
+        name: "{{ mariadb_service_name }}"
         state: stopped
 
     - name: COMMAND | Bootstrap first node (systemd)
@@ -24,8 +24,8 @@
 
     - name: SERVICE | Bootstrap first node (clean init)
       service:
-        name: mariadb
-        state: started
+        name: "{{ mariadb_service_name }}"
+        state: "started"
         arguments: --wsrep-new-cluster
       register: bootstrap_run
       when: ansible_service_mgr != 'systemd'
diff --git a/tasks/galera/main.yml b/tasks/galera/main.yml
index 37b5f64..f395283 100644
--- a/tasks/galera/main.yml
+++ b/tasks/galera/main.yml
@@ -19,7 +19,7 @@
 
 - name: SERVICE | Restart MariaDB if needed
   service:
-    name: mariadb
+    name: "{{ mariadb_service_name }}"
     state: restarted
   when:
     ((galeraconfig or (p is defined and p.changed)) and
diff --git a/tasks/galera/nodes.yml b/tasks/galera/nodes.yml
index 4609902..71b8069 100644
--- a/tasks/galera/nodes.yml
+++ b/tasks/galera/nodes.yml
@@ -15,7 +15,7 @@
 
   - name: SERVICE | Stop MariaDB
     service:
-      name: mariadb
+      name: "{{ mariadb_service_name }}"
       state: stopped
 
   - name: COPY | Paste primary node's debian.cnf
@@ -29,7 +29,7 @@
 
   - name: SERVICE | Start MariaDB
     service:
-      name: mariadb
+      name: "{{ mariadb_service_name }}"
       state: started
 
   when: debiancnf.stdout != ondc.stdout
diff --git a/tasks/main.yml b/tasks/main.yml
index 5d6e134..1497f92 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,7 +1,14 @@
 ---
 
-- name: INCLUDE_VARS | Related to OS version
-  include_vars: "{{ ansible_distribution }}.yml"
+- name: INCLUDE_VARS | Extra variables
+  include_vars: "{{ lookup('first_found', params) }}"
+  vars:
+    params:
+      files:
+        - '{{ ansible_distribution }}-{{ ansible_distribution_release }}.yml'
+        - default.yml
+      paths:
+        - 'vars'
 
 - name: STAT | Check if mysql exists
   stat:
@@ -31,7 +38,7 @@
 - name: SERVICE | Restart Mariadb now one at a time (prevent bugs)
   throttle: 1
   service:
-    name: mariadb
+    name: "{{ mariadb_service_name }}"
     state: restarted
   when:
     config.changed and
@@ -39,7 +46,7 @@
 
 - name: SERVICE | Ensure service is started
   service:
-    name: mariadb
+    name: "{{ mariadb_service_name }}"
     state: started
 
 - name: INCLUDE | Galera
diff --git a/tasks/replication/slave/import_data.yml b/tasks/replication/slave/import_data.yml
index a447de6..6658e56 100644
--- a/tasks/replication/slave/import_data.yml
+++ b/tasks/replication/slave/import_data.yml
@@ -52,7 +52,7 @@
 
 - name: SERVICE | Stop MariaDB before importing data
   service:
-    name: mariadb
+    name: "{{ mariadb_service_name }}"
     state: stopped
 
 - name: COMMAND | Sync backup to slave - TODO remove vagrant as static user (see why mariadb_backup_user is not working)
@@ -78,7 +78,7 @@
 
 - name: SERVICE | Start MariaDB
   service:
-    name: mariadb
+    name: "{{ mariadb_service_name }}"
     state: started
 
 - name: FILE | Delete dump
diff --git a/vars/Debian-buster.yml b/vars/Debian-buster.yml
new file mode 100644
index 0000000..99776e6
--- /dev/null
+++ b/vars/Debian-buster.yml
@@ -0,0 +1,3 @@
+---
+
+mariadb_service_name: 'mysql'
diff --git a/vars/default.yml b/vars/default.yml
new file mode 100644
index 0000000..9ab3022
--- /dev/null
+++ b/vars/default.yml
@@ -0,0 +1,3 @@
+---
+
+mariadb_service_name: 'mariadb'
diff --git a/vars/Debian.yml b/vars/main.yml
similarity index 100%
rename from vars/Debian.yml
rename to vars/main.yml