diff --git a/docker/tendermint-automated/Dockerfile b/docker/tendermint-automated/Dockerfile
new file mode 100644
index 000000000..e10518f96
--- /dev/null
+++ b/docker/tendermint-automated/Dockerfile
@@ -0,0 +1,23 @@
+FROM alpine:3.7
+MAINTAINER Greg Szabo <greg@tendermint.com>
+
+#Default home for tendermint
+ENV TMHOME /tendermint
+RUN apk --no-cache update && \
+    apk --no-cache upgrade && \
+    apk add --no-cache bash curl jq openssl && \
+    mkdir -p $TMHOME && \
+    addgroup tmuser && \
+    adduser -S -G tmuser tmuser && \
+    chown -R tmuser:tmuser $TMHOME
+
+VOLUME [ $TMHOME ]
+EXPOSE 46656 46657
+ENTRYPOINT ["/usr/bin/tendermint"]
+CMD ["node", "--moniker=`hostname`"]
+WORKDIR $TMHOME
+STOPSIGNAL SIGTERM
+
+ARG BINARY=tendermint
+COPY $BINARY /usr/bin/tendermint
+
diff --git a/docker/tendermint-automated/README.rst b/docker/tendermint-automated/README.rst
new file mode 100644
index 000000000..f5582ce80
--- /dev/null
+++ b/docker/tendermint-automated/README.rst
@@ -0,0 +1 @@
+This is a temporary folder to contain the Dockerfile used for automated builds, until it is merged with the tendermint repository.