diff --git a/nova/compute.sls b/nova/compute.sls
index 78c6206..225076e 100644
--- a/nova/compute.sls
+++ b/nova/compute.sls
@@ -59,11 +59,11 @@
 {%- for node_name, node_grains in salt['mine.get']('*', 'grains.items').iteritems() %}
 {%- if 'nova.compute' in node_grains.get('roles', []) %}
 
-{%- for key_type, key_fingerprint in node_grains.get('ssh_fingerprints', {}) %}
+{%- for key_type, key_fingerprint in node_grains.get('ssh_fingerprints', {}).iteritems() %}
 nova_known_hosts_{{ key_type }}_{{ node_name }}:
   ssh_known_hosts.present:
   - user: nova
-  - name: {{ node_name }}
+  - name: {{ node_grains.ipv4.1 }}
   - enc: {{ key_type }}
   - fingerprint: {{ key_fingerprint }}
   - require: