diff --git a/ssh/manifests/init.pp b/ssh/manifests/init.pp
index 166fdef..a8947b9 100644
--- a/ssh/manifests/init.pp
+++ b/ssh/manifests/init.pp
@@ -12,13 +12,10 @@ class ssh::known_hosts {
         },
     }
 
-    $shortname = inline_template("<%= homename.split('.')[0] %>")
-
-    if $::ec2_public_ipv4 {
-        $aliases = [ $shortname, $::ipaddress, $::ec2_public_ipv4 ]
-    } else {
-        $aliases = [ $shortname, $::ipaddress ]
-    }
+    $aliases = merge(inline_template("<%= homename.split('.')[0] %>"),
+                     $::ipaddress,
+                     $::ipaddress6,
+                     $::ec2_public_ipv4)
 
     @@sshkey { $homename:
         ensure       => present,