diff --git a/fvs-client.yml b/fvs-client.yml
index e01b871..a363e7f 100644
--- a/fvs-client.yml
+++ b/fvs-client.yml
@@ -33,8 +33,9 @@
 
   roles:
     - up2date-debian
+    - fvs-sssd
+    - fvs-mount
+    - fvs-client
     ## Choose either gnome or KDE:
     - gnome
     #- kde
-    - fvs-mkhome
-    - fvs-client
diff --git a/fvs-home.yml b/fvs-home.yml
new file mode 100644
index 0000000..20aafa8
--- /dev/null
+++ b/fvs-home.yml
@@ -0,0 +1,20 @@
+---
+- name: apply configuration to the home server
+  hosts: all
+  remote_user: ansible
+  become: yes
+  vars:
+    extra_pkgs:
+      - vim
+    extra_pkgs_bpo: [ ]  # [ libreoffice ]
+
+  roles:
+    - up2date-debian
+    - fvs-sssd
+
+  tasks:
+    - name: enable pam_mkhomedir.so
+      lineinfile:
+        dest: /etc/pam.d/common-session
+        line: "session	optional	pam_mkhomedir.so  umask=0027"
+        insertbefore: "session	optional	pam_mount.so"
diff --git a/roles/fvs-client/tasks/main.yml b/roles/fvs-client/tasks/main.yml
index 2473b81..16ea639 100644
--- a/roles/fvs-client/tasks/main.yml
+++ b/roles/fvs-client/tasks/main.yml
@@ -4,11 +4,6 @@
     dest: /etc/firefox-esr/firefox-esr.js
     line: pref("browser.startup.homepage", "https://www.startpage.com");
 
-    #- name: enable pam_umask
-    #  lineinfile:
-    #    dest: /etc/pam.d/common-session
-    #    line: "session optional	pam_umask.so usergroups"
-
 - name: set capabilities (wireshark)
   capabilities:
     path: /usr/bin/dumpcap
diff --git a/roles/fvs-mkhome/tasks/main.yml b/roles/fvs-mkhome/tasks/main.yml
deleted file mode 100644
index f7b9724..0000000
--- a/roles/fvs-mkhome/tasks/main.yml
+++ /dev/null
@@ -1,79 +0,0 @@
----
-- name: install needed packages
-  apt:
-    name:
-      - sssd-ldap
-      - libpam-mount
-      - cifs-utils
-    state: latest
-
-- name: add URI to ldap.conf
-  lineinfile:
-    dest: /etc/ldap/ldap.conf
-    line: "URI ldaps://{{ ldap_server }}/"
-    insertafter: "#URI.*"
-
-- name: add BASE to ldap.conf
-  lineinfile:
-    dest: /etc/ldap/ldap.conf
-    line: "BASE {{ basedn }}"
-    insertafter: "#BASE.*"
-
-- name: do not verify cert
-  lineinfile:
-    dest: /etc/ldap/ldap.conf
-    line: "LDAPTLS_REQCERT      never"
-
-    #- name: enable pam_umask
-    #  lineinfile:
-    #    dest: /etc/pam.d/common-session
-    #    line: "session optional	pam_umask.so usergroups"
-
-- name: enable pam_mkhomedir.so
-  lineinfile:
-    dest: /etc/pam.d/common-session
-    line: "session	optional	pam_mkhomedir.so  umask=0027"
-    insertbefore: "session	optional	pam_mount.so"
-
-- name: configure pam_mount
-  blockinfile:
-    dest: /etc/security/pam_mount.conf.xml
-    block: |
-      <volume
-        fstype="cifs"
-        server="{{ smb_server }}"
-        path="{{ smb_home }}"
-        mountpoint="/media/%(USER)/winhome"
-        options="dir_mode=0750,file_mode=0640"
-      ><not><user>ansible</user></not></volume>
-      <volume
-        fstype="cifs"
-        server="{{ smb_server }}"
-        path="{{ smb_share }}"
-        mountpoint="/media/%(USER)/winshare"
-        options="dir_mode=0750,file_mode=0640"
-      ><not><user>ansible</user></not></volume>
-      <!--volume
-        fstype="fuse"
-        path="sshfs#%(USER)@homes:"
-        mountpoint="/home/%(USER)"
-        options="StrictHostKeyChecking=no,allow_root"
-      ><not><user>ansible</user></not></volume>
-      <volume
-        path="/home/%(USER)"
-        mountpoint="~"
-        options="bind"
-      /-->
-    insertafter: "<!-- Volume definitions -->"
-
-- name: provide identities from directory
-  template:
-    src: sssd.conf.j2
-    dest: /etc/sssd/sssd.conf
-    mode: 0600
-  notify: restart sssd
-
-  ## FIXME: preseeding grub nvram does not work
-- name: reset boot order
-  command: efibootmgr --delete-bootorder
-  when: run_in_installer|default(false)|bool
diff --git a/roles/fvs-mkhome/defaults/main.yml b/roles/fvs-mount/defaults/main.yml
similarity index 52%
rename from roles/fvs-mkhome/defaults/main.yml
rename to roles/fvs-mount/defaults/main.yml
index 26a03ba..775517a 100644
--- a/roles/fvs-mkhome/defaults/main.yml
+++ b/roles/fvs-mount/defaults/main.yml
@@ -1,5 +1,4 @@
-basedn: "ou=Benutzer,ou=fvs,ou=SCHULEN,o=ml3"
-ldap_server: "ldap.steinbeisschule-reutlingen.de"
 smb_server: "smb.steinbeisschule-reutlingen.de"
