diff --git a/sunbeam-python/sunbeam/commands/prepare_node.py b/sunbeam-python/sunbeam/commands/prepare_node.py
index 0caf8a0a8..8d36bdcd8 100644
--- a/sunbeam-python/sunbeam/commands/prepare_node.py
+++ b/sunbeam-python/sunbeam/commands/prepare_node.py
@@ -69,9 +69,16 @@
 newgrp snap_daemon
 
 # Generate keypair and set-up prompt-less access to local machine
-[ -f $HOME/.ssh/id_rsa ] || ssh-keygen -b 4096 -f $HOME/.ssh/id_rsa -t rsa -N ""
-cat $HOME/.ssh/id_rsa.pub >> $HOME/.ssh/authorized_keys
+[ -f $HOME/.ssh/id_rsa_snap-openstack ] || \
+  ssh-keygen -b 4096 -f $HOME/.ssh/id_rsa_snap-openstack -t rsa -N ""
+cat $HOME/.ssh/id_rsa_snap-openstack.pub >> $HOME/.ssh/authorized_keys
 ssh-keyscan -H $(hostname --all-ip-addresses) >> $HOME/.ssh/known_hosts
+[ -f $HOME/.ssh/config ] || \
+  ( touch $HOME/.ssh/config ; chmod 0600 $HOME/.ssh/config )
+cat >> $HOME/.ssh/config <<EOF
+Host $( hostname --all-ip-addresses | paste -s )
+  IdentityFile ~/.ssh/id_rsa_snap-openstack
+EOF
 
 # Install the Juju snap
 sudo snap install --channel {JUJU_CHANNEL} juju