diff --git a/.circleci/config.yml b/.circleci/config.yml
index b783339b..f69d47ab 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -76,8 +76,13 @@ jobs:
           make -C generator docker-tag-latest DOCKER_IMAGE_TAG="$CIRCLE_TAG"
           make -C generator docker-tag-latest DOCKER_IMAGE_TAG="$CIRCLE_TAG" DOCKER_REPO=quay.io/prometheus
         fi
-    - run: make -C generator docker-publish
-    - run: make -C generator docker-publish DOCKER_REPO=quay.io/prometheus
+    - run: make -C generator docker-publish DOCKER_IMAGE_TAG=$CIRCLE_TAG
+    - run: make -C generator docker-publish DOCKER_IMAGE_TAG=$CIRCLE_TAG DOCKER_REPO=quay.io/prometheus
+    - run: |
+        if [[ "$CIRCLE_TAG" =~ ^v[0-9]+(\.[0-9]+){2}$ ]]; then
+          make -C generator docker-publish DOCKER_IMAGE_TAG="latest"
+          make -C generator docker-publish DOCKER_IMAGE_TAG="latest" DOCKER_REPO=quay.io/prometheus
+        fi
 
   mixin:
     executor: golang