diff --git a/scripts/collect_docker_version_files.sh b/scripts/collect_docker_version_files.sh
index 73f0a9b53198..546d8458f259 100755
--- a/scripts/collect_docker_version_files.sh
+++ b/scripts/collect_docker_version_files.sh
@@ -5,7 +5,7 @@ TARGET_PATH=$2
 
 [ -z "$TARGET_PATH" ] && TARGET_PATH=./target
 
-DOCKER_IMAGE_NAME=$(echo $DOCKER_IMAGE | cut -d: -f1)
+DOCKER_IMAGE_NAME=$(echo $DOCKER_IMAGE | cut -d: -f1 | sed "s/-$DOCKER_USERNAME\$//")
 DOCKER_CONTAINER=$DOCKER_IMAGE_NAME
 TARGET_VERSIONS_PATH=$TARGET_PATH/versions/dockers/$DOCKER_IMAGE_NAME