diff --git a/build.gradle b/build.gradle
index cc970560b..3febf189c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,8 +32,10 @@ buildscript {
     ext {
         opensearch_group = "org.opensearch"
         opensearch_version = System.getProperty("opensearch.version", "1.0.0")
-        common_utils_version = System.getProperty("common_utils.version", "1.0.0.0")
-        job_scheduler_version = System.getProperty("job_scheduler.version", "1.0.0.0")
+        // 1.0.0 -> 1.0.0.0, and 1.0.0-SNAPSHOT -> 1.0.0.0-SNAPSHOT
+        opensearch_build = opensearch_version.replaceAll(/(\.\d)([^\d]*)$/, '$1.0$2')
+        common_utils_version = System.getProperty("common_utils.version", opensearch_build)
+        job_scheduler_version = System.getProperty("job_scheduler.version", opensearch_build)
     }
 
     repositories {
@@ -63,7 +65,6 @@ repositories {
 }
 
 ext {
-    opensearchVersion = System.getProperty("opensearch.version", "1.0.0")
     isSnapshot = "true" == System.getProperty("build.snapshot", "true")
 }