diff --git a/docker-compose.yml b/docker-compose.yml
index b5339e6..7b50aee 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 pdns:
   #build: pdns
-  image: interlegis/powerdns:4.0.1-1
+  image: interlegis/powerdns:4.4.0
   links:
     - "mysql:mysql"
   ports:
@@ -9,13 +9,11 @@ pdns:
     - "8088:8081"
   environment:
     - PDNSCONF_API_KEY=a_strong_api_key
-    - PDNSCONF_MASTER=yes
-    - PDNSCONF_DEFAULT_SOA_NAME=dnsserver.domain.com
     - PDNSCONF_DNSUPDATE=yes
     - SECALLZONES_CRONJOB=yes
 
 mysql:
-  image: bitnami/mariadb:latest
+  image: bitnami/mariadb:10.1.14-r3
   environment:
     - MARIADB_ROOT_PASSWORD=mysqlrootpw
     - MARIADB_REPLICATION_MODE=master
@@ -24,4 +22,7 @@ mysql:
     - MARIADB_DATABASE=pdns
     - MARIADB_USER=pdns
     - MARIADB_PASSWORD=pdnspw
-
+  volumes:
+    - dnsmasterdb:/bitnami/mariadb
+  ports:
+    - 3306:3306
diff --git a/pdns/Dockerfile b/pdns/Dockerfile
index 6946715..f049a66 100644
--- a/pdns/Dockerfile
+++ b/pdns/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stretch-slim
+FROM debian:buster
 
 MAINTAINER Fabio Rauber <fabiorauber@gmail.com>
 
@@ -12,13 +12,14 @@ ENV PDNSCONF_LAUNCH="gmysql" \
     PDNSCONF_API_KEY="" \
     SECALLZONES_CRONJOB="no"
 
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -q -y curl gnupg && \
+    curl https://repo.powerdns.com/FD380FBB-pub.asc | apt-key add - 
+
 ADD pdns.list /etc/apt/sources.list.d/pdns.list
 ADD pdns.preference /etc/apt/preferences.d/pdns 
 
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -q -y curl gnupg && \
-    curl https://repo.powerdns.com/FD380FBB-pub.asc | apt-key add - && apt-get update
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -q -y pdns-server pdns-backend-mysql mysql-client && \
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -q -y pdns-server pdns-backend-mysql mariadb-client && \
     rm /etc/powerdns/pdns.d/*.conf && rm /etc/powerdns/*.conf && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends cron jq && \
     rm /etc/cron.daily/* && \
diff --git a/pdns/pdns.list b/pdns/pdns.list
index a45af4c..4d82f70 100644
--- a/pdns/pdns.list
+++ b/pdns/pdns.list
@@ -1 +1 @@
-deb [arch=amd64] http://repo.powerdns.com/debian stretch-auth-44 main
+deb [arch=amd64] http://repo.powerdns.com/debian buster-auth-44 main