diff --git a/tools/package/onos-run-karaf b/tools/package/onos-run-karaf
index bb818e3..d7a7bd4 100755
--- a/tools/package/onos-run-karaf
+++ b/tools/package/onos-run-karaf
@@ -47,8 +47,11 @@
     cd $ONOS_DIR
     export ONOS_HOME=$PWD
 
-    # FIXME: for now we're running using the karaf client; later use raw SSH
-    unset ONOS_USE_SSH
+    # Run using the secure SSH client
+    export ONOS_USE_SSH=true
+    [ ! -f ~/.ssh/id_rsa.pub ] && ssh-keygen -t rsa -f ~/.ssh/id_rsa -P '' -q
+    $ONOS_HOME/bin/onos-user-key $(id -un) "$(cut -d\  -f2 ~/.ssh/id_rsa.pub)"
+    $ONOS_HOME/bin/onos-secure-ssh -u onos -p rocks
 
     # Create config/cluster.json (cluster metadata)
     IP=${ONOS_IP:-127.0.0.1}