diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
index 45b5cfde16..2efa9eb09d 100644
--- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
@@ -232,6 +232,9 @@
     when: packstack_sucessfully_finished.stat.exists == False
   - file: path=/etc/packstack_sucessfully_finished state=touch
 
+  - name: Set shell to nova user to allow cold migrations
+    user: name=nova shell=/bin/bash
+
   # FIXME we should really reboot here
 
   # http://docs.openstack.org/icehouse/install-guide/install/yum/content/basics-queue.html
diff --git a/roles/cloud_compute/tasks/main.yml b/roles/cloud_compute/tasks/main.yml
index c08e3cb5f2..39ab69ad44 100644
--- a/roles/cloud_compute/tasks/main.yml
+++ b/roles/cloud_compute/tasks/main.yml
@@ -285,6 +285,13 @@
   notify:
     - restart openstack-nova-compute
 
+- name: Set shell to nova user to allow cold migrations
+  user: name=nova shell=/bin/bash
+- name: SSH public key for nova user
+  authorized_key: user=nova key="{{fed_cloud09_nova_public_key}}"
+- name: Deploy private SSH key
+  copy: src={{ private }}/files/openstack/fed-cloud09-nova.key dest=/var/lib/nova/.ssh/ mode=600 owner=nova group=nova
+
 # This needs to be run after controller reprovision
 - name: "restart neutron-openvswitch-agent"
   service: name=neutron-openvswitch-agent state=restarted