diff --git a/base.yml b/base.yml
index aa40675e..dcefb36a 100755
--- a/base.yml
+++ b/base.yml
@@ -51,25 +51,10 @@
     - ntp-client
     - crans-scripts
 
-# Deploy NFS only on campus
-- hosts: crans_server
-  roles:
-    - nfs-common
-
 # Deploy LDAP replica
 - hosts: odlyd.adm.crans.org,soyouz.adm.crans.org,fy.adm.crans.org,thot.adm.crans.org
   roles: []  # TODO
 
-# Playbook to deploy autofs NFS
-- hosts: crans_server,!odlyd.adm.crans.org,!zamok.adm.crans.org,!omnomnom.adm.crans.org,!owl.adm.crans.org,!owncloud-srv.adm.crans.org
-  roles:
-    - nfs-autofs
-
-# Deploy home permanent
-- hosts: zamok.adm.crans.org,omnomnom.adm.crans.org,owl.adm.crans.org,owncloud-srv.adm.crans.org
-  roles:
-    - home-permanent
-
 - hosts: otis.adm.crans.org
   roles:
     - ansible
@@ -80,7 +65,7 @@
     - zamok-tools
 
 - import_playbook: plays/mail.yml
-#- import_playbook: plays/nfs.yml
+- import_playbook: plays/nfs.yml
 - import_playbook: plays/logs.yml
 #- import_playbook: plays/tv.yml
 - import_playbook: plays/backup.yml
diff --git a/plays/nfs.yml b/plays/nfs.yml
new file mode 100755
index 00000000..61ccb4da
--- /dev/null
+++ b/plays/nfs.yml
@@ -0,0 +1,18 @@
+#!/usr/bin/env ansible-playbook
+---
+# Odlyd do not use NFS as it is the master backup.
+# Servers outside of campus do not use NFS.
+# zamok, omnomnom, owl and owncloud-srv uses permanently mounted home dirs.
+# all other servers on campus uses autofs to dynamically mount home dirs.
+
+# Deploy NFS only on campus
+- hosts: crans_server
+  roles: ["nfs-common"]
+
+# Deploy autofs NFS
+- hosts: crans_server,!odlyd.adm.crans.org,!zamok.adm.crans.org,!omnomnom.adm.crans.org,!owl.adm.crans.org,!owncloud-srv.adm.crans.org
+  roles: ["nfs-autofs"]
+
+# Deploy home permanent
+- hosts: zamok.adm.crans.org,omnomnom.adm.crans.org,owl.adm.crans.org,owncloud-srv.adm.crans.org
+  roles: ["home-permanent"]