diff --git a/Tools/docker_run.sh b/Tools/docker_run.sh
index c78b9cc7e1..46888cd066 100755
--- a/Tools/docker_run.sh
+++ b/Tools/docker_run.sh
@@ -47,6 +47,7 @@ CCACHE_DIR=${HOME}/.ccache
 mkdir -p "${CCACHE_DIR}"
 
 docker run -it --rm -w "${SRC_DIR}" \
+	--user="$(id -u):$(id -g)" \
 	--env=AWS_ACCESS_KEY_ID \
 	--env=AWS_SECRET_ACCESS_KEY \
 	--env=BRANCH_NAME \
@@ -54,7 +55,6 @@ docker run -it --rm -w "${SRC_DIR}" \
 	--env=CI \
 	--env=CODECOV_TOKEN \
 	--env=COVERALLS_REPO_TOKEN \
-	--env=LOCAL_USER_ID="$(id -u)" \
 	--env=PX4_ASAN \
 	--env=PX4_MSAN \
 	--env=PX4_TSAN \
diff --git a/Tools/setup/docker-entrypoint.sh b/Tools/setup/docker-entrypoint.sh
index 1094587c1c..0412558902 100755
--- a/Tools/setup/docker-entrypoint.sh
+++ b/Tools/setup/docker-entrypoint.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-echo "[docker-entrypoint.sh] Starting entrypoint"
 # Start virtual X server in the background
 # - DISPLAY default is :99, set in dockerfile
 # - Users can override with `-e DISPLAY=` in `docker run` command to avoid
@@ -17,17 +16,4 @@ if [ -n "${ROS_DISTRO}" ]; then
 	source "/opt/ros/$ROS_DISTRO/setup.bash"
 fi
 
-echo "[docker-entrypoint.sh] Working Directory: ${pwd}"
-
-# Use the LOCAL_USER_ID if passed in at runtime
-if [ -n "${LOCAL_USER_ID}" ]; then
-	echo "[docker-entrypoint.sh] Starting with: $LOCAL_USER_ID:user"
-	# modify existing user's id
-	usermod -u $LOCAL_USER_ID user
-
-	# run as user
-	# exec gosu user "$@"
-	exec "$@"
-else
-	exec "$@"
-fi
+exec "$@"