diff --git a/tasks/main.yml b/tasks/main.yml
index ec206dc..f773fd1 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,7 +2,10 @@
 - name: WireGuard setup
   block:
   - name: Include vars for {{ ansible_os_family }}
-    include_vars: "{{ ansible_os_family }}_{{ ansible_distribution_major_version }}.yml"
+    include_vars: "{{ item }}"
+    with_first_found:
+      - "{{ ansible_os_family }}_{{ ansible_distribution_major_version }}.yml"
+      - "{{ ansible_os_family }}.yml"
 
   - name: Pre-installation
     include_tasks: "install_{{ ansible_os_family }}.yml"
diff --git a/templates/etc/firewalld/services/wireguard.xml b/templates/etc/firewalld/services/wireguard.xml
index c2ede6d..c673371 100644
--- a/templates/etc/firewalld/services/wireguard.xml
+++ b/templates/etc/firewalld/services/wireguard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <service>
   <short>WireGuard</short>
-  <description>WireGuard is a virtual private network (VPN) solution. It is used to create encrypted point-to-point tunnels between computers. If you plan to provide a VPN service, enable this option.</description>
+  <description>Wireguard is an extremely simple yet fast and modern VPN that utilizes state-of-the-art cryptography.</description>
   <port protocol="udp" port="{{ wireguard_port }}"/>
 </service>
diff --git a/vars/RedHat_7.yml b/vars/RedHat.yml
similarity index 100%
rename from vars/RedHat_7.yml
rename to vars/RedHat.yml
diff --git a/vars/RedHat_8.yml b/vars/RedHat_8.yml
deleted file mode 100644
index 39f5d41..0000000
--- a/vars/RedHat_8.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-wireguard_packages:
-  - kmod-wireguard
-  - wireguard-tools