diff --git a/templates/crypttab.j2 b/templates/crypttab.j2
index eeb8779..930e951 100644
--- a/templates/crypttab.j2
+++ b/templates/crypttab.j2
@@ -1,3 +1,6 @@
+{{ansible_managed|comment}}
+
+# <name>  <device>     <password>     <options>
 {% for cryptdev in dmcrypt_devices %}
-{{ cryptdev.name }} {{ cryptdev.device }} none luks{{ cryptdev.discard | default(false) | ternary(',discard','') }}
+{{ cryptdev.name }} {{ cryptdev.device }} {{ cryptdev.password | default('none') }} {{ cryptdev.options | default('luks') }}
 {% endfor %}