diff --git a/.github/workflows/release-docker.yaml b/.github/workflows/release-docker.yaml
index 286a0cc34a..4fe8eab1a9 100644
--- a/.github/workflows/release-docker.yaml
+++ b/.github/workflows/release-docker.yaml
@@ -11,7 +11,7 @@ concurrency:
 
 env:
   IMAGE_REGISTRY: docker.io
-  IMAGE_REPOSITORY: kubeflow/spark-operator
+  IMAGE_REPOSITORY: chenyi015/spark-operator
 
 # Ref: https://docs.docker.com/build/ci/github-actions/multi-platform/#distribute-build-across-multiple-runners.
 jobs:
@@ -39,6 +39,9 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_REPOSITORY }}
+          tags: |
+            type=ref,event=branch
+            type=semver,pattern={{version}}
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -95,6 +98,9 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_REPOSITORY }}
+          tags: |
+            type=ref,event=branch
+            type=semver,pattern={{version}}
 
       - name: Login to container registry
         uses: docker/login-action@v3