diff --git a/kiosk_mkhome.yml b/fvs_mkhome.yml
similarity index 87%
rename from kiosk_mkhome.yml
rename to fvs_mkhome.yml
index 1dbaa39..9b1ddeb 100644
--- a/kiosk_mkhome.yml
+++ b/fvs_mkhome.yml
@@ -6,9 +6,6 @@
   remote_user: ansible
   become: yes
   vars:
-    auto_user: debi
-    wifi_ssid: "YOUR SSID HERE"
-    wifi_passwd: "YOUR WIFI-PW HERE"
     extra_pkgs:
       - webext-privacy-badger
       - webext-ublock-origin
@@ -39,5 +36,4 @@
     ## Choose either gnome or KDE:
     - gnome
     #- kde
-    - kiosk
     - fvs-client-mkhome
diff --git a/roles/fvs-client-mkhome/handlers/main.yml b/roles/fvs-client-mkhome/handlers/main.yml
index 938f2c4..f334f3a 100644
--- a/roles/fvs-client-mkhome/handlers/main.yml
+++ b/roles/fvs-client-mkhome/handlers/main.yml
@@ -6,3 +6,13 @@
   systemd:
     daemon_reload: yes
   listen: "reload systemd"
+
+- name: run update-grub
+  command: update-grub
+  listen: update grub
+
+- name: enable tmp.mount
+  systemd:
+    daemon_reload: yes
+    name: tmp.mount
+    enabled: yes
diff --git a/roles/fvs-client-mkhome/tasks/main.yml b/roles/fvs-client-mkhome/tasks/main.yml
index a435c42..1148859 100644
--- a/roles/fvs-client-mkhome/tasks/main.yml
+++ b/roles/fvs-client-mkhome/tasks/main.yml
@@ -69,3 +69,26 @@
     dest: /etc/sssd/sssd.conf
     mode: 0600
   notify: restart sssd
+
+################# from kiosk.yml ##################
+
+- name: grub timeout
+  lineinfile:
+    dest: /etc/default/grub
+    regexp: '^(GRUB_TIMEOUT=).*'
+    line: '\g<1>1'
+    backrefs: yes
+  notify: update grub
+
+- name: keyboard compose key
+  lineinfile:
+    dest: /etc/default/keyboard
+    regexp: '^(XKBOPTIONS=).*'
+    line: '\1"compose:caps"'
+    backrefs: yes
+
+- name: tmp on tmpfs
+  shell: cp /usr/share/systemd/tmp.mount /etc/systemd/system/
+  args:
+    creates: /etc/systemd/system/tmp.mount
+  notify: enable tmp.mount