+home_server: "home.steinbeisschule-reutlingen.de"
 smb_home: "DOCS/fvs/home/"
 smb_share: "DOCS/fvs/tausch/"
diff --git a/roles/fvs-mount/tasks/main.yml b/roles/fvs-mount/tasks/main.yml
new file mode 100644
index 0000000..b27192e
--- /dev/null
+++ b/roles/fvs-mount/tasks/main.yml
@@ -0,0 +1,35 @@
+---
+- name: install needed packages
+  apt:
+    name:
+      - libpam-mount
+      - cifs-utils
+      - sshfs
+    state: latest
+
+- name: configure pam_mount
+  blockinfile:
+    dest: /etc/security/pam_mount.conf.xml
+    block: |
+      <volume
+        fstype="cifs"
+        server="{{ smb_server }}"
+        path="{{ smb_home }}"
+        mountpoint="/media/%(USER)/winhome"
+        options="dir_mode=0750,file_mode=0640"
+      ><not><or><user>ansible</user><user>Debian-gdm</user></or></not></volume>
+      <volume
+        fstype="cifs"
+        server="{{ smb_server }}"
+        path="{{ smb_share }}"
+        mountpoint="/media/%(USER)/winshare"
+        options="dir_mode=0750,file_mode=0640"
+      ><not><or><user>ansible</user><user>Debian-gdm</user></or></not></volume>
+      <volume
+        fstype="fuse"
+        path="sshfs#%(USER)@{{ home_server }}:"
+        mountpoint="/home/%(USER)"
+        options="allow_other,default_permissions,reconnect,password_stdin"
+        ssh="0" noroot="0"
+      ><not><or><user>ansible</user><user>Debian-gdm</user></or></not></volume>
+    insertafter: "<!-- Volume definitions -->"
diff --git a/roles/fvs-sssd/defaults/main.yml b/roles/fvs-sssd/defaults/main.yml
new file mode 100644
index 0000000..dd40e38
--- /dev/null
+++ b/roles/fvs-sssd/defaults/main.yml
@@ -0,0 +1,2 @@
+basedn: "ou=Benutzer,ou=fvs,ou=SCHULEN,o=ml3"
+ldap_server: "ldap.steinbeisschule-reutlingen.de"
diff --git a/roles/fvs-mkhome/handlers/main.yml b/roles/fvs-sssd/handlers/main.yml
similarity index 100%
rename from roles/fvs-mkhome/handlers/main.yml
rename to roles/fvs-sssd/handlers/main.yml
diff --git a/roles/fvs-sssd/tasks/main.yml b/roles/fvs-sssd/tasks/main.yml
new file mode 100644
index 0000000..3879cfa
--- /dev/null
+++ b/roles/fvs-sssd/tasks/main.yml
@@ -0,0 +1,30 @@
+---
+- name: install needed packages
+  apt:
+    name:
+      - sssd-ldap
+    state: latest
+
+- name: add URI to ldap.conf
+  lineinfile:
+    dest: /etc/ldap/ldap.conf
+    line: "URI ldaps://{{ ldap_server }}/"
+    insertafter: "#URI.*"
+
+- name: add BASE to ldap.conf
+  lineinfile:
+    dest: /etc/ldap/ldap.conf
+    line: "BASE {{ basedn }}"
+    insertafter: "#BASE.*"
+
+- name: do not verify cert
+  lineinfile:
+    dest: /etc/ldap/ldap.conf
+    line: "LDAPTLS_REQCERT      never"
+
+- name: provide identities from directory
+  template:
+    src: sssd.conf.j2
+    dest: /etc/sssd/sssd.conf
+    mode: 0600
+  notify: restart sssd
diff --git a/roles/fvs-mkhome/templates/sssd.conf.j2 b/roles/fvs-sssd/templates/sssd.conf.j2
similarity index 100%
rename from roles/fvs-mkhome/templates/sssd.conf.j2
rename to roles/fvs-sssd/templates/sssd.conf.j2