diff --git a/mailserver.yml b/mailserver.yml
index f732d44..56ac56a 100755
--- a/mailserver.yml
+++ b/mailserver.yml
@@ -1,26 +1,16 @@
 #!/usr/bin/env ansible-playbook
 ---
-# Deploy base and security
-- hosts: mail.adm.auro.re
-  roles:
-    - baseconfig
-    - basesecurity
-
-# Deploy LDAP
-- hosts: mail.adm.auro.re
-  roles:
-    - ldap_client
-
 # Deploy mail server
-- hosts: mail.adm.auro.re
+- hosts: mail.auro.re
   roles:
     - mail-utils
-    - postfix
-    - dovecot
+    - mail-certificates
+    - nfs-client
+#    - postfix
+#    - dovecot
 #    - rspamd
-#    - mail-certificates
 #    - mail-fail2ban
-
+#
 # Make OVH server send mails through proxy ?
 # Add multiple MX
 # Configure DKIM, SPF, Greylisting, etc...
diff --git a/roles/dovecot/tasks/main.yml b/roles/dovecot/tasks/main.yml
index afa08f5..8e4ce5f 100644
--- a/roles/dovecot/tasks/main.yml
+++ b/roles/dovecot/tasks/main.yml
@@ -36,7 +36,7 @@
     owner: vmail
     group: vmail
     mode: 0770
-    
+
 # Add the Dovecot configuration files
 - name: Add Dovecot configuration
   template:
diff --git a/roles/nfs-client/tasks/main.yml b/roles/nfs-client/tasks/main.yml
index 7bade02..ffc792c 100644
--- a/roles/nfs-client/tasks/main.yml
+++ b/roles/nfs-client/tasks/main.yml
@@ -3,22 +3,22 @@
 - name: Install NFS client
   apt:
     name:
-     - nfs-common  # use this on any NFS machine, be either client or server
+      - nfs-common  # use this on any NFS machine, be either client or server
     update_cache: true
 
-- name: Create mountable dir   
+- name: Create mountable dir
   file:
-    path: {{ nfs.mount-path }}
+    path: "{{ nfs.mount-path }}"
     state: directory
     mode: 0644
-    owner: {{ nfs.dir-owner }}
-    group: {{ nfs.dir-group }}
+    owner: "{{ nfs.dir-owner }}"
+    group: "{{ nfs.dir-group }}"
 
 - name: Mount and add to fstab
   mount:
     state: mounted  # actively mounted and configured in fstab
-    src: {{ nfs.src }}
-    path: {{ nfs.mount-path }}
+    src: "{{ nfs.src }}"
+    path: "{{ nfs.mount-path }}"
     fstype: nfs
     opts: defaults
 # don't specify dump and fsck to keep the 0 (don't) variable