diff --git a/data/hooks/conf_regen/49-udisks-glue b/data/hooks/conf_regen/49-udisks-glue
deleted file mode 100644
index 03dbc75d..00000000
--- a/data/hooks/conf_regen/49-udisks-glue
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-set -e 
-
-force=$1
-
-function safe_copy () {
-    if [[ "$force" == "True" ]]; then
-        sudo yunohost service safecopy \
-          -s udisks-glue $1 $2 --force
-    else
-        sudo yunohost service safecopy \
-          -s udisks-glue $1 $2
-    fi
-}
-
-cd /usr/share/yunohost/templates/udisks-glue
-
-if [[ "$(safe_copy udisks-glue.conf /etc/udisks-glue.conf | tail -n1)" == "True" ]]; then
-    sudo service udisks-glue restart
-fi
diff --git a/data/templates/udisks-glue/udisks-glue.conf b/data/templates/udisks-glue/udisks-glue.conf
deleted file mode 100644
index f97de948..00000000
--- a/data/templates/udisks-glue/udisks-glue.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-filter disks {
-    optical = false
-    partition_table = false
-    usage = filesystem
-}
-match disks { 
-    automount=true
-    automount_options= { sync, noatime, "dmask=0", "fmask=0" }
-}
diff --git a/data/templates/yunohost/services.yml b/data/templates/yunohost/services.yml
index c015c8cd..ed85738e 100644
--- a/data/templates/yunohost/services.yml
+++ b/data/templates/yunohost/services.yml
@@ -13,6 +13,10 @@ dovecot:
 postfix:
    status: service
    log: [/var/log/mail.log,/var/log/mail.err]
+rmilter:
+   status: systemctl status rmilter.socket
+rspamd:
+   status: systemctl status rspamd.socket
 mysql:
    status: service
    log: [/var/log/mysql.log,/var/log/mysql.err]
@@ -36,16 +40,10 @@ yunohost-api:
 postgrey:
    status: service
    log: /var/log/mail.log
-amavis:
-   status: service
-   log: /var/log/mail.log
 nslcd:
    status: service
    log: /var/log/syslog
 nsswitch:
    status: service
-spamassassin:
-   status: service
-   log: /var/log/mail.log
-udisks-glue:
+udisks2:
    status: service