diff --git a/build.gradle b/build.gradle
index b26f36b519..3db0da35ce 100644
--- a/build.gradle
+++ b/build.gradle
@@ -934,6 +934,10 @@ 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 no version is supplied or it doesn't match the semantic versioning, calculate from git
diff --git a/gradle.properties b/gradle.properties
index 61b69b6176..93f56e0137 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 \