diff --git a/roles/autofs/defaults/main.yml b/roles/autofs/defaults/main.yml
new file mode 100644
index 0000000..404004a
--- /dev/null
+++ b/roles/autofs/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+autofs_home: true
+autofs_roles: true
diff --git a/roles/autofs/templates/auto.master.j2 b/roles/autofs/templates/auto.master.j2
index ee9e28f..bec2b4b 100644
--- a/roles/autofs/templates/auto.master.j2
+++ b/roles/autofs/templates/auto.master.j2
@@ -1,2 +1,6 @@
+{% if autofs_home %}
 /home  ldap:///ou=People,{{ ldap_basedn }} rw,nosuid,nodev,rsize=1048576,wsize=1048576
+{% endif %}
+{% if autofs_roles %}
 /roles ldap:///ou=Groups,{{ ldap_basedn }} rw,nosuid,nodev,rsize=1048576,wsize=1048576 --ghost
+{% endif %}