diff --git a/roles/repo_samba4/defaults/main.yml b/roles/repo_samba4/defaults/main.yml
deleted file mode 100644
index 98c0774..0000000
--- a/roles/repo_samba4/defaults/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-# Select a branch from https://samba.tranquil.it/centos7/ or https://samba.tranquil.it/centos7/
-samba_major_version: samba-{{ (ansible_distribution_major_version is version('8','<')) | ternary('4.12.15','4.18.3') }}
diff --git a/roles/repo_samba4/tasks/main.yml b/roles/repo_samba4/tasks/main.yml
index c4daa1d..c219b20 100644
--- a/roles/repo_samba4/tasks/main.yml
+++ b/roles/repo_samba4/tasks/main.yml
@@ -1,17 +1,19 @@
 ---
 
-- name: Remove FWS Extra repository for samba4
-  yum_repository:
-    name: fws-extra-samba
-    description: "Firewall Services Extra"
-    state: absent
+# Load distribution specific variables
+- include_vars: "{{ item }}"
+  with_first_found:
+    - "{{ role_path }}/vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
+    - "{{ role_path }}/vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml"
+    - "{{ role_path }}/vars/{{ ansible_distribution }}.yml"
+    - "{{ role_path }}/vars/{{ ansible_os_family }}.yml"
   tags: repo,samba
 
 - name: Configure TIS samba repo
   yum_repository:
     name: tis-samba
     description: Samba4 repo from TranquiIT
-    baseurl: http://samba.tranquil.it/centos$releasever/{{ samba_major_version }}/
+    baseurl: http://samba.tranquil.it/redhat$releasever/samba-{{ samba_major_version }}/
     gpgcheck: True
     gpgkey: https://samba.tranquil.it/RPM-GPG-KEY-TISSAMBA-{{ ansible_distribution_major_version }}
   tags: repo,samba
diff --git a/roles/repo_samba4/vars/RedHat-7.yml b/roles/repo_samba4/vars/RedHat-7.yml
new file mode 100644
index 0000000..73dd0c9
--- /dev/null
+++ b/roles/repo_samba4/vars/RedHat-7.yml
@@ -0,0 +1,3 @@
+---
+
+samba_major_version: 4.18
diff --git a/roles/repo_samba4/vars/RedHat-8.yml b/roles/repo_samba4/vars/RedHat-8.yml
new file mode 100644
index 0000000..73dd0c9
--- /dev/null
+++ b/roles/repo_samba4/vars/RedHat-8.yml
@@ -0,0 +1,3 @@
+---
+
+samba_major_version: 4.18
diff --git a/roles/repo_samba4/vars/RedHat-9.yml b/roles/repo_samba4/vars/RedHat-9.yml
new file mode 100644
index 0000000..73dd0c9
--- /dev/null
+++ b/roles/repo_samba4/vars/RedHat-9.yml
@@ -0,0 +1,3 @@
+---
+
+samba_major_version: 4.18