diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000000000000000000000000000000000..41601808ac76b718f61e864b2712112dddeedc4f
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,3 @@
+.git/
+README*
+*.swp
diff --git a/Dockerfile b/Dockerfile
index 51380b268c4bee97551ddf4a131bc0b871c6cf28..198bd5ae5be8a49bcee81e3b5bdc37381ebc188b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,13 @@
-FROM debian:stretch-slim
-ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update && \
-    apt-get install -y unbound unbound-host dnsutils dma bsd-mailx && \
-    rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* /var/cache/apt/archives/* &&
-    unbound-checkconf
-COPY entrypoint.sh /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["/bin/bash", "--login"]
+FROM cznic/knot-resolver
+RUN echo '@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories && \
+    apk add --update \
+        dma@testing \
+        iproute2 \
+        knot-utils \
+        mailx \
+        mtr \
+    && \
+    rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
+COPY entrypoint /entrypoint
+ENTRYPOINT [ "/entrypoint" ]
+CMD [ "bash", "--login" ]
diff --git a/README.md b/README.md
index a64614d7ca55c36dcfba018b970f55119845c283..cf851a8aaebbbe41f5de8519be3d58a68c04e8a0 100644
--- a/README.md
+++ b/README.md
@@ -5,5 +5,4 @@ https://www.shore.co.il/blog/resolver/.
 
 ## Usage
 
-    docker pull adarnimrod/resolver
     docker run -it adarnimrod/resolver
diff --git a/entrypoint.sh b/entrypoint
similarity index 59%
rename from entrypoint.sh
rename to entrypoint
index 64e0c207589e31aad70c5454e1921b8e0580d938..6523ccbc7f0daecaca08eee2502ce0ab274aac22 100755
--- a/entrypoint.sh
+++ b/entrypoint
@@ -1,5 +1,5 @@
 #!/bin/sh
 set -eu
-service unbound start
+echo "net = { '127.0.0.1', '::1'}" | nohup kresd -f1 &
 echo 'nameserver 127.0.0.1' > /etc/resolv.conf
 eval "exec $@"