diff --git a/Tools/docker_run.sh b/Tools/docker_run.sh
index 44823a5245..df368f25fe 100755
--- a/Tools/docker_run.sh
+++ b/Tools/docker_run.sh
@@ -8,7 +8,7 @@ fi
 
 PX4_DOCKER_REPO="px4io/px4-dev:$TAG_NAME"
 
-echo "docker_run.sh: Running [$PX4_DOCKER_REPO]"
+echo "[docker_run.sh]: Running '$PX4_DOCKER_REPO'"
 
 PWD=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 SRC_DIR=$PWD/../
diff --git a/Tools/setup/docker-entrypoint.sh b/Tools/setup/docker-entrypoint.sh
index 4af2a9638a..d771cbd77d 100755
--- a/Tools/setup/docker-entrypoint.sh
+++ b/Tools/setup/docker-entrypoint.sh
@@ -1,11 +1,12 @@
 #!/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
 #   running Xvfb and attach their screen
 if [[ -x "$(command -v Xvfb)" && "$DISPLAY" == ":99" ]]; then
-	echo "Starting Xvfb"
+	echo "[docker-entrypoint.sh] Starting Xvfb"
 	Xvfb :99 -screen 0 1600x1200x24+32 &
 fi
 
@@ -17,7 +18,7 @@ fi
 
 # Use the LOCAL_USER_ID if passed in at runtime
 if [ -n "${LOCAL_USER_ID}" ]; then
-	echo "Starting with UID : $LOCAL_USER_ID"
+	echo "[docker-entrypoint.sh] Starting with UID : $LOCAL_USER_ID"
 	# modify existing user's id
 	usermod -u $LOCAL_USER_ID user