diff --git a/roles/fri_base/tasks/main_lin.yml b/roles/fri_base/tasks/main_lin.yml
index 154d6ea..801ade2 100644
--- a/roles/fri_base/tasks/main_lin.yml
+++ b/roles/fri_base/tasks/main_lin.yml
@@ -114,6 +114,8 @@
     name:
       - xfce4-screensaver
       - xscreensaver
+      - thunderbird
+      - kmail
     state: absent
 
 - name: Set up additional groups for students
@@ -217,6 +219,9 @@
     line: greeter-hide-users=true
 
 - name: Copy authorized_keys
-  copy:
-    src: authorized_keys
-    dest: ~/.ssh/authorized_keys
+  become: false
+  ansible.posix.authorized_key:
+    user: "{{ ansible_user }}"
+    key: "{{ lookup('file', 'authorized_keys') }}"
+    state: present
+    exclusive: true