diff --git a/.github/workflows/backwards_compatibility_tests_workflow.yml b/.github/workflows/backwards_compatibility_tests_workflow.yml
index 165f29369..c76b22886 100644
--- a/.github/workflows/backwards_compatibility_tests_workflow.yml
+++ b/.github/workflows/backwards_compatibility_tests_workflow.yml
@@ -14,8 +14,8 @@ jobs:
     strategy:
       matrix:
         java: [ 11, 17 ]
-        bwc_version : [ "1.0.0", "1.1.0", "1.2.4", "1.3.2", "2.0.0" ]
-        opensearch_version : [ "2.1.0-SNAPSHOT" ]
+        bwc_version : [ "1.0.0", "1.1.0", "1.2.4", "1.3.2", "2.0.0", "2.1.0" ]
+        opensearch_version : [ "2.2.0-SNAPSHOT" ]
 
     name: k-NN Restart-Upgrade BWC Tests
     runs-on: ubuntu-latest
@@ -46,8 +46,8 @@ jobs:
     strategy:
       matrix:
         java: [ 11, 17 ]
-        bwc_version: [ "1.3.2", "2.0.0" ]
-        opensearch_version: [ "2.1.0-SNAPSHOT" ]
+        bwc_version: [ "1.3.2", "2.0.0", "2.1.0" ]
+        opensearch_version: [ "2.2.0-SNAPSHOT" ]
 
     name: k-NN Rolling-Upgrade BWC Tests
     runs-on: ubuntu-latest
diff --git a/build.gradle b/build.gradle
index e6d82a7d0..8092e7a00 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     ext {
         // build.version_qualifier parameter applies to knn plugin artifacts only. OpenSearch version must be set
         // explicitly as 'opensearch.version' property, for instance opensearch.version=2.0.0-rc1-SNAPSHOT
-        opensearch_version = System.getProperty("opensearch.version", "2.1.0-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "2.2.0-SNAPSHOT")
         version_qualifier = System.getProperty("build.version_qualifier", "")
         opensearch_group = "org.opensearch"
     }
diff --git a/qa/restart-upgrade/build.gradle b/qa/restart-upgrade/build.gradle
index 3dbea0f51..ea26da684 100644
--- a/qa/restart-upgrade/build.gradle
+++ b/qa/restart-upgrade/build.gradle
@@ -51,7 +51,7 @@ testClusters {
         }
 
         // Skip test if version is 1.0, 1.1, 1.2 or 1.3 as they are not supported in those versions
-        if (knn_bwc_version.startsWith("1.") || knn_bwc_version.startsWith("2.0")) {
+        if (knn_bwc_version.startsWith("1.") || knn_bwc_version.startsWith("2.")) {
             filter {
                 excludeTestsMatching "org.opensearch.knn.bwc.IndexingIT.testEmptyParametersOnUpgrade"
             }
@@ -94,7 +94,7 @@ testClusters {
         }
 
         // Skip test if version is 1.0, 1.1, 1.2 or 1.3 as they are not supported in those versions
-        if (knn_bwc_version.startsWith("1.") || knn_bwc_version.startsWith("2.0")) {
+        if (knn_bwc_version.startsWith("1.") || knn_bwc_version.startsWith("2.")) {
             filter {
                 excludeTestsMatching "org.opensearch.knn.bwc.IndexingIT.testEmptyParametersOnUpgrade"
             }