diff --git a/evolinux-base/README.md b/evolinux-base/README.md
index 2a722eb2..a3b05ca4 100644
--- a/evolinux-base/README.md
+++ b/evolinux-base/README.md
@@ -14,11 +14,14 @@ Various tasks for Evolinux setup.
 
 Main variables are :
 
-* `evolinux_delete_nfs`: delete NFS tools (default: `True`)
-* `evolinux_ntp_server`: custom NTP server host or IP (default: `Null`)
-* `evolinux_additional_packages`: optional additional packages to install (default: `[]`)
 * `general_alert_email`: email address to send various alert messages (default: `root@localhost`).
 * `apt_alert_email`: email address to send APT messages to (default: `general_alert_email`).
 * `log2mail_alert_email`: email address to send Log2mail messages to (default: `general_alert_email`).
+* `postfix_alias_email`: email address for messages sent to root (default: `general_alert_email`) ;
+* `evolinux_delete_nfs`: delete NFS tools (default: `True`)
+* `evolinux_ntp_server`: custom NTP server host or IP (default: `Null`)
+* `evolinux_additional_packages`: optional additional packages to install (default: `[]`)
+* `evolinux_postfix_slow_transports_enabled`: configure slow transports (default: `True`) ;
+* `evolinux_postfix_remove_exim`: remove Exim4 packages (default: `True`) ;
 
 The full list of variables (with default values) can be found in `defaults/main.yml`.
diff --git a/evolinux-base/defaults/main.yml b/evolinux-base/defaults/main.yml
index ac194d34..8e023b6c 100644
--- a/evolinux-base/defaults/main.yml
+++ b/evolinux-base/defaults/main.yml
@@ -4,6 +4,7 @@ reboot_alert_email: Null
 apt_alert_email: Null
 log2mail_alert_email: Null
 raid_alert_email: Null
+postfix_alias_email: Null
 
 # hostname
 
@@ -16,6 +17,13 @@ evolinux_internal_hostname: "{{ evolinux_hostname }}"
 
 evolinux_apt_repositories_components: "main"
 evolinux_apt_hooks: False
+
+# postfix
+
+evolinux_postfix_myorigin: "{{ ansible_fqdn }}"
+evolinux_postfix_slow_transports_enabled: True
+evolinux_postfix_remove_exim: True
+
 # kernel
 
 evolinux_kernel_reboot_after_panic: True
diff --git a/evolinux-base/handlers/main.yml b/evolinux-base/handlers/main.yml
index 0866ad79..ac04ad9f 100644
--- a/evolinux-base/handlers/main.yml
+++ b/evolinux-base/handlers/main.yml
@@ -47,3 +47,21 @@
   service:
     name: apache2
     state: reloaded
+
+
+- name: newaliases
+  command: newaliases
+  changed_when: False
+
+- name: restart postfix
+  service:
+    name: postfix
+    state: restarted
+
+- name: reload postfix
+  service:
+    name: postfix
+    state: reloaded
+
+- name: postmap transport
+  command: postmap /etc/postfix/transport
diff --git a/postfix/tasks/main.yml b/evolinux-base/tasks/postfix.yml
similarity index 87%
rename from postfix/tasks/main.yml
rename to evolinux-base/tasks/postfix.yml
index 4d7ec042..df13c338 100644
--- a/postfix/tasks/main.yml
+++ b/evolinux-base/tasks/postfix.yml
@@ -17,7 +17,7 @@
     regexp: "^#? *{{ item.key }} *="
     line: "{{ item.key }} = {{ item.value }}"
   with_items:
-    - { key: "myorigin", value: "/etc/mailname" }
+    - { key: "myorigin", value: "{{ evolinux_postfix_myorigin }}" }
     - { key: "disable_vrfy_command", value: "yes" }
   notify: reload postfix
   tags:
@@ -72,12 +72,14 @@
     - exim4-base
     - exim4-config
     - exim4-daemon-light
-  when: postfix_remove_exim
+  when: evolinux_postfix_remove_exim
   tags:
     - packages
     - postfix
 
-- include: slow_transports.yml
-  when: postfix_slow_transports_enabled
+- include: postfix_slow_transports.yml
+  when: evolinux_postfix_slow_transports_enabled
   tags:
     - postfix
+
+- meta: flush_handlers
diff --git a/postfix/tasks/slow_transports.yml b/evolinux-base/tasks/postfix_slow_transports.yml
similarity index 100%
rename from postfix/tasks/slow_transports.yml
rename to evolinux-base/tasks/postfix_slow_transports.yml
diff --git a/postfix/README.md b/postfix/README.md
deleted file mode 100644
index 24621cfb..00000000
--- a/postfix/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# postfix
-
-Install Postfix
-
-## Tasks
-
-Everything is in the `tasks/main.yml` file.
-
-## Available variables
-
-Main variables are :
-
-* `general_alert_email`: email address to send various alert messages (default: `root@localhost`).
-* `postfix_alias_email`: email address for messages sent to root (default: `general_alert_email`) ;
-* `postfix_slow_transports_enabled`: configure slow transports (default: `True`) ;
-* `postfix_remove_exim`: remove Exim4 packages (default: `True`) ;
-
-The full list of variables (with default values) can be found in `defaults/main.yml`.
diff --git a/postfix/defaults/main.yml b/postfix/defaults/main.yml
deleted file mode 100644
index 2e3bbb94..00000000
--- a/postfix/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-general_alert_email: "root@localhost"
-postfix_alias_email: Null
-
-postfix_slow_transports_enabled: True
-postfix_remove_exim: True
diff --git a/postfix/handlers/main.yml b/postfix/handlers/main.yml
deleted file mode 100644
index 7894a013..00000000
--- a/postfix/handlers/main.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-
-- name: newaliases
-  command: newaliases
-
-- name: restart postfix
-  service:
-    name: postfix
-    state: restarted
-
-- name: reload postfix
-  service:
-    name: postfix
-    state: reloaded
-
-- name: postmap transport
-  command: postmap /etc/postfix/transport