diff --git a/.circleci/config.yml b/.circleci/config.yml
index e25220b0..d606a6da 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -87,9 +87,13 @@ jobs:
       - deploy:
           name: Publish
           command: |
+            if [[ "${CIRCLE_BRANCH}" == "develop" ]]; then
+              docker login -u "${DOCKERHUB_USERNAME}" -p "${DOCKERHUB_PASSWORD}"
+              ./godelw docker push --tags=snapshot
+            fi
             if [[ -n "${CIRCLE_TAG}" ]] ; then
               docker login -u "${DOCKERHUB_USERNAME}" -p "${DOCKERHUB_PASSWORD}"
-              ./godelw docker push
+              ./godelw docker push --tags=latest,version
               ./godelw publish bintray \
                   --url https://api.bintray.com \
                   --subject palantir --repository releases --product policy-bot \
diff --git a/godel/config/dist-plugin.yml b/godel/config/dist-plugin.yml
index 4689d170..2b15f8a8 100644
--- a/godel/config/dist-plugin.yml
+++ b/godel/config/dist-plugin.yml
@@ -38,7 +38,8 @@ products:
             #!/usr/bin/env bash
             cp -R docker/* ${CONTEXT_DIR}
           tag-templates:
-            - "{{Repository}}palantirtechnologies/policy-bot:latest"
-            - "{{Repository}}palantirtechnologies/policy-bot:{{Version}}"
+            version: "{{Repository}}palantirtechnologies/policy-bot:{{Version}}"
+            latest: "{{Repository}}palantirtechnologies/policy-bot:latest"
+            snapshot: "{{Repository}}palantirtechnologies/policy-bot:snapshot"
     publish:
       group-id: com.palantir.policy-bot