diff --git a/Dockerfile b/Dockerfile
index 8e3f0a1..420074c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,8 @@
 
 # Build ONOS
 WORKDIR /src
-RUN     apt-get update && apt-get install -y python less zip curl oracle-java8-installer oracle-java8-set-default && \
+RUN     apt-get update && \
+        apt-get install -y python less zip curl oracle-java8-installer oracle-java8-set-default ssh && \
         cd onos && \
         tools/build/onos-buck build onos && \
         cp buck-out/gen/tools/package/onos-package/onos.tar.gz /tmp/ && \
diff --git a/tools/package/bin/onos-user-key b/tools/package/bin/onos-user-key
index 8715a58..ec496f6 100755
--- a/tools/package/bin/onos-user-key
+++ b/tools/package/bin/onos-user-key
@@ -23,7 +23,8 @@
     echo "$user=$key,_g_:admingroup" >> $KEYS
 fi
 
-# ensure known_hosts file exist
+# ensure .ssh directory and known_hosts file exist
+mkdir -p $HOME/.ssh/
 (umask 077; touch "$HOME/.ssh/known_hosts")
 
 # Also, remove any previous known keys for the localhost.