diff --git a/dnsmasq/Dockerfile b/dnsmasq/Dockerfile
index b3d5338..3d4415a 100644
--- a/dnsmasq/Dockerfile
+++ b/dnsmasq/Dockerfile
@@ -2,9 +2,9 @@
 # Dockerfile for dnsmasq
 #
 
-FROM alpine
+FROM alpine:3
 
-MAINTAINER kev <norelply@easypi.pro>
+MAINTAINER EasyPi Software Foundation
 
 RUN set -xe \
     && apk add --no-cache dnsmasq-dnssec \
diff --git a/dnsmasq/README.md b/dnsmasq/README.md
index 555f229..b2750f8 100644
--- a/dnsmasq/README.md
+++ b/dnsmasq/README.md
@@ -4,20 +4,4 @@ dnsmasq
 [Dnsmasq][1] is a Domain Name System forwarder and Dynamic Host Configuration
 Protocol server for small computer networks, created as free software.
 
-## docker-compose.yml
-
-```yaml
-dnsmasq:
-  image: vimagick/dnsmasq
-  ports:
-    - "53:53/tcp"
-    - "53:53/udp"
-    - "67:67/udp"
-  volumes:
-    - ./dnsmasq.d:/etc/dnsmasq.d
-  cap_add:
-    - NET_ADMIN
-  restart: always
-```
-
 [1]: http://www.thekelleys.org.uk/dnsmasq/doc.html
diff --git a/dnsmasq/arm/Dockerfile b/dnsmasq/arm/Dockerfile
deleted file mode 100644
index 11c99e9..0000000
--- a/dnsmasq/arm/Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Dockerfile for dnsmasq-arm
-#
-
-FROM arm32v7/alpine:3
-
-MAINTAINER EasyPi Software Foundation
-
-RUN set -xe \
-    && apk add --no-cache dnsmasq-dnssec \
-    && echo "conf-dir=/etc/dnsmasq.d,*.conf" >> /etc/dnsmasq.conf
-
-VOLUME /etc/dnsmasq.d
-
-EXPOSE 53/tcp \
-       53/udp \
-       67/udp
-
-ENTRYPOINT ["dnsmasq", "--no-daemon", "--user=dnsmasq", "--group=dnsmasq"]
diff --git a/dnsmasq/arm/dnsmasq.conf b/dnsmasq/arm/dnsmasq.conf
deleted file mode 100644
index f43e6d1..0000000
--- a/dnsmasq/arm/dnsmasq.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-no-hosts
-no-resolv
-cache-size=10000
-server=127.0.0.1#2053
diff --git a/dnsmasq/arm/docker-compose.yml b/dnsmasq/arm/docker-compose.yml
deleted file mode 100644
index b7b7312..0000000
--- a/dnsmasq/arm/docker-compose.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-dnsmasq:
-  image: easypi/dnsmasq-arm
-  volumes:
-    - ./dnsmasq.conf:/etc/dnsmasq.d/dnsmasq.conf
-  net: container:dnscrypt
-  restart: always
-
-dnscrypt:
-  image: easypi/dnscrypt-proxy-arm
-  command: dnscrypt-proxy -a 127.0.0.1:2053 -R cisco
-  ports:
-    - "53:53/tcp"
-    - "53:53/udp"
-    - "67:67/udp"
-  cap_add:
-    - NET_ADMIN
-  restart: always
diff --git a/dnsmasq/dnsmasq.d/README b/dnsmasq/data/README
similarity index 100%
rename from dnsmasq/dnsmasq.d/README
rename to dnsmasq/data/README
diff --git a/dnsmasq/dnsmasq.d/ads.conf b/dnsmasq/data/ads.conf
similarity index 100%
rename from dnsmasq/dnsmasq.d/ads.conf
rename to dnsmasq/data/ads.conf
diff --git a/dnsmasq/dnsmasq.d/dnssec.conf b/dnsmasq/data/dnssec.conf
similarity index 100%
rename from dnsmasq/dnsmasq.d/dnssec.conf
rename to dnsmasq/data/dnssec.conf
diff --git a/dnsmasq/dnsmasq.d/hosts.conf b/dnsmasq/data/hosts.conf
similarity index 100%
rename from dnsmasq/dnsmasq.d/hosts.conf
rename to dnsmasq/data/hosts.conf
diff --git a/dnsmasq/dnsmasq.d/logging.conf b/dnsmasq/data/logging.conf
similarity index 100%
rename from dnsmasq/dnsmasq.d/logging.conf
rename to dnsmasq/data/logging.conf
diff --git a/dnsmasq/dnsmasq.d/nxdomains.conf b/dnsmasq/data/nxdomains.conf
similarity index 100%
rename from dnsmasq/dnsmasq.d/nxdomains.conf
rename to dnsmasq/data/nxdomains.conf
diff --git a/dnsmasq/dnsmasq.d/settings.conf b/dnsmasq/data/settings.conf
similarity index 100%
rename from dnsmasq/dnsmasq.d/settings.conf
rename to dnsmasq/data/settings.conf
diff --git a/dnsmasq/docker-compose.yml b/dnsmasq/docker-compose.yml
index 2a30bd4..d2e7faf 100644
--- a/dnsmasq/docker-compose.yml
+++ b/dnsmasq/docker-compose.yml
@@ -1,11 +1,13 @@
-dnsmasq:
-  image: vimagick/dnsmasq
-  ports:
-    - "53:53/tcp"
-    - "53:53/udp"
-    - "67:67/udp"
-  volumes:
-    - ./dnsmasq.d:/etc/dnsmasq.d
-  cap_add:
-    - NET_ADMIN
-  restart: always
+version: "3.8"
+services:
+  dnsmasq:
+    image: vimagick/dnsmasq
+    ports:
+      - "53:53/tcp"
+      - "53:53/udp"
+      - "67:67/udp"
+    volumes:
+      - ./data:/etc/dnsmasq.d
+    cap_add:
+      - NET_ADMIN
+    restart: unless-stopped