diff --git a/.github/workflows/pickspawner-cd.yml b/.github/workflows/pickspawner-cd.yml
index bfc4f00..292ad1d 100644
--- a/.github/workflows/pickspawner-cd.yml
+++ b/.github/workflows/pickspawner-cd.yml
@@ -15,12 +15,15 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: 17
+      - name: Get the tag version
+        id: get_version
+        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
       - name: Install spigot nms dependencies
         run: bash ./install-dependency-in-cache.sh
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
-        run: ./gradlew clean build -PbuildVersion=1.18.2
+        run: ./gradlew clean build -PbuildVersion=1.18.2 -DtagVersion=${{ steps.get_version.outputs.VERSION }}
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
@@ -31,9 +34,6 @@ jobs:
           release_name: ${{ github.ref }}
           draft: false
           prerelease: false
-      - name: Get the tag version
-        id: get_version
-        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
       - name: Upload Release Jar
         id: upload-release-jar
         uses: actions/upload-release-asset@v1
diff --git a/build.gradle.kts b/build.gradle.kts
index ed992fc..41274ea 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 
 allprojects {
     group = "fr.fabienhebuterne"
-    version = "3.6.0"
+    version = System.getProperty("tagVersion") ?: "SNAPSHOT"
 
     apply(plugin = "kotlin")