diff --git a/run/scripts/start b/run/scripts/start
index bec088c6deb9da3c964068154a63259b4e53d32c..30cfbad35a04f90f82b11d8c369bfc42ffa462da 100755
--- a/run/scripts/start
+++ b/run/scripts/start
@@ -30,6 +30,7 @@ function getConfig {
 }
 
 function startContainer {
+  SSHAUTHSOCK=${SSHAUTHSOCKORIGIN}
   if [[ -n ${COMPOSE_PROJECT_NAME} ]]; then
     ID=$(docker container ls --all -q -f name=^${COMPOSE_PROJECT_NAME}_l3d$)
     if [[ -n ${ID} ]]; then
diff --git a/setup/scripts/l3d b/setup/scripts/l3d
index 2ec918c87af5af63973b62efb83bb9cd83e15931..e4485b28d6a7b129ffe392fe1ea050d3737783cc 100755
--- a/setup/scripts/l3d
+++ b/setup/scripts/l3d
@@ -12,7 +12,9 @@ case "${L3DHOSTOS}" in
         # This works on MacOS when coreutils is installed.
         SCRIPTPATH="$(dirname "$(greadlink -f "$0")")"
       fi
-      ${SCRIPTPATH}/prepareMac4L3d
+      #${SCRIPTPATH}/prepareMac4L3d
+      SSHAUTHSOCKORIGIN=${SSHAUTHSOCK}
+      SSHAUTHSOCK="/run/host-services/ssh-auth.sock"
       if [[ $? > 0 ]]; then
         exit $?
       fi
@@ -34,6 +36,9 @@ ID=$(docker container ls --all -q -f name=^l3drun$)
 if [[ ! -n ${ID} ]]; then
   docker run --name=l3drun -dt --rm \
     --env SCRIPTPATH=${SCRIPTPATH} \
+    --env SSHAUTHSOCKORIGIN=${SSHAUTHSOCKORIGIN} \
+    --env SSHAUTHSOCK=${SSHAUTHSOCK} \
+    --volume /run/host-services/ssh-auth.sock:/run/host-services/ssh-auth.sock \
     --volume /var/run/docker.sock:/var/run/docker.sock \
     --volume ${SCRIPTPATH}:/setup \
     registry.lakedrops.com/docker/l3d/run:'{{ version }}'
@@ -54,6 +59,7 @@ docker exec -it \
   --env L3DSHELL=${L3DSHELL} \
   --env WORKDIR=${PWD} \
   --env SSHAUTH=${SSHAUTH} \
+  --env SSHAUTHSOCKORIGIN=${SSHAUTHSOCKORIGIN} \
   --env SSHAUTHSOCK=${SSHAUTHSOCK} \
   --env PHP_VERSION=${PHP_VERSION} \
   --env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} \