diff --git a/Dockerfile.in b/Dockerfile.in
index 44ff99e..c9b082c 100644
--- a/Dockerfile.in
+++ b/Dockerfile.in
@@ -1,7 +1,7 @@
 ARG DOCKER_IMAGE=debian:bullseye-slim
 FROM $DOCKER_IMAGE
 
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 #include "common.debian"
 
diff --git a/linux-arm64-full/Dockerfile.in b/linux-arm64-full/Dockerfile.in
index ff78847..1851bfa 100644
--- a/linux-arm64-full/Dockerfile.in
+++ b/linux-arm64-full/Dockerfile.in
@@ -1,5 +1,7 @@
 FROM dockcross/base:latest
 
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
+
 # This is for 64-bit ARM Linux machine
 
 # Buildroot version
diff --git a/linux-arm64/Dockerfile.in b/linux-arm64/Dockerfile.in
index bb24f44..a4892ed 100644
--- a/linux-arm64/Dockerfile.in
+++ b/linux-arm64/Dockerfile.in
@@ -1,5 +1,7 @@
 FROM dockcross/base:latest
 
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
+
 # This is for 64-bit ARM Linux machine
 
 # Crosstool-ng version
diff --git a/linux-armv5/Dockerfile.in b/linux-armv5/Dockerfile.in
index b97f29a..e148ba7 100644
--- a/linux-armv5/Dockerfile.in
+++ b/linux-armv5/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/linux-armv6-lts/Dockerfile.in b/linux-armv6-lts/Dockerfile.in
index 885438c..9832632 100644
--- a/linux-armv6-lts/Dockerfile.in
+++ b/linux-armv6-lts/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"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
diff --git a/linux-armv6/Dockerfile.in b/linux-armv6/Dockerfile.in
index a75eba4..837f677 100644
--- a/linux-armv6/Dockerfile.in
+++ b/linux-armv6/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"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
diff --git a/linux-armv7/Dockerfile.in b/linux-armv7/Dockerfile.in
index cd884e2..c73df8b 100644
--- a/linux-armv7/Dockerfile.in
+++ b/linux-armv7/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"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
diff --git a/linux-armv7a/Dockerfile.in b/linux-armv7a/Dockerfile.in
index ea0098e..68b94a6 100644
--- a/linux-armv7a/Dockerfile.in
+++ b/linux-armv7a/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 32-bit ARMv7 Linux
 
diff --git a/linux-m68k-uclibc/Dockerfile.in b/linux-m68k-uclibc/Dockerfile.in
index 8adeb9a..715faa2 100644
--- a/linux-m68k-uclibc/Dockerfile.in
+++ b/linux-m68k-uclibc/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"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
diff --git a/linux-mips/Dockerfile.in b/linux-mips/Dockerfile.in
index 90ea378..af8ea6b 100644
--- a/linux-mips/Dockerfile.in
+++ b/linux-mips/Dockerfile.in
@@ -1,5 +1,7 @@
 FROM dockcross/base:latest
 
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
+
 # This is for 32-bit Big-Endian MIPS devices with hard floating point enabled
 
 # Crosstool-ng version
diff --git a/linux-ppc64le/Dockerfile.in b/linux-ppc64le/Dockerfile.in
index 94b851d..c0129df 100644
--- a/linux-ppc64le/Dockerfile.in
+++ b/linux-ppc64le/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"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
diff --git a/linux-riscv32/Dockerfile.in b/linux-riscv32/Dockerfile.in
index b4a9f6e..de82e8b 100644
--- a/linux-riscv32/Dockerfile.in
+++ b/linux-riscv32/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"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
diff --git a/linux-riscv64/Dockerfile.in b/linux-riscv64/Dockerfile.in
index df5e45e..3e28bce 100644
--- a/linux-riscv64/Dockerfile.in
+++ b/linux-riscv64/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"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
diff --git a/linux-s390x/Dockerfile.in b/linux-s390x/Dockerfile.in
index ec9489d..e800b51 100644
--- a/linux-s390x/Dockerfile.in
+++ b/linux-s390x/Dockerfile.in
@@ -1,5 +1,7 @@
 FROM dockcross/base:latest
 
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
+
 # This is for 64-bit S390X Linux machine
 
 # Crosstool-ng version
diff --git a/linux-x64-clang/Dockerfile.in b/linux-x64-clang/Dockerfile.in
index cf7027e..f9de5d9 100644
--- a/linux-x64-clang/Dockerfile.in
+++ b/linux-x64-clang/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"
 
 ARG CLANG_VERSION=13
 ENV CLANG_VERSION=${CLANG_VERSION}
diff --git a/linux-x64-tinycc/Dockerfile.in b/linux-x64-tinycc/Dockerfile.in
index 8cc6e6d..78d7906 100644
--- a/linux-x64-tinycc/Dockerfile.in
+++ b/linux-x64-tinycc/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 image use Tinycc as C compiler and GCC as C++ compiler
 
diff --git a/linux-x64/Dockerfile.in b/linux-x64/Dockerfile.in
index a966bdb..01d8cf1 100644
--- a/linux-x64/Dockerfile.in
+++ b/linux-x64/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"
 
 RUN apt-get update && \
     apt-get -y install \
diff --git a/linux-x86/Dockerfile.in b/linux-x86/Dockerfile.in
index 96fbdcc..b2da4a5 100644
--- a/linux-x86/Dockerfile.in
+++ b/linux-x86/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"
 
 RUN dpkg --add-architecture i386 && \
   apt-get update && apt-get -y install \
