diff --git a/roles/fvs-mkhome/defaults/main.yml b/roles/fvs-mkhome/defaults/main.yml
index 836e748..26a03ba 100644
--- a/roles/fvs-mkhome/defaults/main.yml
+++ b/roles/fvs-mkhome/defaults/main.yml
@@ -1,2 +1,5 @@
 basedn: "ou=Benutzer,ou=fvs,ou=SCHULEN,o=ml3"
-ldap_server: ldap.steinbeisschule-reutlingen.de
+ldap_server: "ldap.steinbeisschule-reutlingen.de"
+smb_server: "smb.steinbeisschule-reutlingen.de"
+smb_home: "DOCS/fvs/home/"
+smb_share: "DOCS/fvs/tausch/"
diff --git a/roles/fvs-mkhome/tasks/main.yml b/roles/fvs-mkhome/tasks/main.yml
index b83436c..d0bad51 100644
--- a/roles/fvs-mkhome/tasks/main.yml
+++ b/roles/fvs-mkhome/tasks/main.yml
@@ -41,15 +41,17 @@
     block: |
       <volume
         fstype="cifs"
-        server="smb.steinbeisschule-reutlingen.de"
-        path="DOCS/fvs/home/"
-        mountpoint="~/winhome"
+        server="{{ smb_server }}"
+        path="{{ smb_home }}"
+        mountpoint="/media/%(USER)/winhome"
+        options="dir_mode=0750,file_mode=0640"
       />
       <volume
         fstype="cifs"
-        server="smb.steinbeisschule-reutlingen.de"
-        path="DOCS/fvs/tausch/"
-        mountpoint="~/winshare"
+        server="{{ smb_server }}"
+        path="{{ smb_share }}"
+        mountpoint="/media/%(USER)/winshare"
+        options="dir_mode=0750,file_mode=0640"
       />
       <!--volume
         fstype="fuse"