diff --git a/group_vars/all b/group_vars/all
index 060ad13..91b2f81 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -173,3 +173,7 @@ cryptshot:
 
 journal:
     max_size: 500M
+
+udisks:
+    auto_mount: False
+    shared_mount: True
diff --git a/roles/udisks/files/10-udisks.rules b/roles/udisks/files/10-udisks.rules
deleted file mode 100644
index 0cea65a..0000000
--- a/roles/udisks/files/10-udisks.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-# Disable automounting
-ACTION=="add|change", SUBSYSTEM=="block", KERNEL=="sd*|sr", ENV{UDISKS_PRESENTATION_HIDE}="1"
diff --git a/roles/udisks/files/99-udisks2.rules b/roles/udisks/files/99-udisks2.rules
deleted file mode 100644
index 7c5c319..0000000
--- a/roles/udisks/files/99-udisks2.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-# Mount to /media
-ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{UDISKS_FILESYSTEM_SHARED}="1"
diff --git a/roles/udisks/tasks/main.yml b/roles/udisks/tasks/main.yml
index f54d718..4f45380 100644
--- a/roles/udisks/tasks/main.yml
+++ b/roles/udisks/tasks/main.yml
@@ -2,14 +2,14 @@
 - name: Install udisks2
   pacman: name=udisks2 state=present
 
-- name: Disable udisks automounting
-  copy: src=10-udisks.rules dest=/etc/udev/rules.d/10-udisks.rules
+- name: Configure auto mount
+  template: src=10-udisks.rules.j2 dest=/etc/udev/rules.d/10-udisks.rules
 
 - name: Verify /media exists
   file: path=/media state=directory
 
-- name: Mount to /media
-  copy: src=99-udisks2.rules dest=/etc/udev/rules.d/99-udisks2.rules
+- name: Configure mount location
+  template: src=99-udisks2.rules.j2 dest=/etc/udev/rules.d/99-udisks2.rules
 
 - name: Install udiskie
   pacman: name=udiskie state=present
diff --git a/roles/udisks/templates/10-udisks.rules.j2 b/roles/udisks/templates/10-udisks.rules.j2
new file mode 100644
index 0000000..ebdd16e
--- /dev/null
+++ b/roles/udisks/templates/10-udisks.rules.j2
@@ -0,0 +1 @@
+ACTION=="add|change", SUBSYSTEM=="block", KERNEL=="sd*|sr", ENV{UDISKS_PRESENTATION_HIDE}="{% if udisks.auto_mount %}0{% else %}1{% endif %}"
diff --git a/roles/udisks/templates/99-udisks2.rules.j2 b/roles/udisks/templates/99-udisks2.rules.j2
new file mode 100644
index 0000000..c76d854
--- /dev/null
+++ b/roles/udisks/templates/99-udisks2.rules.j2
@@ -0,0 +1 @@
+ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{UDISKS_FILESYSTEM_SHARED}="{% if udisks.shared_mount %}1{% else %}0{% endif %}"