diff --git a/discuss.yml b/discuss.yml
index fe51abe..7f53fa4 100644
--- a/discuss.yml
+++ b/discuss.yml
@@ -3,7 +3,6 @@
 - hosts: discourse
   vars:
     discourse_domain: discuss.afpy.org
-    exim4_sendonly_remote_smtp_interface: '46.226.106.79'  # See: https://discuss.afpy.org/t/git-afpy-org-sur-la-bl-de-spamhaus/1191/2
     discourse_admins:
       - julien@palard.fr
       - marc@debureaux.fr
diff --git a/gitea.yml b/gitea.yml
index f45b224..a49e50a 100644
--- a/gitea.yml
+++ b/gitea.yml
@@ -3,7 +3,6 @@
 - hosts: gitea
   vars:
     gitea_version: "1.17.4"  # To upgrade, read the README file first.
-    exim4_sendonly_remote_smtp_interface: '46.226.104.208'  # See: https://discuss.afpy.org/t/git-afpy-org-sur-la-bl-de-spamhaus/1191/2
     gitea_internal_token: !vault |
           $ANSIBLE_VAULT;1.1;AES256
           65396439373538656633396363313333663233343661643739633135306131613434353335353634
diff --git a/group_vars/all/vars b/group_vars/all/vars
index 5a44b77..5b76d93 100644
--- a/group_vars/all/vars
+++ b/group_vars/all/vars
@@ -1,16 +1,21 @@
 ---
+admin_email: julien@python.org
+
 exim4_local_interfaces: '127.0.0.1;172.17.0.1'
 exim4_relay_nets: '172.16.0.0/12'
+exim4_sendonly_email_aliases:
+  - regexp: '^root'
+    line: "root: {{ admin_email }}"
+
 gandi_api_key: "{{ vault_gandi_api_key }}"
 letsencrypt_email: julien@python.org
-admin_email: julien@python.org
 ansible_python_interpreter: "/usr/bin/python3"
 ansible_user: root
 admins:
   - asyd
   - marc
-  - mdk 
+  - mdk
   - pilou
   - rsnapshot
- 
+
 root_authorized_keys: "{{ admins | map('extract', authorized_keys)|flatten|join('\n') }}"
diff --git a/inventory b/inventory
index 6c4afcb..64dc960 100644
--- a/inventory
+++ b/inventory
@@ -11,7 +11,7 @@ deb2.afpy.org
 deb2.afpy.org
 
 [discourse]
-discourse1.afpy.org
+discourse1.afpy.org exim4_sendonly_remote_smtp_interface=46.226.106.79  # See: https://discuss.afpy.org/t/git-afpy-org-sur-la-bl-de-spamhaus/1191/2
 
 [turn]
 turn1.afpy.org
@@ -22,7 +22,7 @@ deb2.afpy.org
 [rsnapshotted]
 deb2.afpy.org
 bbb2.afpy.org
-gitea1.afpy.org
+gitea1.afpy.org exim4_sendonly_remote_smtp_interface=46.226.104.208  # See: https://discuss.afpy.org/t/git-afpy-org-sur-la-bl-de-spamhaus/1191/2
 discourse1.afpy.org
 
 [rsnapshoter]
diff --git a/roles/exim4/defaults/main.yml b/roles/exim4/defaults/main.yml
index 879acf0..ceee139 100644
--- a/roles/exim4/defaults/main.yml
+++ b/roles/exim4/defaults/main.yml
@@ -1,7 +1,6 @@
 ---
 exim4_sendonly_fqdn: '{{ ansible_fqdn }}'
 
-exim4_sendonly_enable_tls: true
 exim4_sendonly_smarthost: ''
 exim4_sendonly_username: ''
 exim4_sendonly_password: ''
diff --git a/roles/exim4/tasks/configure.yml b/roles/exim4/tasks/configure.yml
index efd47e9..73dc7ee 100644
--- a/roles/exim4/tasks/configure.yml
+++ b/roles/exim4/tasks/configure.yml
@@ -39,7 +39,6 @@
   template:
     src: 'exim4.conf.localmacros'
     dest: '/etc/exim4/exim4.conf.localmacros'
-  when: exim4_sendonly_enable_tls
 
 - name: Create /etc/exim4/dkim/ directory
   file: