diff --git a/Tools/setup/docker-entrypoint.sh b/Tools/setup/docker-entrypoint.sh
index 6d998eda2d..69101c5833 100755
--- a/Tools/setup/docker-entrypoint.sh
+++ b/Tools/setup/docker-entrypoint.sh
@@ -4,7 +4,7 @@ GREEN='\033[0;32m'
 NO_COLOR='\033[0m' # No Color
 SCRIPTID="${GREEN}[docker-entrypoint.sh]${NO_COLOR}"
 
-echo -e "$SCRIPTID Starting"
+echo -e "$SCRIPTID $( uname -m ) | $(date -u +%FT%TZ)"
 
 # Start virtual X server in the background
 # - DISPLAY default is :99, set in dockerfile
@@ -22,6 +22,4 @@ if [ -n "${ROS_DISTRO}" ]; then
 	source "/opt/ros/$ROS_DISTRO/setup.bash"
 fi
 
-echo -e "$SCRIPTID ($( uname -m ))"
-
 exec "$@"