diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000..a46804a
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [lucascbeyeler]
diff --git a/defaults/main.yml b/defaults/main.yml
index 611bdd4..7d9d629 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -9,3 +9,39 @@ ubuntu:
 centos:
   - pyzor
   - perl-Razor-Agent
+
+#
+# Products to be installed
+################################################################################
+zimbra_ldap: y
+zimbra_logger: y
+zimbra_mta: y
+zimbra_dnscache: n
+zimbra_snmp: n
+zimbra_store: y
+zimbra_apache: y
+zimbra_spell: y
+zimbra_memcached: y
+zimbra_proxy: y
+zimbra_chat: n
+zimbra_drive: n
+zimbra_imapd: n
+zimbra_policyd: n
+
+#
+# Zimbra configuration
+################################################################################
+
+hostname: "localhost"
+domain: "localdomain"
+zmpasswd: "!23Change"
+zmnetwork: "192.168.200.0/8"
+timezone: UTC
+#hosts_lines:
+#  - "198.162.1.3 {{ hostname }}.{{ domain }} {{ hostname }}" 
+
+#
+# Zimbra configuration
+################################################################################
+zimbra_version: 8.8.15
+
diff --git a/meta/main.yml b/meta/main.yml
index 935fbdb..667425a 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -3,17 +3,19 @@ galaxy_info:
   description: Ansible role to install and configure Zimbra Collaboration Open Source Edition
   company: Beyeler
   license: GPLv3
-  min_ansible_version: 2.4
+  min_ansible_version: 2.9.6
   github_branch: master
   platforms:
   - name: Ubuntu
     versions:
     - trusty
     - xenial
+    - bionic
   - name: EL
     versions:
     - 6
     - 7
+    - 8
   galaxy_tags:
     - zimbra
     - community
diff --git a/tasks/install/zimbra.yml b/tasks/install/zimbra.yml
index c89c6f5..e93a486 100644
--- a/tasks/install/zimbra.yml
+++ b/tasks/install/zimbra.yml
@@ -2,6 +2,15 @@
 #
 # Download and install Zimbra OSE
 ################################################################################
+
+- name: Update /etc/hosts
+  lineinfile:
+    path: /etc/hosts 
+    line: "{{ item }}" 
+    state: present
+  with_items: "{{ hosts_lines }}"
+  when: hosts_lines is defined
+  
 - name: Download and unpacking Zimbra OSE
   unarchive:
     validate_certs: no
diff --git a/vars/main.yml b/vars/main.yml
index 27c9d08..ed97d53 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,33 +1 @@
 ---
-#
-# Products to be installed
-################################################################################
-zimbra_ldap: y
-zimbra_logger: y
-zimbra_mta: y
-zimbra_dnscache: n
-zimbra_snmp: n
-zimbra_store: y
-zimbra_apache: y
-zimbra_spell: y
-zimbra_memcached: y
-zimbra_proxy: y
-zimbra_chat: n
-zimbra_drive: n
-zimbra_imapd: n
-zimbra_policyd: n
-
-#
-# Zimbra configuration
-################################################################################
-
-hostname: "localhost"
-domain: "localdomain"
-zmpasswd: "!23Change"
-zmnetwork: "192.168.200.0/8"
-timezone: UTC
-
-#
-# Zimbra configuration
-################################################################################
-zimbra_version: 8.8.15