diff --git a/utils/docker-run b/utils/docker-run
index 2bca8d8e3a..bdbc979264 100755
--- a/utils/docker-run
+++ b/utils/docker-run
@@ -7,4 +7,8 @@ IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \
         sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g')
 
 set -x
-exec docker run -v "${MAIN_DIR}:/home/br-user" -it "${IMAGE}" "$@"
+exec docker run -it --rm \
+    --user $(id -u):$(id -g) \
+    --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" \
+    --workdir "${MAIN_DIR}" \
+    "${IMAGE}" "${@}"