diff --git a/README.md b/README.md
index bc6ec0b..8a873bd 100644
--- a/README.md
+++ b/README.md
@@ -18,4 +18,4 @@ When run the app will output standard log lines, one of which will contain the `
 
 ## Docker
 
-Currently, the dockerfile is out of date and is not usable. Check back for updates.
\ No newline at end of file
+Build by executing `docker build -f docker/Dockerfile .`
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000..6fb3a9e
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,68 @@
+FROM alpine:latest as tor-build-stage
+
+# Install prerequisites, grab tor, compile it and move to /usr/local
+RUN apk --no-cache add --update \
+        gnupg \
+        build-base \
+        libevent \
+        libevent-dev \
+        libressl \
+        libressl-dev \
+        xz-libs \
+        xz-dev \
+        zlib \
+        zlib-dev \
+        zstd \
+        zstd-dev \
+      && wget -q https://dist.torproject.org/tor-0.4.6.6.tar.gz \
+      && tar xf tor-0.4.6.6.tar.gz \
+      && cd tor-0.4.6.6 \
+      && ./configure \
+      && make install \
+      && ls -R /usr/local/
+
+FROM golang:alpine as cwtch-build-stage
+# Need additional packages for cgo etc
+RUN apk --no-cache add --update gcc build-base
+
+# Copy source files from the repo to /go/src
+COPY . src/
+
+#Build Cwtch
+RUN cd src/app && go build 
+
+
+FROM alpine:latest
+#Specify various env vars
+ENV TOR_USER=_tor CWTCH_USER=_cwtch CWTCH_HOME=/var/lib/cwtch
+
+# Installing dependencies of Tor
+RUN apk --no-cache add --update \
+      libevent \
+      libressl \
+      xz-libs \
+      zlib \
+      zstd \
+      zstd-dev
+
+# Copy Tor
+COPY --from=tor-build-stage /usr/local/ /usr/local/
+
+#Copy cwtch app
+COPY --from=cwtch-build-stage /go/src/app/app /usr/local/bin/cwtch
+
+# Create unprivileged users
+RUN mkdir -p /run/tor && mkdir /var/lib/cwtch && addgroup -S $TOR_USER && adduser -G $TOR_USER -S $TOR_USER && adduser -S $CWTCH_USER
+
+# Copy Tor configuration file
+COPY ./docker/torrc /etc/tor/torrc
+
+# Copy docker-entrypoint
+COPY ./docker/docker-entrypoint /usr/local/bin/
+
+# Persist data
+VOLUME /etc/tor /var/lib/tor /var/lib/cwtch
+
+ENTRYPOINT ["docker-entrypoint"]
+CMD ["/usr/local/bin/cwtch","--exportTofuBundle"]
+