diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index dfd8507b4..7d9eefa24 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -26,7 +26,7 @@ jobs:
         run: |
           DATE=$(date +%Y%m%d)
           SHA=$(git rev-parse --short HEAD)
-          BASE_VERSION=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0")
+          BASE_VERSION=$(git describe --tags --match "v*" --exclude "*nightly*" --abbrev=0 2>/dev/null || echo "v0.0.0")
           VERSION="${BASE_VERSION}-nightly-${DATE}-${SHA}"
           TAG="nightly-${DATE}-${SHA}"
           echo "version=${VERSION}" >> $GITHUB_OUTPUT