diff --git a/.github/workflows/dashboards-observability-test-and-build-workflow.yml b/.github/workflows/dashboards-observability-test-and-build-workflow.yml
index e052febae..7f09b560f 100644
--- a/.github/workflows/dashboards-observability-test-and-build-workflow.yml
+++ b/.github/workflows/dashboards-observability-test-and-build-workflow.yml
@@ -6,7 +6,7 @@ on: [pull_request, push]
 env:
   PLUGIN_NAME: dashboards-observability
   OPENSEARCH_VERSION: 'main'
-  OPENSEARCH_PLUGIN_VERSION: 2.1.0.0
+  OPENSEARCH_PLUGIN_VERSION: 2.2.0.0
 
 jobs:
 
diff --git a/dashboards-observability/opensearch_dashboards.json b/dashboards-observability/opensearch_dashboards.json
index b8d9645c6..75b51d910 100644
--- a/dashboards-observability/opensearch_dashboards.json
+++ b/dashboards-observability/opensearch_dashboards.json
@@ -1,7 +1,7 @@
 {
   "id": "observabilityDashboards",
-  "version": "2.1.0.0",
-  "opensearchDashboardsVersion": "2.1.0",
+  "version": "2.2.0.0",
+  "opensearchDashboardsVersion": "2.2.0",
   "server": true,
   "ui": true,
   "requiredPlugins": [
diff --git a/dashboards-observability/package.json b/dashboards-observability/package.json
index 1bfdf7b80..900d23061 100644
--- a/dashboards-observability/package.json
+++ b/dashboards-observability/package.json
@@ -1,6 +1,6 @@
 {
   "name": "observability-dashboards",
-  "version": "2.1.0.0",
+  "version": "2.2.0.0",
   "main": "index.ts",
   "license": "Apache-2.0",
   "scripts": {
diff --git a/dashboards-observability/public/components/custom_panels/panel_modules/visualization_flyout/__tests__/__snapshots__/visualization_flyout.test.tsx.snap b/dashboards-observability/public/components/custom_panels/panel_modules/visualization_flyout/__tests__/__snapshots__/visualization_flyout.test.tsx.snap
index 9dda6a3ab..3c4bda7a0 100644
--- a/dashboards-observability/public/components/custom_panels/panel_modules/visualization_flyout/__tests__/__snapshots__/visualization_flyout.test.tsx.snap
+++ b/dashboards-observability/public/components/custom_panels/panel_modules/visualization_flyout/__tests__/__snapshots__/visualization_flyout.test.tsx.snap
@@ -92,7 +92,7 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
         ownFocus={false}
         size="m"
       >
-        <EuiWindowEvent
+        <OuiWindowEvent
           event="keydown"
           handler={[Function]}
         />
@@ -1319,7 +1319,7 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
         ownFocus={false}
         size="m"
       >
-        <EuiWindowEvent
+        <OuiWindowEvent
           event="keydown"
           handler={[Function]}
         />
diff --git a/dashboards-observability/public/components/trace_analytics/components/traces/__tests__/__snapshots__/span_detail_flyout.test.tsx.snap b/dashboards-observability/public/components/trace_analytics/components/traces/__tests__/__snapshots__/span_detail_flyout.test.tsx.snap
index e3c372ee1..cb4564c2e 100644
--- a/dashboards-observability/public/components/trace_analytics/components/traces/__tests__/__snapshots__/span_detail_flyout.test.tsx.snap
+++ b/dashboards-observability/public/components/trace_analytics/components/traces/__tests__/__snapshots__/span_detail_flyout.test.tsx.snap
@@ -15,7 +15,7 @@ exports[`<SpanDetailFlyout /> spec renders the empty component 1`] = `
     onClose={[MockFunction]}
     size="s"
   >
-    <EuiWindowEvent
+    <OuiWindowEvent
       event="keydown"
       handler={[Function]}
     />
diff --git a/opensearch-observability/build.gradle b/opensearch-observability/build.gradle
index 52d383cd4..112d1c03a 100644
--- a/opensearch-observability/build.gradle
+++ b/opensearch-observability/build.gradle
@@ -10,7 +10,7 @@ import org.opensearch.gradle.testclusters.StandaloneRestIntegTestTask
 buildscript {
     ext {
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
-        opensearch_version = System.getProperty("opensearch.version", "2.1.0-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "2.2.0-SNAPSHOT")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
         version_tokens = opensearch_version.tokenize('-')
         opensearch_build = version_tokens[0] + '.0'
@@ -113,6 +113,7 @@ configurations.all {
         force "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
         force "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}"
         force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.11.4"
+        force "org.mockito:mockito-core:4.6.1"
     }
 }