diff --git a/roles/basessh/tasks/main.yml b/roles/basessh/tasks/main.yml
index e394d95968..ed099a6f2d 100644
--- a/roles/basessh/tasks/main.yml
+++ b/roles/basessh/tasks/main.yml
@@ -122,7 +122,7 @@
 # TODO: Get expired certificates, and add them to certs_to_sign
 
 - set_fact:
-    pubkeydir: "/tmp/sshkeysign"
+    pubkeydir: "/tmp/sshkeysign/{{inventory_hostname}}"
   tags:
   - basessh
   - sshd_cert