diff --git a/roles/base_setup/tasks/main.yml b/roles/base_setup/tasks/main.yml
index 305c252..5da0fe5 100644
--- a/roles/base_setup/tasks/main.yml
+++ b/roles/base_setup/tasks/main.yml
@@ -176,13 +176,13 @@
   become: yes
   tags: [deploy_base, users]
 
-- name: Add authorized keys for zailon
-  authorized_key:
-    user: zailon
-    state: present
-    key: "{{ item }}"
-    exclusive: yes
-  loop: "{{ ssh_public_keys }}"
+- name: Deploy authorized_keys for zailon
+  copy:
+    content: "{{ ssh_public_keys | join('\n') }}\n"
+    dest: /home/zailon/.ssh/authorized_keys
+    owner: zailon
+    group: zailon
+    mode: '0600'
   become: yes
   tags: [deploy_base, users]