diff --git a/roles/sshd_cert/defaults/main.yml b/roles/sshd_cert/defaults/main.yml
new file mode 100644
index 0000000..79b179b
--- /dev/null
+++ b/roles/sshd_cert/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+sshd_cert_hostnames: "{{ ssh_hostnames | default([]) + [inventory_hostname] }}"
diff --git a/roles/sshd_cert/tasks/main.yml b/roles/sshd_cert/tasks/main.yml
index 4852748..fea0499 100644
--- a/roles/sshd_cert/tasks/main.yml
+++ b/roles/sshd_cert/tasks/main.yml
@@ -15,7 +15,7 @@
       - "{{ inventory_hostname }}"
       - -h
       - -n
-      - "{{ inventory_hostname }}"
+      - "{{ sshd_cert_hostnames | join(',') }}"
       - -V
       - -1h:+365d
       - -z