diff --git a/host_vars/mail.universe.local.yml b/host_vars/mail.universe.local.yml
index 4d1000e..f9e0a6e 100644
--- a/host_vars/mail.universe.local.yml
+++ b/host_vars/mail.universe.local.yml
@@ -1,3 +1,4 @@
+hostname: mail.universe.local
 postfix: true
 postgrey: true
 dovecot: true
diff --git a/roles/mailserver/tasks/configure_postfix.yml b/roles/mailserver/tasks/configure_postfix.yml
index 23f140d..550117b 100644
--- a/roles/mailserver/tasks/configure_postfix.yml
+++ b/roles/mailserver/tasks/configure_postfix.yml
@@ -18,7 +18,7 @@
     - {key: "maillog_file", value: "/var/log/postfix.log"}                                                                                                
     - {key: "message_size_limit", value: "0"}                                                                                                             
     - {key: "milter_default_action", value: "accept"}                                                                                                     
-    - {key: "mydestination", value: "'localhost, kashyyyk, coruscant'"}                                                                                     
+    - {key: "mydestination", value: "'localhost, kashyyyk, coruscant, $myhostname'"}                                                                                     
     - {key: "myhostname", value: "{{ hostname | default(ansible_hostname) }}"}                                                                                               
     - {key: "mynetworks", value: "'{{ mynetworks }}'"}                           
     - {key: "mynetworks_style", value: "subnet"}