diff --git a/build.gradle b/build.gradle
index d664cfe9167..3db0da35ce2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -934,10 +934,11 @@ def calculateVersion() {
   def calVerPattern = ~/\d+\.\d+(\.\d+)?(-.*)?/
 
   if (project.hasProperty('version') && (project.version =~ calVerPattern)) {
+    if (project.hasProperty('versionappendcommit') && project.versionappendcommit == "true") {
+      def gitDetails = getGitCommitDetails(7) // Adjust length as needed
+      return "${project.version}-${gitDetails.hash}"
+    }
     return "${project.version}"
-  } else if (project.hasProperty('versionprefix') && (project.versionprefix =~ calVerPattern)) {
-    def gitDetails = getGitCommitDetails(7) // Adjust length as needed
-    return "${project.versionprefix}-${gitDetails.hash}"
   } else {
     // If no version is supplied or it doesn't match the semantic versioning, calculate from git
     println("Generating project version as supplied is version not semver: ${project.version}")
diff --git a/gradle.properties b/gradle.properties
index 61b69b61768..b707e599df2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,9 @@
 org.gradle.welcome=never
+
+# Optional - set custom build version
+# version=24.5.6-acme
+# versionappendcommit=true
+
 # Set exports/opens flags required by Google Java Format and ErrorProne plugins. (JEP-396)
 org.gradle.jvmargs=-Xmx4g \
 --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
@@ -13,4 +18,4 @@ org.gradle.jvmargs=-Xmx4g \
 --add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \
 --add-opens jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
 # Could be moved to sonar properties after https://sonarsource.atlassian.net/browse/SONARGRADL-134
-systemProp.sonar.gradle.skipCompile=true
\ No newline at end of file
+systemProp.sonar.gradle.skipCompile=true