diff --git a/dnscrypt/Dockerfile b/dnscrypt/Dockerfile
index ec8b7ff..6f19dcf 100644
--- a/dnscrypt/Dockerfile
+++ b/dnscrypt/Dockerfile
@@ -4,7 +4,8 @@ MAINTAINER kev
 RUN apt-get update
 RUN apt-get install -y build-essential supervisor dnsmasq
 
-ADD ./*.conf /etc/supervisor/conf.d/
+ADD ./services.conf /etc/supervisor/conf.d/
+ADD ./dnsmasq.conf /etc/
 ADD https://download.libsodium.org/libsodium/releases/libsodium-1.0.2.tar.gz /tmp/
 ADD http://download.dnscrypt.org/dnscrypt-proxy/dnscrypt-proxy-1.4.3.tar.gz /tmp/
 
@@ -19,7 +20,7 @@ RUN tar xzf libsodium-1.0.2.tar.gz && \
 RUN echo /usr/local/lib > /etc/ld.so.conf.d/local.conf && ldconfig
 
 RUN tar xzf dnscrypt-proxy-1.4.3.tar.gz && \
-    cd dnscrypt-proxy && \
+    cd dnscrypt-proxy-1.4.3 && \
     ./configure && \
     make && \
     make install
diff --git a/dnscrypt/dnsmasq.conf b/dnscrypt/dnsmasq.conf
index e47a78f..b334acd 100644
--- a/dnscrypt/dnsmasq.conf
+++ b/dnscrypt/dnsmasq.conf
@@ -1,2 +1,7 @@
-[program:dnsmasq]
-command = dnsmasq -d
+bind-interfaces
+listen-address=0.0.0.0
+port=53
+user=root
+no-resolv
+strict-order
+server=127.0.0.1#2053
diff --git a/dnscrypt/dnscrypt.conf b/dnscrypt/services.conf
similarity index 64%
rename from dnscrypt/dnscrypt.conf
rename to dnscrypt/services.conf
index 96c615c..385cc85 100644
--- a/dnscrypt/dnscrypt.conf
+++ b/dnscrypt/services.conf
@@ -1,2 +1,5 @@
 [program:dnscrypt]
 command = dnscrypt-proxy -a 127.0.0.1:2053 -R opendns
+
+[program:dnsmasq]
+command = dnsmasq -d