diff --git a/pdns-admin-base-ngoduykhanh/Dockerfile b/pdns-admin-base-ngoduykhanh/Dockerfile
index 19c908f..995669a 100644
--- a/pdns-admin-base-ngoduykhanh/Dockerfile
+++ b/pdns-admin-base-ngoduykhanh/Dockerfile
@@ -1,5 +1,4 @@
 FROM fedora:30
-MAINTAINER "Peter Schiffer" <peter@rfv.sk>
 
 RUN curl -sSL -o /etc/yum.repos.d/yarn.repo https://dl.yarnpkg.com/rpm/yarn.repo
 
diff --git a/pdns-admin-static-ngoduykhanh/Dockerfile b/pdns-admin-static-ngoduykhanh/Dockerfile
index 28e5e8a..8d73956 100644
--- a/pdns-admin-static-ngoduykhanh/Dockerfile
+++ b/pdns-admin-static-ngoduykhanh/Dockerfile
@@ -1,5 +1,4 @@
 FROM pschiffe/pdns-admin-base:ngoduykhanh
-MAINTAINER "Peter Schiffer" <peter@rfv.sk>
 
 RUN dnf -y --setopt=install_weak_deps=False install \
     nginx \
diff --git a/pdns-admin-static/Dockerfile b/pdns-admin-static/Dockerfile
index 42b7f7a..468168c 100644
--- a/pdns-admin-static/Dockerfile
+++ b/pdns-admin-static/Dockerfile
@@ -1,5 +1,4 @@
 FROM nginx:1.14-alpine
-MAINTAINER "Peter Schiffer" <peter@rfv.sk>
 
 RUN apk add --no-cache curl
 
diff --git a/pdns-admin-uwsgi-ngoduykhanh/Dockerfile b/pdns-admin-uwsgi-ngoduykhanh/Dockerfile
index 61fe837..ded1ab9 100644
--- a/pdns-admin-uwsgi-ngoduykhanh/Dockerfile
+++ b/pdns-admin-uwsgi-ngoduykhanh/Dockerfile
@@ -1,5 +1,4 @@
 FROM pschiffe/pdns-admin-base:ngoduykhanh
-MAINTAINER "Peter Schiffer" <peter@rfv.sk>
 
 RUN dnf -y --setopt=install_weak_deps=False install \
     mariadb \
diff --git a/pdns-admin-uwsgi/Dockerfile b/pdns-admin-uwsgi/Dockerfile
index 95b619c..fb3effd 100644
--- a/pdns-admin-uwsgi/Dockerfile
+++ b/pdns-admin-uwsgi/Dockerfile
@@ -1,5 +1,4 @@
 FROM fedora:29
-MAINTAINER "Peter Schiffer" <peter@rfv.sk>
 
 RUN dnf -y --setopt=install_weak_deps=False install \
     python-pip \
diff --git a/pdns-recursor/Dockerfile b/pdns-recursor/Dockerfile
index 7e27bd9..aafddd8 100644
--- a/pdns-recursor/Dockerfile
+++ b/pdns-recursor/Dockerfile
@@ -1,5 +1,4 @@
 FROM fedora:30
-MAINTAINER "Peter Schiffer" <peter@rfv.sk>
 
 RUN dnf -y --setopt=install_weak_deps=False install \
     pdns-recursor \
diff --git a/pdns-recursor/Dockerfile.alpine b/pdns-recursor/Dockerfile.alpine
index f4a11db..c5ee0b2 100644
--- a/pdns-recursor/Dockerfile.alpine
+++ b/pdns-recursor/Dockerfile.alpine
@@ -1,5 +1,4 @@
 FROM alpine:3.10
-MAINTAINER "Peter Schiffer" <peter@rfv.sk>
 
 RUN apk add --no-cache \
     pdns-recursor \
diff --git a/pdns/Dockerfile b/pdns/Dockerfile
index 66d6cfc..2146213 100644
--- a/pdns/Dockerfile
+++ b/pdns/Dockerfile
@@ -1,5 +1,4 @@
 FROM fedora:30
-MAINTAINER "Peter Schiffer" <peter@rfv.sk>
 
 RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf \
   && dnf -y --setopt=install_weak_deps=False install \
diff --git a/pdns/Dockerfile.alpine b/pdns/Dockerfile.alpine
index 85b3798..d575723 100644
--- a/pdns/Dockerfile.alpine
+++ b/pdns/Dockerfile.alpine
@@ -1,5 +1,4 @@
 FROM alpine:3.10
-MAINTAINER "Peter Schiffer" <peter@rfv.sk>
 
 RUN apk add --no-cache \
     pdns \