diff --git a/roles/mailserver_preperation/tasks/main.yml b/roles/mailserver_preperation/tasks/main.yml
new file mode 100644
index 0000000..9092a5d
--- /dev/null
+++ b/roles/mailserver_preperation/tasks/main.yml
@@ -0,0 +1,20 @@
+---
+
+- name: "set {{ inventory_hostname }} as hostname"
+  become: true
+  hostname:
+    name: "{{ inventory_hostname }}"
+
+- name: Add hostname to /etc/hosts
+  become: true
+  lineinfile:
+    dest: /etc/hosts
+    regexp: "^127.0.1.1"
+    line: "127.0.1.1 {{ inventory_hostname }} {{ ansible_hostname }}"
+    state: present
+
+- name: Set /etc/mailname
+  become: true
+  copy:
+    dest: "/etc/mailname"
+    content: "{{ inventory_hostname }}"
diff --git a/site.yml b/site.yml
index 76f2f99..95ee423 100644
--- a/site.yml
+++ b/site.yml
@@ -29,5 +29,6 @@
 - name: deploy mail config
   hosts: mail
   roles:
+    - { role: mailserver_preperation, tags: [mail,mailserver_preperation,prep,mailserver]}
     - { role: robertdebock.dovecot, tags: [mail,postfix]}
 #    - { role: dovecot, tags: [mail,dovecot]}