diff --git a/tasks/install.deb.yml b/tasks/install.deb.yml
index 699a350..a742437 100644
--- a/tasks/install.deb.yml
+++ b/tasks/install.deb.yml
@@ -1,20 +1,16 @@
 ---
 
 - name: Install requirements (Debian)
-  apt: name={{item}} update_cache=yes
-  with_items:
-  - postfix
-  - ca-certificates
-  - mailutils
-  - libsasl2-modules
+  apt:
+    name: "{{ postfix_packages }}"
+    update_cache: yes
 
 - name: Install DKIM requirements (Debian)
-  apt: name={{item}}
+  apt:
+    name: "{{ postfix_dkim_packages }}"
   when: postfix_dkim
-  with_items:
-  - opendkim
-  - opendkim-tools
 
 - name: Install postfix-pcre
-  apt: pkg=postfix-pcre
+  apt:
+    name: "{{ postfix_pcre_package }}"
   when: postfix_rewrite_sender_address != "" or postfix_local_user_relay_address != ""
diff --git a/tasks/install.yum.yml b/tasks/install.yum.yml
index a14a989..d1ab2f0 100644
--- a/tasks/install.yum.yml
+++ b/tasks/install.yum.yml
@@ -1,13 +1,15 @@
 ---
 
 - name: Install requirements (RedHat)
-  package: name={{item}}
-  with_items:
-  - postfix
-  - ca-certificates
-  - mailx
-  - libselinux-python
+  package:
+    name: "{{ postfix_packages }}"
 
 - name: Install DKIM requirements (RedHat)
-  package: name=opendkim
+  package:
+    name: "{{ postfix_dkim_packages }}"
   when: postfix_dkim
+
+- name: Install postfix-pcre
+  package:
+    name: "{{ postfix_pcre_package }}"
+  when: postfix_rewrite_sender_address != "" or postfix_local_user_relay_address != ""
diff --git a/tasks/postfix.yml b/tasks/postfix.yml
index e133966..577ea46 100644
--- a/tasks/postfix.yml
+++ b/tasks/postfix.yml
@@ -1,5 +1,12 @@
 ---
 
+- name: Include package list per OS
+  include_vars: "{{ item }}"
+  with_first_found:
+  - "{{ ansible_distribution }}.yml"
+  - "{{ ansible_os_family }}_{{ ansible_distribution_major_version }}.yml"
+  - "{{ ansible_os_family }}.yml"
+
 - import_tasks: install.deb.yml
   when: ansible_os_family == 'Debian'
   tags: [postfix]
diff --git a/vars/Debian.yml b/vars/Debian.yml
new file mode 100644
index 0000000..b3cf9f9
--- /dev/null
+++ b/vars/Debian.yml
@@ -0,0 +1,13 @@
+---
+
+postfix_packages:
+  - postfix
+  - ca-certificates
+  - mailutils
+  - libsasl2-modules
+
+postfix_dkim_packages:
+  - opendkim
+  - opendkim-tools
+
+postfix_pcre_package: postfix-pcre
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
new file mode 100644
index 0000000..d8f4d76
--- /dev/null
+++ b/vars/RedHat.yml
@@ -0,0 +1,12 @@
+---
+
+postfix_packages:
+  - postfix
+  - ca-certificates
+  - mailx
+  - libselinux-python
+
+postfix_dkim_packages:
+  - opendkim
+
+postfix_pcre_package: postfix
diff --git a/vars/RedHat_8.yml b/vars/RedHat_8.yml
new file mode 100644
index 0000000..76b8240
--- /dev/null
+++ b/vars/RedHat_8.yml
@@ -0,0 +1,12 @@
+---
+
+postfix_packages:
+  - postfix
+  - ca-certificates
+  - mailx
+  - python3-libselinux
+
+postfix_dkim_packages:
+  - opendkim
+
+postfix_pcre_package: postfix-pcre