diff --git a/aarch64/Dockerfile b/aarch64/Dockerfile
index 8dc774e..abd1720 100644
--- a/aarch64/Dockerfile
+++ b/aarch64/Dockerfile
@@ -1,6 +1,7 @@
 FROM balenalib/aarch64-debian:stretch
 
-MAINTAINER Andre Germann <https://buanet.de>
+LABEL maintainer="Andre Germann" \ 
+      url="<https://buanet.de>"
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index 1da5a9f..9eec8a6 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -1,6 +1,7 @@
 FROM debian:stretch
 
-MAINTAINER Andre Germann <https://buanet.de>
+LABEL maintainer="Andre Germann" \ 
+      url="<https://buanet.de>"
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/armv7hf/Dockerfile b/armv7hf/Dockerfile
index 83e3f4a..9ce6797 100644
--- a/armv7hf/Dockerfile
+++ b/armv7hf/Dockerfile
@@ -1,7 +1,8 @@
 FROM balenalib/armv7hf-debian:stretch
 
-MAINTAINER Andre Germann <https://buanet.de>
-
+LABEL maintainer="Andre Germann" \ 
+      url="<https://buanet.de>"
+	  
 ENV DEBIAN_FRONTEND noninteractive
 
 # Install prerequisites (as listed in iobroker installer.sh)