diff --git a/data/hooks/conf_regen/22-email-legacy b/data/hooks/conf_regen/22-email-legacy
index e66a20045..ba13e4b89 100644
--- a/data/hooks/conf_regen/22-email-legacy
+++ b/data/hooks/conf_regen/22-email-legacy
@@ -8,6 +8,9 @@ sudo yunohost service add rspamd -l /var/log/mail.log \
 sudo yunohost service add rmilter -l /var/log/mail.log \
   || echo "Rspamd is already listed in services"
 
+sudo yunohost service add memcached \
+  || echo "Memcached is already listed in services"
+
 # Remove previous email services
 sudo yunohost service disable spamassassin \
   || echo "Spamassassin is already removed" \
diff --git a/data/hooks/conf_regen/28-rmilter b/data/hooks/conf_regen/28-rmilter
index ef31b6806..7999318d9 100644
--- a/data/hooks/conf_regen/28-rmilter
+++ b/data/hooks/conf_regen/28-rmilter
@@ -16,7 +16,7 @@ function safe_copy () {
 cd /usr/share/yunohost/templates/rmilter
 
 # Copy Rmilter configuration
-safe_copy rmilter.conf /etc/rmilter/rmilter.conf
+safe_copy rmilter.conf /etc/rmilter.conf
 
 # Create the PID directory
 sudo mkdir -p /var/run/rmilter
@@ -28,7 +28,11 @@ domain_list=$(sudo yunohost domain list --plain)
 
 for domain in $domain_list; do
     [ -f /etc/dkim/$domain.mail.key ] \
-      || sudo opendkim-genkey --domain=$domain --selector=mail
+      || (sudo opendkim-genkey --domain=$domain \
+                               --selector=mail\
+                               --directory=/etc/dkim \
+          && sudo mv /etc/dkim/mail.private /etc/dkim/$domain.mail.key \
+          && sudo mv /etc/dkim/mail.txt /etc/dkim/$domain.mail.txt)
 
     sudo chown _rmilter /etc/dkim/$domain.mail.key
     sudo chmod 400      /etc/dkim/$domain.mail.key