diff --git a/.github/workflows/docker_build_base.yml b/.github/workflows/docker_build_base.yml
index 68cf23b808b..386b0e84a77 100644
--- a/.github/workflows/docker_build_base.yml
+++ b/.github/workflows/docker_build_base.yml
@@ -55,16 +55,14 @@ jobs:
         run: echo "TAG_NAME=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
 
       - name: Set Docker tag name
-        if: startsWith(github.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/tags/') && matrix.branch == "latest"
         run: |
           if [[ "${{ matrix.branch }}" == "latest" ]]; then
             echo "DOCKER_TAG=frouioui/base:${TAG_NAME}" >> $GITHUB_ENV
-          else
-            echo "DOCKER_TAG=frouioui/base:${TAG_NAME}-${{ matrix.branch }}" >> $GITHUB_ENV
           fi
 
-      - name: Build and push on main
-        if: startsWith(github.ref, 'refs/tags/')
+      - name: Build and push on tags
+        if: startsWith(github.ref, 'refs/tags/') && matrix.branch == "latest"
         uses: docker/build-push-action@v5
         with:
           context: .
diff --git a/.github/workflows/docker_build_lite.yml b/.github/workflows/docker_build_lite.yml
index 54c2bcb2419..7f355ddfd32 100644
--- a/.github/workflows/docker_build_lite.yml
+++ b/.github/workflows/docker_build_lite.yml
@@ -63,7 +63,7 @@ jobs:
             echo "DOCKER_TAG=vitess/lite:${TAG_NAME}-${{ matrix.branch }}" >> $GITHUB_ENV
           fi
 
-      - name: Build and push on main
+      - name: Build and push on tags
         if: startsWith(github.ref, 'refs/tags/')
         uses: docker/build-push-action@v5
         with: