diff --git a/.github/workflows/ogame-vue-ts.yml b/.github/workflows/ogame-vue-ts.yml
index 9a8b698..3aa3a4e 100644
--- a/.github/workflows/ogame-vue-ts.yml
+++ b/.github/workflows/ogame-vue-ts.yml
@@ -27,17 +27,17 @@ jobs:
       - name: 设置 Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      # 登录 GHCR
+      # 登录 GHCR（始终执行）
       - name: 登录 GitHub Container Registry
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}   # 强烈建议直接用 GITHUB_TOKEN，不需要手动建 GHCR_TOKEN！
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-      # 登录 Docker Hub（如果你还要推）
+      # 登录 Docker Hub（只在用户名存在时执行）
       - name: 登录 Docker Hub
-        if: vars.DOCKERHUB_USERNAME != '' && secrets.DOCKERHUB_TOKEN != ''
+        if: vars.DOCKERHUB_USERNAME != ''  # 只检查 vars，忽略 secrets
         uses: docker/login-action@v3
         with:
           username: ${{ vars.DOCKERHUB_USERNAME }}
@@ -53,7 +53,7 @@ jobs:
           tags: |
             ghcr.io/${{ github.repository_owner }}/ogame-vue-ts:latest
             ghcr.io/${{ github.repository_owner }}/ogame-vue-ts:${{ github.sha }}
-            ${{ vars.DOCKERHUB_USERNAME != '' && format('{0}/ogame-vue-ts:latest', vars.DOCKERHUB_USERNAME) || '' }}
-            ${{ vars.DOCKERHUB_USERNAME != '' && format('{0}/ogame-vue-ts:{1}', vars.DOCKERHUB_USERNAME, github.sha) || '' }}
+            ${{ vars.DOCKERHUB_USERNAME != '' && format('docker.io/{0}/ogame-vue-ts:latest', vars.DOCKERHUB_USERNAME) || '' }}
+            ${{ vars.DOCKERHUB_USERNAME != '' && format('docker.io/{0}/ogame-vue-ts:{1}', vars.DOCKERHUB_USERNAME, github.sha) || '' }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
\ No newline at end of file