diff --git a/android-arm/Dockerfile b/android-arm/Dockerfile
index d9dbcc2..16e4c5d 100644
--- a/android-arm/Dockerfile
+++ b/android-arm/Dockerfile
@@ -39,7 +39,7 @@ ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/android-arm
+ARG IMAGE
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
diff --git a/android-arm64/Dockerfile b/android-arm64/Dockerfile
index 5fbb16f..9966acf 100644
--- a/android-arm64/Dockerfile
+++ b/android-arm64/Dockerfile
@@ -44,7 +44,7 @@ ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/android-arm64
+ARG IMAGE
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
diff --git a/linux-arm64/Dockerfile.in b/linux-arm64/Dockerfile.in
index 8da366d..eceb05e 100644
--- a/linux-arm64/Dockerfile.in
+++ b/linux-arm64/Dockerfile.in
@@ -38,7 +38,7 @@ ENV ARCH arm64
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/linux-arm64
+ARG IMAGE
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
diff --git a/linux-armv5-musl/Dockerfile.in b/linux-armv5-musl/Dockerfile.in
index 51be452..ddd6ef3 100755
--- a/linux-armv5-musl/Dockerfile.in
+++ b/linux-armv5-musl/Dockerfile.in
@@ -40,7 +40,7 @@ ENV ARCH arm
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/linux-armv5-musl
+ARG IMAGE
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
diff --git a/linux-armv5/Dockerfile.in b/linux-armv5/Dockerfile.in
index 252ba27..aa84f52 100644
--- a/linux-armv5/Dockerfile.in
+++ b/linux-armv5/Dockerfile.in
@@ -42,7 +42,7 @@ ENV ARCH arm
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/linux-armv5
+ARG IMAGE
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
diff --git a/linux-armv6/Dockerfile b/linux-armv6/Dockerfile
index e30a4eb..ce16e09 100644
--- a/linux-armv6/Dockerfile
+++ b/linux-armv6/Dockerfile
@@ -50,7 +50,7 @@ ENV ARCH arm
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/linux-armv6
+ARG IMAGE
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
diff --git a/linux-armv7/Dockerfile.in b/linux-armv7/Dockerfile.in
index 4380d2a..34ce63a 100644
--- a/linux-armv7/Dockerfile.in
+++ b/linux-armv7/Dockerfile.in
@@ -38,7 +38,7 @@ ENV ARCH arm
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/linux-armv7
+ARG IMAGE
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
diff --git a/linux-armv7a/Dockerfile.in b/linux-armv7a/Dockerfile.in
index 4902558..793c2e0 100644
--- a/linux-armv7a/Dockerfile.in
+++ b/linux-armv7a/Dockerfile.in
@@ -41,7 +41,7 @@ ENV ARCH arm
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/linux-armv7a
+ARG IMAGE
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
diff --git a/linux-mips/Dockerfile.in b/linux-mips/Dockerfile.in
index c8439d4..7962450 100644
--- a/linux-mips/Dockerfile.in
+++ b/linux-mips/Dockerfile.in
@@ -36,7 +36,7 @@ ENV ARCH mips
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/linux-mips
+ARG IMAGE
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
diff --git a/linux-mipsel/Dockerfile b/linux-mipsel/Dockerfile
index 40a6b39..5002f04 100644
--- a/linux-mipsel/Dockerfile
+++ b/linux-mipsel/Dockerfile
@@ -39,7 +39,7 @@ ENV ARCH mips
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/linux-mipsel
+ARG IMAGE
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
diff --git a/linux-ppc64le/Dockerfile.in b/linux-ppc64le/Dockerfile.in
index 7f179e8..b32f50e 100644
--- a/linux-ppc64le/Dockerfile.in
+++ b/linux-ppc64le/Dockerfile.in
@@ -53,7 +53,7 @@ ENV ARCH powerpc
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/linux-ppc64le
+ARG IMAGE
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
diff --git a/linux-s390x/Dockerfile.in b/linux-s390x/Dockerfile.in
index 3ba3eb2..ad65076 100644
--- a/linux-s390x/Dockerfile.in
+++ b/linux-s390x/Dockerfile.in
@@ -36,7 +36,7 @@ ENV ARCH s390
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/linux-s390x
+ARG IMAGE
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
diff --git a/linux-x64/Dockerfile b/linux-x64/Dockerfile
index a9c1797..2e9dd78 100644
--- a/linux-x64/Dockerfile
+++ b/linux-x64/Dockerfile
@@ -24,7 +24,7 @@ ENV CMAKE_TOOLCHAIN_FILE /usr/lib/${CROSS_TRIPLE}/Toolchain.cmake
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/linux-x64
+ARG IMAGE
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
diff --git a/linux-x86/Dockerfile b/linux-x86/Dockerfile
index f746e39..94135c0 100644
--- a/linux-x86/Dockerfile
+++ b/linux-x86/Dockerfile
@@ -45,7 +45,7 @@ ENTRYPOINT ["/dockcross/linux32-entrypoint.sh"]
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/linux-x86
+ARG IMAGE
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
diff --git a/manylinux1-x64/Dockerfile.in b/manylinux1-x64/Dockerfile.in
index 639c1c8..ceee758 100644
--- a/manylinux1-x64/Dockerfile.in
+++ b/manylinux1-x64/Dockerfile.in
@@ -26,7 +26,7 @@ ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/../lib/Toolchain.cmake
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/manylinux1-x64
+ARG IMAGE
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
diff --git a/manylinux1-x86/Dockerfile.in b/manylinux1-x86/Dockerfile.in
index a330b2f..7c5d8a3 100644
--- a/manylinux1-x86/Dockerfile.in
+++ b/manylinux1-x86/Dockerfile.in
@@ -29,7 +29,7 @@ ENTRYPOINT ["/dockcross/linux32-entrypoint.sh"]
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/manylinux1-x86
+ARG IMAGE
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
diff --git a/manylinux2010-x64/Dockerfile.in b/manylinux2010-x64/Dockerfile.in
index 6a29b54..a31f04a 100644
--- a/manylinux2010-x64/Dockerfile.in
+++ b/manylinux2010-x64/Dockerfile.in
@@ -31,7 +31,7 @@ ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/../lib/Toolchain.cmake
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/manylinux2010-x64
+ARG IMAGE
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
diff --git a/manylinux2010-x86/Dockerfile.in b/manylinux2010-x86/Dockerfile.in
index f0a0b01..7e4a44c 100644
--- a/manylinux2010-x86/Dockerfile.in
+++ b/manylinux2010-x86/Dockerfile.in
@@ -34,7 +34,7 @@ ENTRYPOINT ["/dockcross/linux32-entrypoint.sh"]
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/manylinux2010-x86
+ARG IMAGE
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
diff --git a/manylinux2014-x64/Dockerfile.in b/manylinux2014-x64/Dockerfile.in
index 5805ac8..da33cc3 100644
--- a/manylinux2014-x64/Dockerfile.in
+++ b/manylinux2014-x64/Dockerfile.in
@@ -32,7 +32,7 @@ ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/../lib/Toolchain.cmake
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/manylinux2014-x64
+ARG IMAGE
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
diff --git a/web-wasm/Dockerfile.in b/web-wasm/Dockerfile.in
index 3c547fb..3003159 100644
--- a/web-wasm/Dockerfile.in
+++ b/web-wasm/Dockerfile.in
@@ -68,7 +68,7 @@ ENV CMAKE_TOOLCHAIN_FILE /emsdk/upstream/emscripten/cmake/Modules/Platform/Emscr
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/web-wasm
+ARG IMAGE
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
diff --git a/windows-shared-x64-posix/Dockerfile.in b/windows-shared-x64-posix/Dockerfile.in
index 817730d..aecc659 100644
--- a/windows-shared-x64-posix/Dockerfile.in
+++ b/windows-shared-x64-posix/Dockerfile.in
@@ -10,7 +10,7 @@ ARG MXE_TARGET_LINK=shared
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/windows-shared-x64-posix
+ARG IMAGE
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
diff --git a/windows-shared-x64/Dockerfile.in b/windows-shared-x64/Dockerfile.in
index 687564b..c363609 100644
--- a/windows-shared-x64/Dockerfile.in
+++ b/windows-shared-x64/Dockerfile.in
@@ -10,7 +10,7 @@ ARG MXE_TARGET_LINK=shared
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/windows-shared-x64
+ARG IMAGE
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
diff --git a/windows-shared-x86/Dockerfile.in b/windows-shared-x86/Dockerfile.in
index af2c927..6c5a4e3 100644
--- a/windows-shared-x86/Dockerfile.in
+++ b/windows-shared-x86/Dockerfile.in
@@ -10,7 +10,7 @@ ARG MXE_TARGET_LINK=shared
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/windows-shared-x86
+ARG IMAGE
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
diff --git a/windows-static-x64-posix/Dockerfile.in b/windows-static-x64-posix/Dockerfile.in
index 0b7c029..861732f 100644
--- a/windows-static-x64-posix/Dockerfile.in
+++ b/windows-static-x64-posix/Dockerfile.in
@@ -10,7 +10,7 @@ ARG MXE_TARGET_LINK=static
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/windows-static-x64-posix
+ARG IMAGE
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
diff --git a/windows-static-x64/Dockerfile.in b/windows-static-x64/Dockerfile.in
index 1bd677d..4a37e47 100644
--- a/windows-static-x64/Dockerfile.in
+++ b/windows-static-x64/Dockerfile.in
@@ -10,7 +10,7 @@ ARG MXE_TARGET_LINK=static
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/windows-static-x64
+ARG IMAGE
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
diff --git a/windows-static-x86/Dockerfile.in b/windows-static-x86/Dockerfile.in
index 3e59fe5..bf2d03f 100644
--- a/windows-static-x86/Dockerfile.in
+++ b/windows-static-x86/Dockerfile.in
@@ -10,7 +10,7 @@ ARG MXE_TARGET_LINK=static
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/windows-static-x86
+ARG IMAGE
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL