diff --git a/linux-armv5-musl/Dockerfile.in b/linux-armv5-musl/Dockerfile.in
index abced9f..6c0c268 100755
--- a/linux-armv5-musl/Dockerfile.in
+++ b/linux-armv5-musl/Dockerfile.in
@@ -1,5 +1,6 @@
 FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 # This is for ARMv5 "legacy" (armel) devices which do NOT support hard float
 # VFP instructions (armhf).
diff --git a/tools/dockcross-cmake-builder.sh b/tools/dockcross-cmake-builder.sh
index c96b598..c730279 100755
--- a/tools/dockcross-cmake-builder.sh
+++ b/tools/dockcross-cmake-builder.sh
@@ -1,15 +1,17 @@
 #!/usr/bin/env bash
 
 if (( $# >= 1 )); then
-    image=$1
-    build_file=build-${image%:*}
+    image_complet=$1
+    image=${image_complet%:*}
+    tag=${image_complet#*:}
+    build_file=build-$image
     shift 1
 
-    cmake_arg=$@
+    cmake_arg=$*
     echo "cmake arg: $cmake_arg"
 
-    #echo "Pulling dockcross/$image"
-    #docker pull dockcross/"$image"
+#    echo "Pulling dockcross/$image"
+#    docker pull "dockcross/$image:$tag"
 
     echo "Make script dockcross-$image"
     docker run --rm dockcross/"$image" > ./dockcross-"$image"
@@ -19,6 +21,6 @@ if (( $# >= 1 )); then
     ./dockcross-"$image" cmake -B "$build_file" -S . -G Ninja $cmake_arg
     ./dockcross-"$image" ninja -C "$build_file"
 else
-    echo "Usage: ${0##*/} <docker imag (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <cmake arg.>"
+    echo "Usage: ${0##*/} <docker image (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <cmake arg.>"
     exit 1
 fi
diff --git a/tools/dockcross-command.sh b/tools/dockcross-command.sh
index e63b06a..b2fbfa2 100755
--- a/tools/dockcross-command.sh
+++ b/tools/dockcross-command.sh
@@ -1,14 +1,16 @@
 #!/usr/bin/env bash
 
 if (( $# >= 2 )); then
-    image=$1
+    image_complet=$1
+    image=${image_complet%:*}
+    tag=${image_complet#*:}
     shift 1
 
-    command=$@
+    command=$*
     echo "command: $command"
 
-    #echo "Pulling dockcross/$image"
-    #docker pull dockcross/"$image"
+#    echo "Pulling dockcross/$image"
+#    docker pull "dockcross/$image:$tag"
 
     echo "Make script dockcross-$image"
     docker run --rm dockcross/"$image" > ./dockcross-"$image"
diff --git a/tools/dockcross-make-builder.sh b/tools/dockcross-make-builder.sh
index 231d5ca..d86c237 100755
--- a/tools/dockcross-make-builder.sh
+++ b/tools/dockcross-make-builder.sh
@@ -1,15 +1,17 @@
 #!/usr/bin/env bash
 
 if (( $# >= 1 )); then
-    image=$1
-    build_file=build-${image%:*}
+    image_complet=$1
+    image=${image_complet%:*}
+    tag=${image_complet#*:}
+    build_file=build-$image
     shift 1
 
-    make_arg=$@
+    make_arg=$*
     echo "make arg: $make_arg"
 
-    #echo "Pulling dockcross/$image"
-    #docker pull dockcross/"$image"
+#    echo "Pulling dockcross/$image"
+#    docker pull "dockcross/$image:$tag"
 
     echo "Make script dockcross-$image"
     docker run --rm dockcross/"$image" > ./dockcross-"$image"
@@ -18,6 +20,6 @@ if (( $# >= 1 )); then
     echo "Build $build_file"
     ./dockcross-"$image" bash -c 'make CXX=${CXX} CC=${CC} AR=${AR} AS=${AS} LD=${LD} CPP=${CPP} FC=${FC} '"$make_arg"
 else
-    echo "Usage: ${0##*/} <docker imag (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <make arg.>"
+    echo "Usage: ${0##*/} <docker image (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <make arg.>"
     exit 1
 fi