diff --git a/nova/compute.sls b/nova/compute.sls
index fdb8cec..97ec305 100644
--- a/nova/compute.sls
+++ b/nova/compute.sls
@@ -40,18 +40,13 @@
 
 {%- if compute.user is defined %}
 
-user_nova:
-  user.present:
-  - name: nova
-  - shell: /bin/bash
-
 nova_auth_keys:
   ssh_auth.present:
   - user: nova
   - names:
     - {{ compute.user.public_key }}
 
-user_nova:
+user_nova_bash:
   user.present:
   - name: nova
   - home: /var/lib/nova
@@ -65,6 +60,14 @@
   - require:
     - pkg: nova_compute_packages
 
+/var/lib/nova/.ssh/config:
+  file.managed:
+  - user: nova
+  - contents: StrictHostKeyChecking no
+  - mode: 400
+  - require:
+    - pkg: nova_compute_packages
+
 {# Find other compute nodes, add their host keys into known_hosts #}
 {%- for node_name, node_grains in salt['mine.get']('*', 'grains.items').iteritems() %}
 {%- if 'nova.compute' in node_grains.get('roles', []) %}