diff --git a/tasks/main.yml b/tasks/main.yml
index f773fd1..ec206dc 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,10 +2,7 @@
 - name: WireGuard setup
   block:
   - name: Include vars for {{ ansible_os_family }}
-    include_vars: "{{ item }}"
-    with_first_found:
-      - "{{ ansible_os_family }}_{{ ansible_distribution_major_version }}.yml"
-      - "{{ ansible_os_family }}.yml"
+    include_vars: "{{ ansible_os_family }}_{{ ansible_distribution_major_version }}.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 c673371..c2ede6d 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 an extremely simple yet fast and modern VPN that utilizes state-of-the-art cryptography.</description>
+  <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>
   <port protocol="udp" port="{{ wireguard_port }}"/>
 </service>
diff --git a/vars/RedHat.yml b/vars/RedHat_7.yml
similarity index 100%
rename from vars/RedHat.yml
rename to vars/RedHat_7.yml
diff --git a/vars/RedHat_8.yml b/vars/RedHat_8.yml
new file mode 100644
index 0000000..39f5d41
--- /dev/null
+++ b/vars/RedHat_8.yml
@@ -0,0 +1,4 @@
+---
+wireguard_packages:
+  - kmod-wireguard
+  - wireguard-tools