diff --git a/build/Jenkinsfile.groovy b/build/Jenkinsfile.groovy
index 1fe67f8ea3..9a5e2a9723 100644
--- a/build/Jenkinsfile.groovy
+++ b/build/Jenkinsfile.groovy
@@ -10,12 +10,30 @@ pipeline {
         stage('PreBuild Steps (Master)') {
             when {
                 expression {
-                    return env.GIT_BRANCH == "master"
+                    return env.GIT_BRANCH == "master" || env.GIT_BRANCH == "feature/RefactoringGestioneColli"
                 }
             }
             steps {
                 echo "Creo version tag su Git"
-                bat 'build\\create_build_tag.bat'
+                // bat 'build\\create_build_tag.bat'
+                script {
+                    def date = new Date()
+                    def formattedDate = date.format('yyyyMMdd_HHmm')
+
+                    def tagName = "${env.GIT_BRANCH.toLowerCase().replace('/', '-')}-${formattedDate}"
+                    def tagMessage = "Build #${env.BUILD_NUMBER} - ${env.GIT_BRANCH}"
+
+                    def envPropertiesText = "project.version=${formattedDate}"
+
+                    writeFile(
+                            'file': 'ems-core\\src\\main\\resources\\configs\\env.properties',
+                            'text': envPropertiesText
+                    )
+
+                    bat "git add . -A"
+                    bat "git tag -a ${tagName} -m \"${tagMessage}\""
+                    bat "git push origin ${tagName}"
+                }
             }
         }
         stage('Maven Build') {
diff --git a/build/create_build_tag.bat b/build/create_build_tag.bat
index 7f60dd7e73..86264aa418 100644
--- a/build/create_build_tag.bat
+++ b/build/create_build_tag.bat
@@ -29,8 +29,6 @@ if %SECOND% LSS 10 set SECOND=0%SECOND%
 set mydate=%YEAR%%MONTH%%DAY%_%HOUR%%MINUTE%%SECOND%
 
 
-
-echo #spring.profiles.active=@activatedProperties@ > ems-core\src\main\resources\configs\env.properties
 echo project.version=%mydate% >> ems-core\src\main\resources\configs\env.properties