diff --git a/roles/postfix-non-mailhost/templates/main.cf.j2 b/roles/postfix-non-mailhost/templates/main.cf.j2
index 57d106e..b99d905 100644
--- a/roles/postfix-non-mailhost/templates/main.cf.j2
+++ b/roles/postfix-non-mailhost/templates/main.cf.j2
@@ -18,7 +18,8 @@ readme_directory = no
 compatibility_level = 2
 
 # Send mail as user@{{ ansible_fqdn }}
-myorigin = {{ ansible_fqdn }}
+myhostname = {{ ansible_fqdn }}
+myorigin = $myhostname # default configuration
 
 # Specify the trusted networks
 mynetworks = 127.0.0.0/8 {{ local_network }}