diff --git a/tasks/fish.yml b/tasks/fish.yml
new file mode 100644
index 0000000..038943d
--- /dev/null
+++ b/tasks/fish.yml
@@ -0,0 +1,27 @@
+---
+
+- name: fish package
+  package:
+    name: fish
+
+- name: fish config directory
+  file:
+    path: /root/.config/fish/conf.d/
+    state: directory
+
+- name: fish config files
+  template:
+    src: "{{ item }}.fish.j2"
+    dest: /root/.config/fish/conf.d/{{ item }}.fish
+  with_items:
+    - root-shell-aliases
+
+- name: fish shell
+  user:
+    name: root
+    shell: /usr/bin/fish
+
+- name: fetch fish history
+  fetch:
+    src: /root/.local/share/fish/fish_history
+    dest: host_files
diff --git a/tasks/main.yml b/tasks/main.yml
index 37c31b6..3ea65e6 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,44 +1,11 @@
 ---
 
-- name: fish package
-  package:
-    name: fish
-
-- name: fish config directory
-  file:
-    path: /root/.config/fish/conf.d/
-    state: directory
-
-- name: fish config files
-  template:
-    src: "{{ item }}.fish.j2"
-    dest: /root/.config/fish/conf.d/{{ item }}.fish
-  with_items:
-    - root-shell-aliases
-
-- name: fish shell
-  user:
-    name: root
-    shell: /usr/bin/fish
-
-- name: fetch fish history
-  fetch:
-    src: /root/.local/share/fish/fish_history
-    dest: host_files
-
-- name: ssh key
-  user:
-    name: root
-    generate_ssh_key: yes
-    ssh_key_type: ed25519
-  when: root_ssh_key
-
 - name: password
   user:
     name: root
     password: "{{ root_password }}"
   when: root_password is defined
 
-- file:
-   path: /root/.config/fish/conf.d/title.fish
-   state: absent
+- include: ssh.yml
+
+- include: fish.yml
diff --git a/tasks/ssh.yml b/tasks/ssh.yml
new file mode 100644
index 0000000..ef29461
--- /dev/null
+++ b/tasks/ssh.yml
@@ -0,0 +1,14 @@
+---
+
+- name: ssh key
+  user:
+    name: root
+    generate_ssh_key: yes
+    ssh_key_type: ed25519
+  when: root_ssh_key
+
+- name: ssh authorized keys
+  template:
+    src: ssh_authorized_keys.j2
+    dest: /root/.ssh/authorized_keys
+  when: root_ssh_authorized_keys is defined
diff --git a/templates/ssh_authorized_keys.j2 b/templates/ssh_authorized_keys.j2
new file mode 100644
index 0000000..74fcb57
--- /dev/null
+++ b/templates/ssh_authorized_keys.j2
@@ -0,0 +1,3 @@
+{% for  key in users[item].authorized_keys %}
+{{ key }}
+{% endfor %}