diff --git a/Dockerfile b/Dockerfile
index dde3371..75b3ae3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,8 @@ ARG GO_VERSION=1.14
 
 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS builder
 RUN apk add -q --progress --update --no-cache git musl-dev gcc ca-certificates tzdata
+RUN mkdir -p /caddydir/data && \
+    chmod -R 700 /caddydir
 ENV GO111MODULE=on \
     CGO_ENABLED=0
 RUN go get github.com/caddyserver/xcaddy/cmd/xcaddy@master
@@ -13,7 +15,7 @@ ARG PLUGINS=
 RUN for plugin in $(echo $PLUGINS | tr "," " "); do withFlags="$withFlags --with $plugin"; done && \
     xcaddy build ${CADDY_VERSION} ${withFlags}
 
-FROM alpine:${ALPINE_VERSION}
+FROM scratch
 ARG VERSION
 ARG CADDY_VERSION
 ARG BUILD_DATE
@@ -34,9 +36,7 @@ EXPOSE 8080 8443 2015
 ENV HOME=/caddydir \
     CADDYPATH=/caddydir/data \
     TZ=America/Montreal
-RUN mkdir -p /caddydir/data && \
-    chown -R 1000 /caddydir && \
-    chmod -R 700 /caddydir
+COPY --from=builder --chown=1000 /caddydir /caddydir
 VOLUME ["/caddydir"]
 ENTRYPOINT ["/caddy"]
 USER 1000
diff --git a/README.md b/README.md
index 1d06ef1..9253ab0 100644
--- a/README.md
+++ b/README.md
@@ -22,9 +22,7 @@
 - Plugins can easily be added by building the Docker image with a build argument
 - Compatible with `amd64`, `386` and `arm64` CPU architectures
 - [Docker image tags and sizes](https://hub.docker.com/r/qmcgaw/caddy-scratch/tags)
-    - `qmcgaw:caddy-scratch` / 41.1MB / Based on [Caddy v2.0.0](https://github.com/caddyserver/caddy/releases/tag/v2.0.0) and Alpine 3.11
-    - ~`qmcgaw:caddy-scratch:v2.0.0`~ / ? / Based on [Caddy v2.0.0](https://github.com/caddyserver/caddy/releases/tag/v2.0.0) - - -  **waiting for [this issue](https://github.com/caddyserver/xcaddy/issues/17)**
-    - `qmcgaw:caddy-scratch:v2.0.0-alpine` / 41.1MB / Based on [Caddy v2.0.0](https://github.com/caddyserver/caddy/releases/tag/v2.0.0) and Alpine 3.11 (*until [this issue](https://github.com/caddyserver/xcaddy/issues/17) gets resolved*)
+    - `qmcgaw:caddy-scratch` / 35.4MB / Based on [Caddy v2.0.0](https://github.com/caddyserver/caddy/releases/tag/v2.0.0) and Alpine 3.11
     - `qmcgaw:caddy-scratch:v1.0.5` / 17.2MB / Based on [Caddy v1.0.5](https://github.com/caddyserver/caddy/releases/tag/v1.0.5) / [**Documentation**](https://github.com/qdm12/caddy-scratch/blob/dd9e13597f99228b8dcf769155a1af67268aeaf2/README.md)
     - `qmcgaw:caddy-scratch:v1.0.4` / 17.3MB / Based on [Caddy v1.0.4](https://github.com/caddyserver/caddy/releases/tag/v1.0.4) / [**Documentation**](https://github.com/qdm12/caddy-scratch/blob/d387849664b0df7b931a31113017b70a0ebe18cc/README.md)
 
diff --git a/docker-compose.yml b/docker-compose.yml
index b14601a..a38a59e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,8 +3,8 @@ services:
   caddy:
     image: qmcgaw/caddy-scratch
     container_name: caddy
-    volumes:
-      - ./caddydir:/caddydir
+    #volumes:
+    #  - ./caddydir:/caddydir
     environment:
       - TZ=America/Montreal
     network_mode: bridge