diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..9414382
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+Dockerfile
diff --git a/Dockerfile b/Dockerfile
index a2dd072..535b45d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,31 @@
-FROM golang:1.11.2-alpine3.8
+FROM golang:1.11.2-alpine3.8 as build
 
 RUN apk add --update nodejs nodejs-npm make git
 RUN npm install -g less
 RUN npm install -g less-plugin-clean-css
 
 WORKDIR /go/src/app
 COPY . .
 
 RUN make install
 RUN make ui
 RUN make deps
 
+RUN mkdir /stage && \
+    cp -R /go/bin \
+       /go/src/app/templates \
+       /go/src/app/static \
+       /go/src/app/schema.sql \
+       /go/src/app/pages \
+       /go/src/app/keys \
+      /stage && ls -l /stage
+
+FROM golang:1.11.2-alpine3.8
+
+COPY --from=build --chown=daemon:daemon /stage /go
+
+VOLUME /go/keys
 EXPOSE 8080
+USER daemon
+
 CMD ["writefreely"]