diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..48ea624
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,20 @@
+FROM alpine:3.4
+
+ENV BUILD_PKGS="ca-certificates wget"
+
+ENV OAUTH2_PROXY_VERSION="2.1"
+ENV OAUTH2_PROXY_PKG="oauth2_proxy-${OAUTH2_PROXY_VERSION}.linux-amd64.go1.6"
+RUN apk update && \
+    apk upgrade && \
+    apk add $BUILD_PKGS && \
+    mkdir -p /var/tmp/oauth2_proxy && \
+    cd /var/tmp/oauth2_proxy && \
+    wget --progress=dot:mega https://github.com/bitly/oauth2_proxy/releases/download/v${OAUTH2_PROXY_VERSION}/${OAUTH2_PROXY_PKG}.tar.gz && \
+    tar xvf ${OAUTH2_PROXY_PKG}.tar.gz && \
+    cp /var/tmp/oauth2_proxy/${OAUTH2_PROXY_PKG}/oauth2_proxy /bin/ && \
+    apk del $BUILD_PKGS && \
+    rm -rf /var/cache/apk/*
+
+EXPOSE 4180
+
+ENTRYPOINT ["oauth2_proxy"]
diff --git a/README.md b/README.md
index d5a99c2..d314ea3 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,32 @@
-# docker-oauth2-proxy
-Docker image for oauth2_proxy, a reverse proxy that provides authentication with Google, Github or other providers
+# Docker OAuth2 Proxy
+
+[![CircleCI](https://circleci.com/gh/Intellection/docker-oauth2-proxy/tree/master.svg?style=shield)](https://circleci.com/gh/Intellection/docker-oauth2-proxy/tree/master)
+
+This is a small docker image for `oauth2_proxy` which is a reverse proxy
+that provides authentication with Google, GitHub or other providers.
+
+## Configuration
+
+Configure OAuth2 Proxy using config file, command line options, or
+environment variables. See [`bitly/oauth2_proxy` documentation][1] for
+more details.
+
+## Usage
+
+Run without parameters or any configuration:
+
+    # Will error out because of no configuration
+    $ docker run zappi/oauth2_proxy
+    2016/09/16 10:19:26 main.go:99: Invalid configuration:
+      missing setting: upstream
+      missing setting: cookie-secret
+      missing setting: client-id
+      missing setting: client-secret
+      missing setting for email validation: email-domain or authenticated-emails-file required.
+          use email-domain=* to authorize all email addresses
+
+Check version:
+
+    $ docker run zappi/oauth2_proxy --version
+
+[1]: https://github.com/bitly/oauth2_proxy
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 0000000..c36a9b7
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,22 @@
+---
+machine:
+  pre:
+    - curl -sSL https://s3.amazonaws.com/circle-downloads/install-circleci-docker.sh | bash -s -- 1.10.0
+  environment:
+    IMAGE_NAME: 'zappi/oauth2_proxy'
+  services:
+    - docker
+
+test:
+  pre:
+    - docker build --tag=$IMAGE_NAME .
+  override:
+    - docker run $IMAGE_NAME --version
+
+deployment:
+  tagged:
+    tag: /.*/
+    commands:
+      - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
+      - docker tag $IMAGE_NAME $IMAGE_NAME:$CIRCLE_TAG
+      - docker push $IMAGE_NAME:$CIRCLE_TAG