diff --git a/tasks/main.yml b/tasks/main.yml
index dab3532..78a19f7 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,7 +2,7 @@
 - name: Set some variables
   set_fact:
     ssh_hardening_backup_suffix: "42.{{ ansible_date_time.date }}@{{ ansible_date_time.time }}~"
-    ssh_hardening_distri: "{{ (ansible_distribution|lower).split(' ')[0] }}"
+    ssh_hardening_distri: "{{ (ansible_distribution|lower).split(' ')[0] }}-{{ ansible_distribution_major_version }}"
 
 
 - name: Get SSH version number
@@ -25,8 +25,8 @@
   include_vars: "{{ item }}"
   with_first_found:
     - "os_{{ ssh_hardening_distri }}.yml"
-    - "os_{{ ansible_distribution_family }}.yml"
-    - "os_{{ ansible_os_family }}.yml"
+    - "os_{{ (ansible_distribution|lower).split(' ')[0] }}.yml"
+    - "os_{{ (ansible_os_family|lower).split(' ')[0] }}.yml"
     - "os_default.yml"