diff --git a/android/KMAPro/kMAPro/build.gradle b/android/KMAPro/kMAPro/build.gradle
index 49d0cff750..f2d788df2b 100644
--- a/android/KMAPro/kMAPro/build.gradle
+++ b/android/KMAPro/kMAPro/build.gradle
@@ -34,6 +34,7 @@ android {
         versionCode VERSION_CODE as Integer
         versionName VERSION_NAME
         buildConfigField 'String', 'VERSION_ENVIRONMENT', '"'+VERSION_ENVIRONMENT+'"'
+        buildConfigField 'String', 'VERSION_GIT_TAG', '"'+VERSION_GIT_TAG+'"'
     }
 
     String env_release_store_file = System.getenv("release_store_file")
diff --git a/android/version.gradle b/android/version.gradle
index 2cf028841a..7aef41058b 100644
--- a/android/version.gradle
+++ b/android/version.gradle
@@ -65,12 +65,23 @@ def getVersionEnvironment = { ->
     }
 }
 
+def getVersionGitTag = { ->
+    String env_git_tag = System.getenv("VERSION_GIT_TAG")
+    if (env_git_tag != null) {
+        println "Using $env_git_tag from VERSION_GIT_TAG"
+        return "$env_git_tag"
+    } else {
+        // Building probably from IDE
+        println "Using release@$VERSION_NAME"
+        return "release@$VERSION_NAME"
+    }
+}
 ext {
     VERSION_CODE=getVersionCode()
     VERSION_NAME=getVersionName()
     VERSION_ENVIRONMENT=getVersionEnvironment()
     VERSION_TAG=System.getenv("VERSION_TAG")
-    VERSION_GIT_TAG=System.getenv("VERSION_GIT_TAG")
+    VERSION_GIT_TAG=getVersionGitTag()
 }
 
 //println "version.gradle: VERSION_TAG: " + VERSION_TAG
\ No newline at end of file
diff --git a/resources/build/build-utils.sh b/resources/build/build-utils.sh
index c57136b369..0b68492885 100755
--- a/resources/build/build-utils.sh
+++ b/resources/build/build-utils.sh
@@ -156,6 +156,7 @@ function printVersionUtilsDebug() {
     echo "TIER:                $TIER"
     echo "VERSION_TAG:         $VERSION_TAG"
     echo "VERSION_WITH_TAG:    $VERSION_WITH_TAG"
+    echo "VERSION_GIT_TAG:     $VERSION_GIT_TAG"
     echo "VERSION_ENVIRONMENT: $VERSION_ENVIRONMENT"
 }