diff --git a/build.gradle b/build.gradle
index 0ef04c0c..8d2d2990 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,11 +6,11 @@
 buildscript {
 
     ext {
-        opensearch_version = System.getProperty("opensearch.version", "2.0.1-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "2.1.0-SNAPSHOT")
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
 
-        // 2.0.1-SNAPSHOT -> 2.0.1.0-SNAPSHOT
+        // 2.1.0-SNAPSHOT -> 2.1.0.0-SNAPSHOT
         version_tokens = opensearch_version.tokenize('-')
         opensearch_build = version_tokens[0] + '.0'
         if (buildVersionQualifier) {
@@ -63,9 +63,9 @@ spotbugsTest {
 }
 
 ext {
-    // The RCA branch that will be built. Default branch is 2.0.
+    // The RCA branch that will be built. Default branch is 2.1.
     rcaProjectRepo = System.getProperty("performance-analyzer-rca.repo", "https://github.com/opensearch-project/performance-analyzer-rca.git")
-    rcaProjectBranch = System.getProperty("performance-analyzer-rca.branch", "2.0")
+    rcaProjectBranch = System.getProperty("performance-analyzer-rca.branch", "2.1")
 
     // If true, then the build will clone the RCA Project into $rcaProjectDir
     cloneRcaProject = "true" == System.getProperty("performance-analyzer-rca.build", "true")
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e750102e..00e33ede 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/licenses/performanceanalyzer-rca-2.0.0.0-rc1-SNAPSHOT.jar.sha1 b/licenses/performanceanalyzer-rca-2.0.0.0-rc1-SNAPSHOT.jar.sha1
deleted file mode 100644
index 8c234263..00000000
--- a/licenses/performanceanalyzer-rca-2.0.0.0-rc1-SNAPSHOT.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c65b3ad1382943f3bcd628d388b1497cc8a1fc70
\ No newline at end of file
diff --git a/licenses/performanceanalyzer-rca-2.1.0.0-SNAPSHOT.jar.sha1 b/licenses/performanceanalyzer-rca-2.1.0.0-SNAPSHOT.jar.sha1
new file mode 100644
index 00000000..1c303e63
--- /dev/null
+++ b/licenses/performanceanalyzer-rca-2.1.0.0-SNAPSHOT.jar.sha1
@@ -0,0 +1 @@
+3d56acab29397385232ab7720921f0328a2468b4
\ No newline at end of file
diff --git a/src/main/resources/plugin-descriptor.properties b/src/main/resources/plugin-descriptor.properties
index 3efdff4f..9c57059b 100644
--- a/src/main/resources/plugin-descriptor.properties
+++ b/src/main/resources/plugin-descriptor.properties
@@ -17,8 +17,8 @@
 #
 # classname=foo.bar.BazPlugin
 # description=My cool plugin
-# version=2.0
-# opensearch.version=2.0
+# version=2.1
+# opensearch.version=2.1
 # java.version=1.7
 #
 ### mandatory elements for all plugins:
@@ -27,7 +27,7 @@
 description=Performance Analyzer Plugin
 #
 # 'version': plugin's version
-version=2.0.1.0
+version=2.1.0.0
 #
 # 'name': the plugin name
 name=performance-analyzer
@@ -42,4 +42,4 @@ classname=org.opensearch.performanceanalyzer.PerformanceAnalyzerPlugin
 java.version=1.8
 #
 # 'opensearch.version' version of opensearch compiled against
-opensearch.version=2.0.1
+opensearch.version=2.1.0
diff --git a/src/test/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerRCAHealthCheckIT.java b/src/test/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerRCAHealthCheckIT.java
index c48e93cb..1052696b 100644
--- a/src/test/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerRCAHealthCheckIT.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerRCAHealthCheckIT.java
@@ -39,7 +39,7 @@ public void checkMetrics(String paBaseUri) throws Exception {
                             new Request(
                                     "GET",
                                     paBaseUri
-                                            + "/metrics/?metrics=Disk_Utilization&agg=max&dim=&nodes=all");
+                                            + "/_agent/metrics/?metrics=Disk_Utilization&agg=max&dim=&nodes=all");
                     Response resp = paClient.performRequest(request);
                     Assert.assertEquals(HttpStatus.SC_OK, resp.getStatusLine().getStatusCode());
                     jsonString[0] = EntityUtils.toString(resp.getEntity());