diff --git a/so-setup-network.sh b/so-setup-network.sh
index 3014abd39..8edfacfbf 100644
--- a/so-setup-network.sh
+++ b/so-setup-network.sh
@@ -112,9 +112,10 @@ configure_sensor_pillar() {
 
 copy_ssh_key() {
   # Generate and copy SSH key
-  cat /dev/zero | ssh-keygen -f /root/.ssh/so.key -t rsa -q -N ""
+  cat /dev/zero | ssh-keygen -f ~/.ssh/so.key -t rsa -q -N ""
+  chown $SUDO_USER:$SUDO_USER ~/.ssh/so.key*
   #Copy the key over to the master
-  sudo ssh-copy-id -i /root/.ssh/so.key socore@$MASTER
+  sudo ssh-copy-id -i ~/.ssh/so.key socore@$MASTER
 }
 
 create_bond() {