diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index c98bdc2..f6be385 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -14,13 +14,23 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # 获取完整的 git history 以便生成正确的 tag
+      -
+        name: Get Version
+        id: get_version
+        run: |
+          echo "VERSION=$(git describe --dirty --always --tags --abbrev=7)" >> $GITHUB_OUTPUT
       -
         name: Login to ${{ env.REGISTRY }}
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
-          username: ${{ secrets.DOCKERHUB_USER }}
+          username: ${{github.actor}}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Set up QEMU
@@ -34,4 +44,6 @@ jobs:
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ env.REGISTRY }}/${{ secrets.DOCKER_HUB_USER }}/${{ github.event.repository.name }}:latest
+          tags: |
+            ${{ env.REGISTRY }}/${{github.actor}}/${{ github.event.repository.name }}:latest
+            ${{ env.REGISTRY }}/${{github.actor}}/${{ github.event.repository.name }}:${{ steps.get_version.outputs.VERSION }}