diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index ce7ea9fe..2a6d57aa 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -18,10 +18,10 @@ jobs:
       - name: Setup Environments
         id: envs
         run: |
-          CLOUDREVE_LATEST_TAG=$(git tag -l --sort=-creatordate | head -n 1)
+          CLOUDREVE_LATEST_TAG=$(git describe --tags --abbrev=0)
           DOCKER_IMAGE="cloudreve/cloudreve"
 
-          echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}"
+          echo "RELEASE_VERSION=${GITHUB_REF#refs}"
           TAGS="${DOCKER_IMAGE}:latest,${DOCKER_IMAGE}:${CLOUDREVE_LATEST_TAG}"
 
           echo "CLOUDREVE_LATEST_TAG:${CLOUDREVE_LATEST_TAG}"