diff --git a/main.yml b/main.yml
index 6ce3a97..14b4704 100644
--- a/main.yml
+++ b/main.yml
@@ -7,6 +7,8 @@
   - role: roles/debian
     tags: [debian]
     when: ansible_os_family == 'Debian'
+  - role: roles/ssh
+    tags: [ssh]
   tasks:
   - name: Dump hostvars
     tags: [never, dump]
@@ -19,30 +21,3 @@
       dest: "{{ lookup('env', 'HOME') }}/.local/bin/fly"
       mode: "u=rwx,g=rx,o=rx"
 
-  - name: Ensure ssh keypair
-    tags: [ssh]
-    openssh_keypair:
-      path: "{{ lookup('env', 'HOME') }}/.ssh/id_ed25519"
-      type: ed25519
-      regenerate: full_idempotence
-
-  - name: Ensure ssh key on github
-    tags: [ssh,git]
-    github_key:
-      name: "{{ lookup('env', 'USER') }}@{{ hostname }}"
-      token: "{{ github_token }}"
-      pubkey: "{{ lookup('file', lookup('env', 'HOME') ~ '/.ssh/id_ed25519.pub') }}"
-
-  - name: Ensure ssh key on gitea
-    tags: [ssh, git]
-    github_key:
-      name: "{{ lookup('env', 'USER') }}@{{ hostname }}"
-      token: "{{ gitea_token }}"
-      pubkey: "{{ lookup('file', lookup('env', 'HOME') ~ '/.ssh/id_ed25519.pub') }}"
-      api_url: "{{ gitea_api_url }}"
-
-  - name: Ensure dotfiles directory
-    tags: [dotfiles]
-    git:
-      repo: git@gitea.nehrke.info:nemoinho/dotfiles.git
-      dest: "{{ lookup('env', 'HOME') ~ '/dotfiles' }}"
diff --git a/roles/ssh/tasks/main.yml b/roles/ssh/tasks/main.yml
new file mode 100644
index 0000000..f948406
--- /dev/null
+++ b/roles/ssh/tasks/main.yml
@@ -0,0 +1,18 @@
+- name: Ensure ssh keypair
+  openssh_keypair:
+    path: "{{ lookup('env', 'HOME') }}/.ssh/id_ed25519"
+    type: ed25519
+    regenerate: full_idempotence
+
+- name: Ensure ssh key on github
+  github_key:
+    name: "{{ lookup('env', 'USER') }}@{{ hostname }}"
+    token: "{{ github_token }}"
+    pubkey: "{{ lookup('file', lookup('env', 'HOME') ~ '/.ssh/id_ed25519.pub') }}"
+
+- name: Ensure ssh key on gitea
+  github_key:
+    name: "{{ lookup('env', 'USER') }}@{{ hostname }}"
+    token: "{{ gitea_token }}"
+    pubkey: "{{ lookup('file', lookup('env', 'HOME') ~ '/.ssh/id_ed25519.pub') }}"
+    api_url: "{{ gitea_api_url }}"