diff --git a/lmn-desktop.yml b/lmn-desktop.yml
index 6237d17..565a49f 100644
--- a/lmn-desktop.yml
+++ b/lmn-desktop.yml
@@ -79,6 +79,7 @@
         append: yes
       when: false
 
+## Temporary fixes and quirks:
     - name: Fix 8086:4909 external graphics card
       replace:
         dest: "/etc/default/grub"
@@ -103,6 +104,25 @@
         ansible_board_vendor == "LENOVO" and
         (ansible_board_name == "312D" or ansible_board_name == "312A")
 
+## Clean up stuff from obsolete/faulty tasks:
+    - name: Remove virtiofs service
+      file:
+        path: /etc/systemd/system/virtiofs@.service
+        state: absent
+
+    - name: Fix mount point permissions and owner
+      file:
+        path: "{{ item }}"
+        mode: '0755'
+        owner: root
+        group: root
+      loop:
+        - /srv/samba
+        - /srv/samba/schools
+        - /srv/samba/schools/default-school
+
+
+
 ## bullseye fixes:
     - name: add bookworm firmware repository if needed
       apt_repository:
diff --git a/roles/lmn_vm/tasks/main.yml b/roles/lmn_vm/tasks/main.yml
index 7d92502..c5821e4 100644
--- a/roles/lmn_vm/tasks/main.yml
+++ b/roles/lmn_vm/tasks/main.yml
@@ -152,11 +152,6 @@
     mode: '0644'
   notify: "enable vmimage-torrent.service"
 
-- name: Remove virtiofs service
-  file:
-    path: /etc/systemd/system/virtiofs@.service
-    state: absent
-
 - name: Deploy bridge.conf needed for qemu session mode
   lineinfile:
     path: /etc/qemu/bridge.conf