diff --git a/host_files/caladan/ssh_host_ed25519_key b/host_files/ssh/caladan/ssh_host_ed25519_key
similarity index 100%
rename from host_files/caladan/ssh_host_ed25519_key
rename to host_files/ssh/caladan/ssh_host_ed25519_key
diff --git a/host_files/caladan/ssh_host_ed25519_key-cert.pub b/host_files/ssh/caladan/ssh_host_ed25519_key-cert.pub
similarity index 100%
rename from host_files/caladan/ssh_host_ed25519_key-cert.pub
rename to host_files/ssh/caladan/ssh_host_ed25519_key-cert.pub
diff --git a/host_files/caladan/ssh_host_ed25519_key.pub b/host_files/ssh/caladan/ssh_host_ed25519_key.pub
similarity index 100%
rename from host_files/caladan/ssh_host_ed25519_key.pub
rename to host_files/ssh/caladan/ssh_host_ed25519_key.pub
diff --git a/host_files/fugu/ssh_host_ed25519_key b/host_files/ssh/fugu/ssh_host_ed25519_key
similarity index 100%
rename from host_files/fugu/ssh_host_ed25519_key
rename to host_files/ssh/fugu/ssh_host_ed25519_key
diff --git a/host_files/fugu/ssh_host_ed25519_key-cert.pub b/host_files/ssh/fugu/ssh_host_ed25519_key-cert.pub
similarity index 100%
rename from host_files/fugu/ssh_host_ed25519_key-cert.pub
rename to host_files/ssh/fugu/ssh_host_ed25519_key-cert.pub
diff --git a/host_files/fugu/ssh_host_ed25519_key.pub b/host_files/ssh/fugu/ssh_host_ed25519_key.pub
similarity index 100%
rename from host_files/fugu/ssh_host_ed25519_key.pub
rename to host_files/ssh/fugu/ssh_host_ed25519_key.pub
diff --git a/host_files/narwhal/ssh_host_ed25519_key b/host_files/ssh/narwhal/ssh_host_ed25519_key
similarity index 100%
rename from host_files/narwhal/ssh_host_ed25519_key
rename to host_files/ssh/narwhal/ssh_host_ed25519_key
diff --git a/host_files/narwhal/ssh_host_ed25519_key-cert.pub b/host_files/ssh/narwhal/ssh_host_ed25519_key-cert.pub
similarity index 100%
rename from host_files/narwhal/ssh_host_ed25519_key-cert.pub
rename to host_files/ssh/narwhal/ssh_host_ed25519_key-cert.pub
diff --git a/host_files/narwhal/ssh_host_ed25519_key.pub b/host_files/ssh/narwhal/ssh_host_ed25519_key.pub
similarity index 100%
rename from host_files/narwhal/ssh_host_ed25519_key.pub
rename to host_files/ssh/narwhal/ssh_host_ed25519_key.pub
diff --git a/host_files/snitch/ssh_host_ed25519_key b/host_files/ssh/snitch/ssh_host_ed25519_key
similarity index 100%
rename from host_files/snitch/ssh_host_ed25519_key
rename to host_files/ssh/snitch/ssh_host_ed25519_key
diff --git a/host_files/snitch/ssh_host_ed25519_key-cert.pub b/host_files/ssh/snitch/ssh_host_ed25519_key-cert.pub
similarity index 100%
rename from host_files/snitch/ssh_host_ed25519_key-cert.pub
rename to host_files/ssh/snitch/ssh_host_ed25519_key-cert.pub
diff --git a/host_files/snitch/ssh_host_ed25519_key.pub b/host_files/ssh/snitch/ssh_host_ed25519_key.pub
similarity index 100%
rename from host_files/snitch/ssh_host_ed25519_key.pub
rename to host_files/ssh/snitch/ssh_host_ed25519_key.pub
diff --git a/roles/sshd/tasks/certs.yml b/roles/sshd/tasks/certs.yml
index 06c6a82..916f0a7 100644
--- a/roles/sshd/tasks/certs.yml
+++ b/roles/sshd/tasks/certs.yml
@@ -1,21 +1,21 @@
 ---
 - name: ssh_host_ed25519_key-cert.pub
   copy:
-    src: "host_files/{{ ansible_hostname }}/ssh_host_ed25519_key-cert.pub"
+    src: "host_files/ssh/{{ ansible_hostname }}/ssh_host_ed25519_key-cert.pub"
     dest: "/etc/ssh/ssh_host_ed25519_key-cert.pub"
     mode: '0644'
     owner: root
 
 - name: ssh_host_ed25519_key.pub
   copy:
-    src: "host_files/{{ ansible_hostname }}/ssh_host_ed25519_key.pub"
+    src: "host_files/ssh/{{ ansible_hostname }}/ssh_host_ed25519_key.pub"
     dest: "/etc/ssh/ssh_host_ed25519_key.pub"
     mode: '0644'
     owner: root
 
 - name: ssh_host_ed25519_key
   copy:
-    src: "host_files/{{ ansible_hostname }}/ssh_host_ed25519_key"
+    src: "host_files/ssh/{{ ansible_hostname }}/ssh_host_ed25519_key"
     dest: "/etc/ssh/ssh_host_ed25519_key"
     mode: '0600'
     owner: root