diff --git a/nfs-client/templates/auto.nfs.j2 b/nfs-client/templates/auto.nfs.j2
index 3d746ff91305554b5a4f3f57b97f1186619b1713..ffdf59c69811d08fc792daa57e42083a4db41c4b 100644
--- a/nfs-client/templates/auto.nfs.j2
+++ b/nfs-client/templates/auto.nfs.j2
@@ -1,6 +1,3 @@
-## TODO
-home		-fstype=nfs,noatime,hard,intr,nodev,nosuid,vers=3	rumo.fsmpi.rwth-aachen.de:/DATA/home
-pub		-fstype=nfs,noatime,hard,intr,nodev,nosuid,vers=3	rumo.fsmpi.rwth-aachen.de:/DATA/pub
-#sharing	-fstype=nfs,noatime,hard,intr,nodev,nosuid,vers=3	portal.fsmpi.rwth-aachen.de:/srv/sharing
-videoag		-fstype=nfs,noatime,hard,intr,nodev,nosuid,vers=3	videoag.fsmpi.rwth-aachen.de:/srv/videoag
-videoag_raw	-fstype=nfs,noatime,hard,intr,nodev,nosuid,vers=3	videoag.fsmpi.rwth-aachen.de:/srv/videoag_raw
+{% for share in nfsshares %}
+	{{ share }}
+{% endfor %}