diff --git a/build.gradle b/build.gradle
index 7160844b46..d22fd799f6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,7 +56,18 @@ repositories {
 }
 
 ext {
+    isSnapshot = "true" == System.getProperty("build.snapshot", "true")
     opensearch_version = System.getProperty("opensearch.version", "1.3.5-SNAPSHOT")
+    buildVersionQualifier = System.getProperty("build.version_qualifier", "")
+    version_tokens = opensearch_version.tokenize('-')
+    opensearch_build = version_tokens[0] + '.0'
+    if (buildVersionQualifier) {
+        opensearch_build += "-${buildVersionQualifier}"
+        opensearch_build_nosnapshot = opensearch_build
+    }
+    if (isSnapshot) {
+        opensearch_build += "-SNAPSHOT"
+    }
 }
 
 configurations.all {
@@ -123,13 +134,8 @@ dependencies {
     compileOnly "org.opensearch:opensearch:${opensearch_version}"
 }
 
-ext {
-    securityPluginVersion = '1.3.5.0'
-    isSnapshot = "true" == System.getProperty("build.snapshot", "true")
-}
-
 group = 'org.opensearch'
-version = "${securityPluginVersion}" + (isSnapshot ? "-SNAPSHOT" : "")
+version = opensearch_build
 description = 'OpenSearch Security'
 
 
@@ -304,16 +310,13 @@ task bundleSecurityAdminStandaloneTarGz(dependsOn: jar, type: Tar) {
 }
 
 task createPluginDescriptor() {
-    if (opensearch_version.contains("-SNAPSHOT")) {
-        opensearch_version=opensearch_version.substring(0, opensearch_version.length() - 9)
-    }
     List<String> descriptorProperties = [
         "description=Provide access control related features for OpenSearch",
         "version=${version}",
         "name=opensearch-security",
         "classname=org.opensearch.security.OpenSearchSecurityPlugin",
         "java.version=${java.targetCompatibility}",
-        "opensearch.version=${opensearch_version}",
+        "opensearch.version=${version_tokens[0]}",
     ]
 
     new File("plugin-descriptor.properties").text = descriptorProperties.join ("\n")