diff --git a/12/mysql-tomcat/Dockerfile b/12/mysql-tomcat/Dockerfile
index 79bfde2b735d3ea9e95467529db81b2183f9085d..113f896a789294b4e47cf82bf3efd22fa15f7583 100644
--- a/12/mysql-tomcat/Dockerfile
+++ b/12/mysql-tomcat/Dockerfile
@@ -26,7 +26,7 @@ FROM tomcat:9
 #    _/ /'`\ \_     \  /\  /    | |  | |`\ \  | |
 #   |____||____|     \/  \/    [___][__|  \_][___]
 
-MAINTAINER XWiki Committers
+LABEL maintainer="XWiki Development Team <committers@xwiki.org>"
 
 # Note: when using docker-compose, the ENV values below are overridden from the .env file.
 
diff --git a/12/postgres-tomcat/Dockerfile b/12/postgres-tomcat/Dockerfile
index 871e7b55252b61b9366d7349245267040449802c..6ac924731bfd42fea89f79538711490c991ca201 100644
--- a/12/postgres-tomcat/Dockerfile
+++ b/12/postgres-tomcat/Dockerfile
@@ -26,7 +26,7 @@ FROM tomcat:9
 #    _/ /'`\ \_     \  /\  /    | |  | |`\ \  | |
 #   |____||____|     \/  \/    [___][__|  \_][___]
 
-MAINTAINER XWiki Committers
+LABEL maintainer="XWiki Development Team <committers@xwiki.org>"
 
 # Note: when using docker-compose, the ENV values below are overridden from the .env file.
 
diff --git a/13/mysql-tomcat/Dockerfile b/13/mysql-tomcat/Dockerfile
index 6dacfe412d5f06cde88861f8016ee35ecea65ff2..b2d6d38dddaf31fdc6a65b6e81991c05cd4a0586 100644
--- a/13/mysql-tomcat/Dockerfile
+++ b/13/mysql-tomcat/Dockerfile
@@ -26,7 +26,7 @@ FROM tomcat:9
 #    _/ /'`\ \_     \  /\  /    | |  | |`\ \  | |
 #   |____||____|     \/  \/    [___][__|  \_][___]
 
-MAINTAINER XWiki Committers
+LABEL maintainer="XWiki Development Team <committers@xwiki.org>"
 
 # Note: when using docker-compose, the ENV values below are overridden from the .env file.
 
diff --git a/13/postgres-tomcat/Dockerfile b/13/postgres-tomcat/Dockerfile
index cec4381c905b5248325ede0599cf1ec502f40b02..182773abf193d05067c5d3a7096ef0db39b95f6d 100644
--- a/13/postgres-tomcat/Dockerfile
+++ b/13/postgres-tomcat/Dockerfile
@@ -26,7 +26,7 @@ FROM tomcat:9
 #    _/ /'`\ \_     \  /\  /    | |  | |`\ \  | |
 #   |____||____|     \/  \/    [___][__|  \_][___]
 
-MAINTAINER XWiki Committers
+LABEL maintainer="XWiki Development Team <committers@xwiki.org>"
 
 # Note: when using docker-compose, the ENV values below are overridden from the .env file.