diff --git a/action.yml b/action.yml
index d7c58c9..c348541 100644
--- a/action.yml
+++ b/action.yml
@@ -11,7 +11,7 @@ inputs:
   workdir:
     description: 'Workdir for the container'
     required: false
-    default: ${{ github.workspace }}
+    default: /github/workspace/${{ github.event.repository.name }}
   run:
     description: 'Run command in container'
     required: false
diff --git a/entrypoint.sh b/entrypoint.sh
index 7b6f792..dd1ea64 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -8,4 +8,4 @@ if [ ! -z $INPUT_DOCKER_NETWORK ];
 then INPUT_OPTIONS="$INPUT_OPTIONS --network $INPUT_DOCKER_NETWORK"
 fi
 
-exec docker run --workdir $INPUT_WORKDIR -v "/var/run/docker.sock:/var/run/docker.sock" -v "$GITHUB_WORKSPACE:$GITHUB_WORKSPACE" $INPUT_OPTIONS --entrypoint=$INPUT_SHELL $INPUT_IMAGE -c "${INPUT_RUN//$'\n'/;}"
+exec docker run --workdir "$INPUT_WORKDIR" -v "/var/run/docker.sock:/var/run/docker.sock" -v "$RUNNER_WORKSPACE:/github/workspace" $INPUT_OPTIONS --entrypoint=$INPUT_SHELL $INPUT_IMAGE -c "${INPUT_RUN//$'\n'/;}"