diff --git a/.circleci/config.yml b/.circleci/config.yml
index 43ec3b304c..7723294cf2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -171,11 +171,11 @@ jobs:
             git config user.email "<ci@camptocamp.com>"
             git config user.name "CI"
             git fetch push
+      - run:
+          name: Clean Docker hub tags
+          command: ci/clean-dockerhub-tags
       - deploy: &publish-docker-pip
           name: Push to Docker hub and Pypi
-          # git remote add full https://github.com/camptocamp/c2cgeoportal.git || true
-          # git fetch --tags --prune
-          # ci/clean-dockerhub-tags
           command: |
             docker build --target=builder --tag=camptocamp/geomapfish-build \
             --build-arg=MAJOR_VERSION=${MAJOR_VERSION} .
diff --git a/ci/clean-dockerhub-tags b/ci/clean-dockerhub-tags
index 5a74f4e12b..cf6af411df 100755
--- a/ci/clean-dockerhub-tags
+++ b/ci/clean-dockerhub-tags
@@ -64,8 +64,7 @@ def clean_images(image, tag_=lambda tag: tag):
             }
         )
 
-
-for image in ["geomapfish-build", "geomapfish-build-dev", "geomapfish-geoportal"]:
+for image in ["geomapfish", "geomapfish-build", "geomapfish-scaffolds", "geomapfish-geoportal"]:
     clean_images(image)