diff --git a/Dockerfile b/Dockerfile
index 198bd5ae5be8a49bcee81e3b5bdc37381ebc188b..0aa9d31b891d9b6a5e9303a031399e1d2f44e708 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,12 @@
 FROM cznic/knot-resolver
 RUN echo '@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories && \
-    apk add --update \
+    apk add --update --no-cache \
         dma@testing \
         iproute2 \
         knot-utils \
         mailx \
-        mtr \
-    && \
-    rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
+        mtr
 COPY entrypoint /entrypoint
+WORKDIR /
 ENTRYPOINT [ "/entrypoint" ]
 CMD [ "bash", "--login" ]
diff --git a/README.md b/README.md
index cf851a8aaebbbe41f5de8519be3d58a68c04e8a0..cff10ad7df4a038a4f2ff5834f2bbc3014c4f4d5 100644
--- a/README.md
+++ b/README.md
@@ -5,4 +5,4 @@ https://www.shore.co.il/blog/resolver/.
 
 ## Usage
 
-    docker run -it adarnimrod/resolver
+    docker run --rm -it adarnimrod/resolver