diff --git a/Dockerfile b/Dockerfile
index b2c088b..84f7f43 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 # Github labels
 LABEL "com.github.actions.name"="dokku-github-action"
diff --git a/entrypoint.sh b/entrypoint.sh
index 09c5266..3d7d525 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -48,6 +48,11 @@ if [ -n "$APP_CONFIG" ]; then
     $GIT_SSH_COMMAND dokku@$HOST config:set --no-restart $PROJECT $APP_CONFIG > /dev/null 2>&1
 fi
 
+# prevent dubious ownership error due to ownership mismatch in parent directories
+# see: https://github.com/vitalyliber/dokku-github-action/issues/25
+echo "Adding repository directory to the git global config as a safe directory"
+git config --global --add safe.directory /github/workspace
+
 echo "The deploy is starting"
 
 GIT_SSH_COMMAND="$GIT_SSH_COMMAND" $GIT_COMMAND