diff --git a/lmn-desktop.yml b/lmn-desktop.yml
index 37ae331..bdfd4d1 100644
--- a/lmn-desktop.yml
+++ b/lmn-desktop.yml
@@ -15,6 +15,7 @@
 
   vars:
     domain: "{{ ansible_domain }}"
+    nfs4: false
     extra_pkgs:
       - vim
       - mc
diff --git a/roles/lmn_mount/defaults/main.yml b/roles/lmn_mount/defaults/main.yml
index 86e9368..cf3a823 100644
--- a/roles/lmn_mount/defaults/main.yml
+++ b/roles/lmn_mount/defaults/main.yml
@@ -1,2 +1,2 @@
 smb_server: "server"
-smb_share: "default-school/share/"
+smb_share: "default-school/"
diff --git a/roles/lmn_mount/tasks/main.yml b/roles/lmn_mount/tasks/main.yml
index ece685d..edbf515 100644
--- a/roles/lmn_mount/tasks/main.yml
+++ b/roles/lmn_mount/tasks/main.yml
@@ -16,7 +16,7 @@
         fstype="cifs"
         server="{{ smb_server }}"
         path="{{ smb_share }}"
-        mountpoint="/media/%(DOMAIN_USER)/share"
+        mountpoint="/srv/samba/schools/default-school"
         options="sec=krb5i,cruid=%(USERUID),user=%(USER),gid=1010,file_mode=0770,dir_mode=0770"
       ><not><or><user>root</user><user>ansible</user><user>Debian-gdm</user><user>sddm</user><user>virti</user></or></not></volume>
     insertafter: "<!-- Volume definitions -->"
@@ -40,3 +40,4 @@
     opts: sec=krb5p,_netdev,x-systemd.automount,x-systemd.idle-timeout=60
     state: present
     fstype: nfs4
+  when: nfs4
diff --git a/roles/lmn_vm/files/mounthome.sh b/roles/lmn_vm/files/mounthome.sh
index ea3c2d8..685e598 100755
--- a/roles/lmn_vm/files/mounthome.sh
+++ b/roles/lmn_vm/files/mounthome.sh
@@ -1,15 +1,26 @@
 #!/usr/bin/bash
 set -eu
 
-share="$(getent passwd "$SUDO_UID" | cut -d : -f 6 | sed 's/.*default-school//')"
+share="/srv/samba/schools/default-school/share/"
+home="$(getent passwd "$SUDO_UID" | cut -d : -f 6)"
 
-if [ "$#" -gt 0 ] && [ "$1" = '-u' ]; then
-    umount "/media/${SUDO_USER}/home" && rmdir "/media/${SUDO_USER}/home"
+if [[ "$#" -gt 0 ]] && [[ "$1" = '-u' ]]; then
+    [[ -d "/media/${SUDO_USER}/home" ]] && umount "/media/${SUDO_USER}/home" && rmdir "/media/${SUDO_USER}/home"
+    [[ -d "/media/${SUDO_USER}/share" ]] && umount "/media/${SUDO_USER}/share" && rmdir "/media/${SUDO_USER}/share"
+    [[ -d "/media/${SUDO_USER}/oldhome" ]] && umount "/media/${SUDO_USER}/oldhome" && rmdir "/media/${SUDO_USER}/oldhome"
+elif [ "$#" -gt 0 ] && [ "$1" = '-o' ]; then
+    read -p "Username: " username
+    read -s -p "Passwort: " PASSWD
+    export PASSWD
+    mkdir -p "/media/${SUDO_USER}/oldhome"
+    mount -t cifs -o "username=${username},uid=${SUDO_UID},gid=1010,file_mode=0770,dir_mode=0770,forceuid,forcegid" \
+          "//192.168.1.2/DOCS/fvs" "/media/${SUDO_USER}/oldhome"
 else
+    mkdir -p "/media/${SUDO_USER}"
     chgrp 1010 "/media/${SUDO_USER}"
     chmod 0770 "/media/${SUDO_USER}"
     mkdir -p "/media/${SUDO_USER}/home"
-    mount -t cifs -o "sec=krb5i,cruid=${SUDO_UID},username=${SUDO_USER},uid=${SUDO_UID},\
-gid=1010,file_mode=0770,dir_mode=0770,forceuid,forcegid,user=${SUDO_USER}" \
-	  "//server/default-school/${share}" "/media/${SUDO_USER}/home"
+    mkdir -p "/media/${SUDO_USER}/share"
+    mount --bind "${share}" "/media/${SUDO_USER}/share"
+    mount --bind "${home}" "/media/${SUDO_USER}/home"
 fi
diff --git a/roles/lmn_vm/tasks/main.yml b/roles/lmn_vm/tasks/main.yml
index d013156..1d838ad 100644
--- a/roles/lmn_vm/tasks/main.yml
+++ b/roles/lmn_vm/tasks/main.yml
@@ -108,6 +108,7 @@
     rsync://server:/vmimages-download/xml /var/lib/libvirt/images/
   register: result
   changed_when: result.stdout | length > 0
+  when: not run_in_installer | default(false) | bool
 
 - name: rsync VM images
   command: >
diff --git a/roles/up2date_debian/tasks/main.yml b/roles/up2date_debian/tasks/main.yml
index 3d7ba68..013d8d2 100644
--- a/roles/up2date_debian/tasks/main.yml
+++ b/roles/up2date_debian/tasks/main.yml
@@ -24,7 +24,9 @@
 
 - name: add {{ ansible_distribution_release }}-backports
   apt_repository:
-    repo: deb http://deb.debian.org/debian/ {{ ansible_distribution_release }}-backports main contrib non-free
+    repo: >
+      deb http://deb.debian.org/debian/ {{ ansible_distribution_release }}-backports
+      main contrib non-free-firmware non-free
     state: present
     update_cache: true
   when: extra_pkgs_bpo|length