diff --git a/bin/controller.ssh.entrypoint.sh b/bin/controller.ssh.entrypoint.sh
index 53846fd1..11a5c850 100755
--- a/bin/controller.ssh.entrypoint.sh
+++ b/bin/controller.ssh.entrypoint.sh
@@ -47,9 +47,19 @@ fi
 ## Specific Command, pipe into container.
 if [[ "x${SSH_ORIGINAL_COMMAND}" != "x" ]]; then
 
-  echo "[$(date)] Have SSH session using command: [docker $CONNECTION_STRING /bin/bash -c ${SSH_ORIGINAL_COMMAND})] for [${USER}] For from [${API_REQUEST_URL}]." >> /var/log/sshd.log
+  if [ -z "${API_REQUEST_URL}" ]; then
+    echo "[$(date)] Have SSH session using command: [kubectl exec -n $CONNECTION_STRING -ti -- ${SSH_ORIGINAL_COMMAND})] for [${USER}] from [${SSH_CLIENT}]." >> /var/log/sshd.log
+  else
+    echo "[$(date)] Have SSH session using command: [kubectl exec -n $CONNECTION_STRING -ti -- ${SSH_ORIGINAL_COMMAND})] for [${USER}] from [${API_REQUEST_URL}]." >> /var/log/sshd.log
+  fi
+
+  ##/usr/local/bin/kubectl exec ${_SERVICE} -ti -- "${SSH_ORIGINAL_COMMAND}"
+  __commad="/usr/local/bin/kubectl exec -n $CONNECTION_STRING -i -- $SSH_ORIGINAL_COMMAND"
+  
+  echo $__commad >> /var/log/sshd.log
+
+  $__commad;
 
-  /usr/local/bin/kubectl exec ${_SERVICE} -ti -- "${SSH_ORIGINAL_COMMAND}"
 fi;
 
 ## Terminal, pipe into container.
diff --git a/changes.md b/changes.md
index d22b8227..28e77156 100644
--- a/changes.md
+++ b/changes.md
@@ -1,3 +1,6 @@
+### 0.6.2
+* added changes to controller.ssh.entrypoint. Fixes for exec command
+
 ### 0.6.1
 * added changes to fix startup warnings
 
diff --git a/package.json b/package.json
index 3510412a..9dd0edb0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "docker-sftp",
-    "version": "0.6.1",
+    "version": "0.6.2",
     "description": "SSH tunnels to Kubernetes containers",
     "main": "bin/server.js",
     "scripts": {