diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..b7d0106
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,23 @@
+version: 2
+jobs:
+ build:
+   docker:
+    - image: golang:1.6.4
+   steps:
+    - setup_remote_docker
+    - checkout
+    - run:
+        name: Install Docker client
+        command: |
+          set -x
+          VER="17.03.0-ce"
+          curl -L -o /tmp/docker-$VER.tgz https://download.docker.com/linux/static/stable/x86_64/docker-$VER.tgz
+          tar -xz -C /tmp -f /tmp/docker-$VER.tgz
+          mv /tmp/docker/* /usr/bin
+
+    - run: docker login -u $DOCKER_USER -p $DOCKER_PASS
+    - run: docker build -t chaospott/site .
+    - run: |
+        docker tag chaospott/site chaospott/site:$CIRCLE_SHA1
+        docker push chaospott/site:$CIRCLE_SHA1
+        docker push chaospott/site:latest