diff --git a/defaults/main.yml b/defaults/main.yml
index d46d493..9446d73 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,4 @@
+mailname: "{{inventory_hostname}}"
+
 postfix_postfixadmin_mysql_database: postfixadmin
 postfix_postfixadmin_mysql_username: postfix
diff --git a/tasks/main.yml b/tasks/main.yml
index 2d0d12a..e701d1a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -13,6 +13,12 @@
     dest: /etc/postfix/main.cf
   notify: reload postfix
 
+- name: mailname
+  copy:
+    content: "{{mailname}}"
+    dest: /etc/mailname
+  notify: reload postfix
+
 - include: postfixadmin.yml
 
 - name: configuration pull directory
diff --git a/templates/main.cf.j2 b/templates/main.cf.j2
index 58b313a..3a9c2f5 100644
--- a/templates/main.cf.j2
+++ b/templates/main.cf.j2
@@ -1,10 +1,9 @@
 # See /usr/share/postfix/main.cf.dist for a commented, more complete version
 
-
 # Debian specific:  Specifying a file name will cause the first
 # line of that file to be used as the name.  The Debian default
 # is /etc/mailname.
-#myorigin = /etc/mailname
+myorigin = /etc/mailname
 
 smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU)
 biff = no