diff --git a/boinc/Dockerfile b/boinc/Dockerfile
index 04979c1..6ee09fd 100644
--- a/boinc/Dockerfile
+++ b/boinc/Dockerfile
@@ -1,5 +1,4 @@
FROM alpine:3.4
-MAINTAINER Wonderfall <wonderfall@schrodinger.io>
ARG BUILD_CORES
@@ -39,4 +38,6 @@ RUN chmod +x /usr/local/bin/run.sh
VOLUME /boinc
+LABEL maintainer="Wonderfall <wonderfall@targaryen.house>"
+
ENTRYPOINT ["run.sh"]
diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile
index f5bb47b..3a68e1a 100644
--- a/boring-nginx/Dockerfile
+++ b/boring-nginx/Dockerfile
@@ -1,5 +1,4 @@
FROM alpine:edge
-MAINTAINER Wonderfall <wonderfall@schrodinger.io>
ENV UID=991 GID=991
@@ -110,6 +109,7 @@ VOLUME /sites-enabled /www /conf.d /passwds /certs /var/log/nginx
LABEL description="nginx built from source" \
openssl="BoringSSL" \
- nginx="nginx ${NGINX_VERSION}"
+ nginx="nginx ${NGINX_VERSION}" \
+ maintainer="Wonderfall <wonderfall@targaryen.house>"
CMD ["run.sh"]
diff --git a/cowrie/Dockerfile b/cowrie/Dockerfile
index a5ea9ef..711048d 100644
--- a/cowrie/Dockerfile
+++ b/cowrie/Dockerfile
@@ -1,5 +1,4 @@
FROM alpine:3.5
-MAINTAINER Wonderfall <wonderfall@schrodinger.io>
ARG MPFR_VERSION=3.1.5
ARG MPC_VERSION=1.0.3
@@ -83,4 +82,6 @@ VOLUME /cowrie/log /cowrie/dl /cowrie/custom
EXPOSE 2222
+LABEL maintainer="Wonderfall <wonderfall@targaryen.house>"
+
CMD ["run.sh"]
diff --git a/ghost/Dockerfile b/ghost/Dockerfile
index 6ee7ad5..7e8d316 100644
--- a/ghost/Dockerfile
+++ b/ghost/Dockerfile
@@ -1,5 +1,4 @@
FROM mhart/alpine-node-auto:6
-MAINTAINER Wonderfall <wonderfall@schrodinger.io>
ARG GHOST_VERSION=0.11.4
@@ -61,6 +60,7 @@ RUN chmod +x /usr/local/bin/run.sh
EXPOSE 2368
LABEL description="Ghost CMS ready for production" \
- ghost="Ghost v$VERSION"
+ ghost="Ghost v$VERSION" \
+ maintainer="Wonderfall <wonderfall@targaryen.house>"
CMD ["run.sh"]
diff --git a/isso/Dockerfile b/isso/Dockerfile
index d6e0c94..bbf5e7d 100644
--- a/isso/Dockerfile
+++ b/isso/Dockerfile
@@ -1,5 +1,4 @@
FROM alpine:3.5
-MAINTAINER Wonderfall <wonderfall@schrodinger.io>
ARG ISSO_VER=0.10.5
@@ -35,4 +34,6 @@ EXPOSE 8080
VOLUME /db /config
+LABEL maintainer="Wonderfall <wonderfall@targaryen.house>"
+
CMD ["run.sh"]
diff --git a/lychee/Dockerfile b/lychee/Dockerfile
index 3751234..56240c7 100644
--- a/lychee/Dockerfile
+++ b/lychee/Dockerfile
@@ -1,5 +1,4 @@
FROM alpine:edge
-MAINTAINER Wonderfall <wonderfall@schrodinger.io>
ARG LYCHEE_VERSION=3.1.5
ARG IMAGICK_EXT_VERSION=3.4.2
@@ -56,4 +55,6 @@ VOLUME /lychee/uploads /lychee/data
EXPOSE 8888
+LABEL maintainer="Wonderfall <wonderfall@targaryen.house>"
+
CMD ["run.sh"]
diff --git a/nextcloud/11.0/Dockerfile b/nextcloud/11.0/Dockerfile
index dfd1515..27b6eda 100644
--- a/nextcloud/11.0/Dockerfile
+++ b/nextcloud/11.0/Dockerfile
@@ -1,5 +1,4 @@
FROM alpine:edge
-MAINTAINER Wonderfall <wonderfall@schrodinger.io>
ARG NEXTCLOUD_VERSION=11.0.1
ARG GNU_LIBICONV_VERSION=1.14
@@ -117,6 +116,7 @@ VOLUME /data /config /apps2 /var/lib/redis
EXPOSE 8888
LABEL description="A server software for creating file hosting services" \
- nextcloud="Nextcloud v${NEXTCLOUD_VERSION}"
+ nextcloud="Nextcloud v${NEXTCLOUD_VERSION}" \
+ maintainer="Wonderfall <wonderfall@targaryen.house>"
CMD ["run.sh"]
diff --git a/piwik/Dockerfile b/piwik/Dockerfile
index 608baf5..01f14e4 100644
--- a/piwik/Dockerfile
+++ b/piwik/Dockerfile
@@ -1,5 +1,4 @@
FROM alpine:edge
-MAINTAINER Wonderfall <wonderfall@mondedie.fr>
ARG VERSION=3.0.1
@@ -77,6 +76,7 @@ VOLUME /config
EXPOSE 8888
LABEL description "Open web analytics platform" \
- piwik "Piwik v${VERSION}"
+ piwik "Piwik v${VERSION}" \
+ maintainer="Wonderfall <wonderfall@targaryen.house>"
CMD ["run.sh"]
diff --git a/privatebin/Dockerfile b/privatebin/Dockerfile
index e51ec0f..952ff1a 100644
--- a/privatebin/Dockerfile
+++ b/privatebin/Dockerfile
@@ -1,5 +1,4 @@
FROM alpine:edge
-MAINTAINER Wonderfall <wonderfall@schrodinger.io>
ENV GID=991 UID=991
@@ -32,4 +31,6 @@ VOLUME /zerobin/data
EXPOSE 8888
+LABEL maintainer="Wonderfall <wonderfall@targaryen.house>"
+
CMD ["run.sh"]
diff --git a/rtorrent-flood/Dockerfile b/rtorrent-flood/Dockerfile
index fb5cd5c..26ba274 100644
--- a/rtorrent-flood/Dockerfile
+++ b/rtorrent-flood/Dockerfile
@@ -1,5 +1,4 @@
FROM alpine:3.5
-MAINTAINER Wonderfall <wonderfall@schrodinger.io>
ARG RTORRENT_VER=0.9.6
ARG LIBTORRENT_VER=0.13.6
@@ -89,6 +88,7 @@ EXPOSE 3000 49184 49184/udp
LABEL description="BitTorrent client with WebUI front-end" \
rtorrent="rTorrent BiTorrent client v$RTORRENT_VER" \
libtorrent="libtorrent v$LIBTORRENT_VER" \
- filebot="Filebot v$FILEBOT_VER"
+ filebot="Filebot v$FILEBOT_VER" \
+ maintainer="Wonderfall <wonderfall@targaryen.house>"
CMD ["run.sh"]
diff --git a/searx/Dockerfile b/searx/Dockerfile
index 8a0a155..114f8cc 100644
--- a/searx/Dockerfile
+++ b/searx/Dockerfile
@@ -1,5 +1,4 @@
FROM alpine:edge
-MAINTAINER Wonderfall <wonderfall@schrodinger.io>
ENV BASE_URL=False IMAGE_PROXY=False \
UID=991 GID=991
@@ -36,4 +35,6 @@ RUN chmod +x /usr/local/bin/run.sh
EXPOSE 8888
+LABEL maintainer="Wonderfall <wonderfall@targaryen.house>"
+
CMD ["run.sh"]
diff --git a/subsonic/Dockerfile b/subsonic/Dockerfile
index 1cf1dbb..ddb78d5 100644
--- a/subsonic/Dockerfile
+++ b/subsonic/Dockerfile
@@ -1,5 +1,4 @@
FROM alpine:3.5
-MAINTAINER Wonderfall <wonderfall@schrodinger.io>
ARG VERSION=6.0
@@ -26,6 +25,7 @@ EXPOSE 4040 4050
VOLUME /data /musics /playlists /podcasts
LABEL description "Open source media streamer" \
- subsonic "Subsonic v$VERSION"
+ subsonic "Subsonic v$VERSION" \
+ maintainer="Wonderfall <wonderfall@targaryen.house>"
CMD ["run.sh"]
diff --git a/tor/Dockerfile b/tor/Dockerfile
index 9a61a82..def9ea1 100644
--- a/tor/Dockerfile
+++ b/tor/Dockerfile
@@ -1,5 +1,4 @@
FROM alpine:3.5
-MAINTAINER Wonderfall <wonderfall@schrodinger.io>
ARG TOR_VERSION=0.2.9.8
ARG ARM_VERSION=1.4.5.0
@@ -62,4 +61,8 @@ VOLUME /tor/config /tor/data
EXPOSE 9001 9030
+LABEL tor="Tor $TOR_VERSION" \
+ arm="Arm $ARM_VERSION" \
+ maintainer="Wonderfall <wonderfall@targaryen.house>"
+
ENTRYPOINT ["run.sh"]