diff --git a/.circleci/config.yml b/.circleci/config.yml
index b42b2aa64..bd1ca86cd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -72,6 +72,16 @@ jobs:
       - *fast-checkout
       - run: sudo pip install awscli
       - run: make prerelease-upload
+  dockerhub-upload:
+    <<: *defaults
+    steps:
+      - run: '[[ -v CIRCLE_PR_NUMBER ]] && circleci step halt || true' # Skip job if this is a PR
+      - *fast-checkout
+      - setup_remote_docker
+      - run: make docker
+      - run: docker tag pilosa:$(git describe --tags) pilosa/pilosa:master
+      - run: docker login -u $DOCKER_USER -p $DOCKER_PASS
+      - run: docker push pilosa/pilosa:master
 workflows:
   version: 2
   test:
@@ -105,3 +115,7 @@ workflows:
       - prerelease-upload:
           requires:
             - prerelease
+      - dockerhub-upload:
+          requires:
+            - linter
+            - test-golang-1.10