diff --git a/tasks/install/zimbra.yml b/tasks/install/zimbra.yml
index c89c6f5..cde16f2 100644
--- a/tasks/install/zimbra.yml
+++ b/tasks/install/zimbra.yml
@@ -39,3 +39,17 @@
   command: ./zmsetup.pl -c /tmp/zcs/installZimbraScript
   args:
     chdir: /opt/zimbra/libexec/
+
+#
+# BUGFIX WORKAROUND - Zimbra 8.8.5 does not work without configuring the hostname
+################################################################################
+
+- name: Configuring Zimbra Hostname for Domain {{ domain }}
+  command: ./zmprov md {{ domain }} zimbraVirtualHostname {{ hostname }}.{{ domain }}
+  args:
+    chdir: /opt/zimbra/bin/
+
+- name: Reloading Proxy configuration
+  command: ./zmproxyconfgen
+  args:
+    chdir: /opt/zimbra/libexec/