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