diff --git a/.github/workflows/build-and-push-to-docker.yml b/.github/workflows/build-and-push-to-docker.yml
index 5a2682ea..8cd74faa 100644
--- a/.github/workflows/build-and-push-to-docker.yml
+++ b/.github/workflows/build-and-push-to-docker.yml
@@ -143,6 +143,8 @@ jobs:
         images: ${{ env.DOCKER_PREFIX }}-py-homedir-envs
         tags: |
           type=sha,prefix=${{ matrix.BASE_PYTHON_VERSION }}-
+          type=semver,pattern={{version}},prefix=${{ matrix.BASE_PYTHON_VERSION }}-
+          type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' && matrix.BASE_PYTHON_VERSION == env.DEFAULT_PYTHON_VERSION }} 
     - name: Build and load
       uses: docker/build-push-action@v5
       with: