diff --git a/install/usr/share/swarmlab.io/sec/swarmlab-sec b/install/usr/share/swarmlab.io/sec/swarmlab-sec
index 18b3a85..19b536f 100755
--- a/install/usr/share/swarmlab.io/sec/swarmlab-sec
+++ b/install/usr/share/swarmlab.io/sec/swarmlab-sec
@@ -122,7 +122,7 @@ cat << EOF > $Wdir/.env
 REGISTRY_ADDR=localhost
 REGISTRY_PORT=5000
 IMAGE_NAME=$HYBRID_NETWORK
-SSH_PORT=$servicesshport
+SSH_PORT=$serviceshport
 R_PORT1=$(EPHEMERAL_PORT)
 R_PORT2=$(EPHEMERAL_PORT)
 R_PORT3=$(EPHEMERAL_PORT)
@@ -569,11 +569,13 @@ generate_ssh_keys ()
 
     echo "$ mkdir -p ssh/ "
     printf "\\n"
+    cd $Wdir
     mkdir -p ssh/
 
     echo "$ ssh-keygen -f ssh/id_rsa -t rsa -N ''"
     printf "\\n"
     ssh-keygen -f ssh/id_rsa -t rsa -N ''
+    cd $cwdir
 }
 
 build_and_push_image ()