diff --git a/pdns/Dockerfile b/pdns/Dockerfile
index 432fdc6..007c046 100644
--- a/pdns/Dockerfile
+++ b/pdns/Dockerfile
@@ -1,5 +1,5 @@
-FROM fedora:27
-MAINTAINER "Peter Schiffer" <pschiffe@redhat.com>
+FROM fedora:29
+MAINTAINER "Peter Schiffer" <peter@rfv.sk>
 
 RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf \
   && dnf -y --setopt=install_weak_deps=False install \
@@ -8,10 +8,9 @@ RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf \
     mariadb \
   && dnf clean all
 
-RUN pip3 install envtpl \
-  && rm -rf ~/.cache/*
+RUN pip3 install --no-cache-dir envtpl
 
-ENV VERSION=4.0 \
+ENV VERSION=4.1 \
   PDNS_guardian=yes \
   PDNS_setuid=pdns \
   PDNS_setgid=pdns \
diff --git a/pdns/Dockerfile.alpine b/pdns/Dockerfile.alpine
index c2cc2a1..b142daf 100644
--- a/pdns/Dockerfile.alpine
+++ b/pdns/Dockerfile.alpine
@@ -1,5 +1,5 @@
 FROM alpine:3.8
-MAINTAINER "Peter Schiffer" <pschiffe@redhat.com>
+MAINTAINER "Peter Schiffer" <peter@rfv.sk>
 
 RUN apk add --no-cache \
     pdns \
@@ -8,8 +8,7 @@ RUN apk add --no-cache \
     python3 \
     mariadb-client
 
-RUN pip3 install envtpl \
-  && rm -rf ~/.cache/*
+RUN pip3 install --no-cache-dir envtpl
 
 ENV VERSION=4.1 \
   PDNS_guardian=yes \
diff --git a/pdns/docker-cmd.sh b/pdns/docker-cmd.sh
index 4b90959..321e7f8 100755
--- a/pdns/docker-cmd.sh
+++ b/pdns/docker-cmd.sh
@@ -38,7 +38,7 @@ if [ "${SUPERMASTER_IPS:-}" ]; then
     $MYSQL_COMMAND -D "$PDNS_gmysql_dbname" -e "TRUNCATE supermasters;"
     MYSQL_INSERT_SUPERMASTERS=''
     for i in $SUPERMASTER_IPS; do
-        MYSQL_INSERT_SUPERMASTERS="${MYSQL_INSERT_SUPERMASTERS} INSERT INTO supermasters VALUES('${i}', '${HOSTNAME}', 'admin');"
+        MYSQL_INSERT_SUPERMASTERS="${MYSQL_INSERT_SUPERMASTERS} INSERT INTO supermasters VALUES('${i}', '$(uname -n)', 'admin');"
     done
     $MYSQL_COMMAND -D "$PDNS_gmysql_dbname" -e "$MYSQL_INSERT_SUPERMASTERS"
 fi