diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2638ee8e16..c855bc04f1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -63,12 +63,13 @@ jobs:
     - run: |
         echo "Running backwards compatibility tests ..."
         security_plugin_version_no_snapshot=$(./gradlew properties -q | grep -E '^version:' | awk '{print $2}' | sed 's/-SNAPSHOT//g')
+        bwc_version=2.4.0
         cp -r build/ ./bwc-test/
         mkdir ./bwc-test/src/test/resources/security_plugin_version_no_snapshot
         cp build/distributions/opensearch-security-${security_plugin_version_no_snapshot}.zip ./bwc-test/src/test/resources/${security_plugin_version_no_snapshot}
-        mkdir bwc-test/src/test/resources/2.3.0.0
-        wget https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.3.0/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-security-2.3.0.0.zip
-        mv opensearch-security-2.3.0.0.zip bwc-test/src/test/resources/2.3.0.0/
+        mkdir bwc-test/src/test/resources/${bwc_version}.0
+        wget https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/${bwc_version}/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-security-${bwc_version}.0.zip
+        mv opensearch-security-${bwc_version}.0.zip bwc-test/src/test/resources/${bwc_version}.0/
         cd bwc-test/
         ./gradlew bwcTestSuite -Dtests.security.manager=false
 
diff --git a/.github/workflows/plugin_install.yml b/.github/workflows/plugin_install.yml
index 3cf1462618..5f290fac25 100644
--- a/.github/workflows/plugin_install.yml
+++ b/.github/workflows/plugin_install.yml
@@ -85,9 +85,9 @@ jobs:
       - name: Download OpenSearch Core
         run: |
           cd ..
-          Invoke-WebRequest https://artifacts.opensearch.org/snapshots/core/opensearch/2.4.0-SNAPSHOT/opensearch-min-2.4.0-SNAPSHOT-windows-x64-latest.zip -Outfile opensearch-2.4.0.zip
-          tar -xzf opensearch-2.4.0.zip 
-          del opensearch-2.4.0.zip
+          Invoke-WebRequest https://artifacts.opensearch.org/snapshots/core/opensearch/2.5.0-SNAPSHOT/opensearch-min-2.5.0-SNAPSHOT-windows-x64-latest.zip -Outfile opensearch-2.5.0.zip
+          tar -xzf opensearch-2.5.0.zip 
+          del opensearch-2.5.0.zip
           Rename-Item opensearch-* Opensearch
 
       - name: Build Security Plugin with Gradle
diff --git a/build.gradle b/build.gradle
index 2e03803c11..6e22bc0336 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ import org.opensearch.gradle.test.RestIntegTestTask
 
 buildscript {
     ext {
-        opensearch_version = System.getProperty("opensearch.version", "2.4.0-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "2.5.0-SNAPSHOT")
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
 
diff --git a/bwc-test/build.gradle b/bwc-test/build.gradle
index 583d9d173c..6c93dc3062 100644
--- a/bwc-test/build.gradle
+++ b/bwc-test/build.gradle
@@ -47,7 +47,7 @@ ext {
 
 buildscript {
     ext {
-        opensearch_version = System.getProperty("opensearch.version", "2.4.0-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "2.5.0-SNAPSHOT")
         opensearch_group = "org.opensearch"
     }
     repositories {
@@ -73,16 +73,16 @@ dependencies {
     testImplementation "org.opensearch.test:framework:${opensearch_version}"
 }
 
-String bwcVersion = "2.3.0.0";
+String bwcVersion = "2.4.0.0";
 String baseName = "securityBwcCluster"
 String bwcFilePath = "src/test/resources/"
-String projectVersion = "2.4.0.0"
+String projectVersion = "2.5.0.0"
 
 2.times {i ->
     testClusters {
         "${baseName}$i" {
             testDistribution = "ARCHIVE"
-            versions = ["2.3.0","2.4.0"]
+            versions = ["2.4.0","2.5.0"]
             numberOfNodes = 3
             plugin(provider(new Callable<RegularFile>() {
                 @Override