diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4fad5ced..39c90c72 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,7 +31,11 @@ jobs:
         with:
           repository: 'opensearch-project/OpenSearch'
           path: OpenSearch
+<<<<<<< HEAD
           ref: '1.0'
+=======
+          ref: '1.x'
+>>>>>>> cc02f23... Build snapshot build by default with the same version as OpenSearch. (#58)
       - name: Build OpenSearch
         working-directory: ./OpenSearch
         run: ./gradlew publishToMavenLocal
diff --git a/build.gradle b/build.gradle
index acea1778..d443ddf4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,11 +12,7 @@
 buildscript {
     ext {
         opensearch_group = "org.opensearch"
-<<<<<<< HEAD
-        opensearch_version = System.getProperty("opensearch.version", "1.0.0")
-=======
         opensearch_version = System.getProperty("opensearch.version", "1.1.0-SNAPSHOT")
->>>>>>> 401802d... Using 1.1 snapshot version for OpenSearch (#57)
         kotlin_version = System.getProperty("kotlin.version", "1.4.32")
     }
 
@@ -48,7 +44,17 @@ repositories {
     jcenter()
 }
 
-group 'org.opensearch.commons'
+ext {
+    isSnapshot = "true" == System.getProperty("build.snapshot", "true")
+}
+
+allprojects {
+    group 'org.opensearch.commons'
+    version = opensearch_version - '-SNAPSHOT' + '.0'
+    if (isSnapshot) {
+        version += "-SNAPSHOT"
+    }
+}
 
 sourceCompatibility = 1.8
 
@@ -150,8 +156,6 @@ task javadocJar(type: Jar) {
     from javadoc.destinationDir
 }
 
-version '1.0.0.0'
-
 publishing {
     publications {
         shadow(MavenPublication) {