diff --git a/manifests/hostkeys.pp b/manifests/hostkeys.pp
index 19d05cec..421bb090 100644
--- a/manifests/hostkeys.pp
+++ b/manifests/hostkeys.pp
@@ -51,9 +51,9 @@
   if $export_ipaddresses == true {
     $ipaddresses = ssh::ipaddresses($exclude_interfaces, $exclude_interfaces_re)
     $ipaddresses_real = $ipaddresses - $exclude_ipaddresses
-    $host_aliases = sort(unique(flatten([$fqdn_real, $hostname_real, $extra_aliases, $ipaddresses_real])))
+    $host_aliases = sort(unique(flatten([$hostname_real, $extra_aliases, $ipaddresses_real])))
   } else {
-    $host_aliases = sort(unique(flatten([$fqdn_real, $hostname_real, $extra_aliases])))
+    $host_aliases = sort(unique(flatten([$hostname_real, $extra_aliases])))
   }
 
   $storeconfigs_groups = $storeconfigs_group ? {
@@ -77,6 +77,7 @@
     if $key_type in $facts['ssh'] {
       @@sshkey { "${fqdn_real}_${key_type}":
         ensure       => present,
+        name         => $fqdn_real,
         host_aliases => $host_aliases,
         type         => $facts['ssh'][$key_type]['type'],
         key          => $facts['ssh'][$key_type]['key'],