diff --git a/Jenkinsfile b/Jenkinsfile
index 91a810d..0e41373 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -30,10 +30,13 @@ pipeline {
         stage ('Initialize variables') {
             steps {
                 script {
-                        def lastVersion = sh(script: "git describe --tags --abbrev=0", returnStdout: true).trim()
+                        def hasTags = sh(script: "git tag -l | wc -l", returnStdout: true).trim().toInteger() > 0
+                        echo "${hasTags}"
                         
-                        if (!lastVersion) {
-                            lastVersion = "0.0.0"
+                        def lastVersion = "0.0.0"
+                        
+                        if (hasTags) {
+                            lastVersion = sh(script: "git describe --tags --abbrev=0", returnStdout: true).trim()
                         }
 
                         echo "Last version: ${lastVersion}"
@@ -85,10 +88,11 @@ pipeline {
                     def commitHash = sh(script: "git rev-parse HEAD~1", returnStdout: true).trim()
                     withCredentials([usernamePassword(credentialsId: 'gitea_creds', usernameVariable: 'GITEA_USER', passwordVariable: 'GITEA_PASS')]) {
                         def prId = env.CHANGE_ID
+                        echo "GIT_COMMIT: ${env.GIT_COMMIT}"
                         sh """
                             curl -v -X POST -u "${GITEA_USER}:${GITEA_PASS}" \
                             -H "Content-Type: application/json" \
-                            -d '{"tag_name": "${env.NEW_VERSION}", "name": "Release ${env.NEW_VERSION}", "target_commitish": "${commitHash}"}' \
+                            -d '{"tag_name": "${env.NEW_VERSION}", "name": "Release ${env.NEW_VERSION}", "target_commitish": "${env.GIT_COMMIT}"}' \
                             "${env.GITEA_REPOSITORY_URL}deployer3000/${env.IMAGE_NAME}/releases"
                         """
                         echo "New release succeeded!"