diff --git a/linux-x86_64-full/Dockerfile.in b/linux-x86_64-full/Dockerfile.in
index 03d7203..742f80c 100644
--- a/linux-x86_64-full/Dockerfile.in
+++ b/linux-x86_64-full/Dockerfile.in
@@ -1,5 +1,7 @@
 FROM dockcross/base:latest
 
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
+
 # This is for 64-bit x86 Linux machine
 
 # Buildroot version
diff --git a/linux-xtensa-uclibc/Dockerfile.in b/linux-xtensa-uclibc/Dockerfile.in
index 6cf65b6..83289b5 100644
--- a/linux-xtensa-uclibc/Dockerfile.in
+++ b/linux-xtensa-uclibc/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"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
diff --git a/manylinux2014-aarch64/Dockerfile.in b/manylinux2014-aarch64/Dockerfile.in
index 3b7dd89..86d11bd 100644
--- a/manylinux2014-aarch64/Dockerfile.in
+++ b/manylinux2014-aarch64/Dockerfile.in
@@ -4,6 +4,8 @@
 # For more details, read https://github.com/dockcross/dockcross/issues/367
 FROM dockcross/manylinux2014-x64:20210708-94745ff
 
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
+
 # This is for 64-bit ARM Manylinux machine
 
 # Crosstool-ng version
diff --git a/manylinux2014-x64/Dockerfile.in b/manylinux2014-x64/Dockerfile.in
index 8bb9633..51e0a15 100644
--- a/manylinux2014-x64/Dockerfile.in
+++ b/manylinux2014-x64/Dockerfile.in
@@ -1,6 +1,7 @@
 # Recent versions address yum functionality
 FROM quay.io/pypa/manylinux2014_x86_64:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux2014-x64
 
diff --git a/manylinux2014-x86/Dockerfile.in b/manylinux2014-x86/Dockerfile.in
index 6888b20..1716c84 100644
--- a/manylinux2014-x86/Dockerfile.in
+++ b/manylinux2014-x86/Dockerfile.in
@@ -1,6 +1,7 @@
 # Recent versions address yum functionality
 FROM quay.io/pypa/manylinux2014_i686:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux2014-x86
 
diff --git a/web-wasm/Dockerfile.in b/web-wasm/Dockerfile.in
index 85c70eb..33b88d7 100644
--- a/web-wasm/Dockerfile.in
+++ b/web-wasm/Dockerfile.in
@@ -1,5 +1,6 @@
 FROM emscripten/emsdk:2.0.30
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 # Revert back to "/bin/sh" as default shell
 # See https://github.com/asRIA/emscripten-docker/blob/master/Dockerfile.in#L4
diff --git a/windows-arm64/Dockerfile.in b/windows-arm64/Dockerfile.in
index 3be2fb6..493bf3d 100644
--- a/windows-arm64/Dockerfile.in
+++ b/windows-arm64/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"
 
 ENV XCC_PREFIX /usr/xcc
 ENV CROSS_TRIPLE aarch64-w64-mingw32
diff --git a/windows-armv7/Dockerfile.in b/windows-armv7/Dockerfile.in
index 6f28818..25d11f6 100644
--- a/windows-armv7/Dockerfile.in
+++ b/windows-armv7/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"
 
 ENV XCC_PREFIX /usr/xcc
 ENV CROSS_TRIPLE armv7-w64-mingw32
diff --git a/windows-shared-x64-posix/Dockerfile.in b/windows-shared-x64-posix/Dockerfile.in
index 65503b4..9e42225 100644
--- a/windows-shared-x64-posix/Dockerfile.in
+++ b/windows-shared-x64-posix/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"
 
 ENV WINEARCH win64
 ARG MXE_TARGET_ARCH=x86_64
diff --git a/windows-shared-x64/Dockerfile.in b/windows-shared-x64/Dockerfile.in
index 0d748bd..56f1115 100644
--- a/windows-shared-x64/Dockerfile.in
+++ b/windows-shared-x64/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"
 
 ENV WINEARCH win64
 ARG MXE_TARGET_ARCH=x86_64
diff --git a/windows-shared-x86/Dockerfile.in b/windows-shared-x86/Dockerfile.in
index 1ae43d4..17de0df 100644
--- a/windows-shared-x86/Dockerfile.in
+++ b/windows-shared-x86/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"
 
 ENV WINEARCH win32
 ARG MXE_TARGET_ARCH=i686
diff --git a/windows-static-x64-posix/Dockerfile.in b/windows-static-x64-posix/Dockerfile.in
index a9b67d9..513d4ce 100644
--- a/windows-static-x64-posix/Dockerfile.in
+++ b/windows-static-x64-posix/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"
 
 ENV WINEARCH win64
 ARG MXE_TARGET_ARCH=x86_64
diff --git a/windows-static-x64/Dockerfile.in b/windows-static-x64/Dockerfile.in
index 1c798ac..fe50776 100644
--- a/windows-static-x64/Dockerfile.in
+++ b/windows-static-x64/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"
 
 ENV WINEARCH win64
 ARG MXE_TARGET_ARCH=x86_64
diff --git a/windows-static-x86/Dockerfile.in b/windows-static-x86/Dockerfile.in
index 15140fe..82df724 100644
--- a/windows-static-x86/Dockerfile.in
+++ b/windows-static-x86/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"
 
 ENV WINEARCH win32
 ARG MXE_TARGET_ARCH=i686