diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index cd025f06..48711d5f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1 @@
-# This should match the owning team set up in https://github.com/orgs/opensearch-project/teams
-*   @opensearch-project/anomaly-detection
\ No newline at end of file
+*   @ohltyler @kaituo @jackiehanyang @amitgalitz @sean-zheng-amazon
\ No newline at end of file
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index bafb14f5..6a406fb4 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -4,9 +4,18 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 
 ## Current Maintainers
 
-| Maintainer              | GitHub ID                                               | Affiliation |
-| ----------------------- | ------------------------------------------------------- | ----------- |
-| Tyler Ohlsen            | [ohltyler](https://github.com/ohltyler)                 | Amazon      |
+| Maintainer              | GitHub ID                                                | Affiliation |
+| ----------------------- | -------------------------------------------------------- | ----------- |
+| Tyler Ohlsen            | [ohltyler](https://github.com/ohltyler)                  | Amazon      |
+| Kaituo Li               | [kaituo](https://github.com/kaituo)                      | Amazon      |
+| Jackie Han              | [jackiehanyang](https://github.com/jackiehanyang)        | Amazon      |
+| Amit Galitzky           | [amitgalitz](https://github.com/amitgalitz)              | Amazon      |
+| Sean Zheng              | [sean-zheng-amazon](https://github.com/sean-zheng-amazon)| Amazon      |
+
+## Emeritus Maintainers
+
+| Maintainer        | GitHub ID                                               | Affiliation |
+| ----------------- | ------------------------------------------------------- | ----------- |
 | Yaliang                 | [ylwu-amzn](https://github.com/ylwu-amzn)               | Amazon      |
 | Yizhe Liu               | [yizheliu-amazon](https://github.com/yizheliu-amazon)   | Amazon      |
 | Vijayan Balasubramanian | [VijayanB](https://github.com/VijayanB)                 | Amazon      |
diff --git a/public/pages/DefineDetector/components/NameAndDescription/__tests__/NameAndDescription.test.tsx b/public/pages/DefineDetector/components/NameAndDescription/__tests__/NameAndDescription.test.tsx
index 32b564fa..dbd5908c 100644
--- a/public/pages/DefineDetector/components/NameAndDescription/__tests__/NameAndDescription.test.tsx
+++ b/public/pages/DefineDetector/components/NameAndDescription/__tests__/NameAndDescription.test.tsx
@@ -29,11 +29,14 @@ describe('<NameAndDescription /> spec', () => {
     expect(container.firstChild).toMatchSnapshot();
   });
   test('shows error for detector name input when toggling focus/blur', async () => {
-    const handleValidateName = jest.fn().mockImplementation(() => {
-      throw 'Required';
+    const handleValidateName = jest.fn().mockImplementationOnce(() => {
+      return 'Required';
     });
     const { queryByText, findByText, getByPlaceholderText } = render(
-      <Formik initialValues={{ name: '' }} onSubmit={jest.fn()}>
+      <Formik
+        initialValues={{ name: '', description: 'one' }}
+        onSubmit={jest.fn()}
+      >
         {() => (
           <div>
             <NameAndDescription onValidateDetectorName={handleValidateName} />
@@ -49,6 +52,7 @@ describe('<NameAndDescription /> spec', () => {
     expect(handleValidateName).toHaveBeenCalledTimes(1);
     expect(findByText('Required')).not.toBeNull();
   });
+
   test('shows error for detector description input when toggling focus/bur', async () => {
     const { queryByText, findByText, getByPlaceholderText } = render(
       <Formik
diff --git a/release-notes/opensearch-anomaly-detection-dashboards.release-notes-2.7.0.0.md b/release-notes/opensearch-anomaly-detection-dashboards.release-notes-2.7.0.0.md
new file mode 100644
index 00000000..dc6c1a53
--- /dev/null
+++ b/release-notes/opensearch-anomaly-detection-dashboards.release-notes-2.7.0.0.md
@@ -0,0 +1,7 @@
+## Version 2.7.0.0 Release Notes
+
+Compatible with OpenSearch Dashboards 2.7.0
+
+### Enhancements
+
+* Run prettier command against all files ([#444](https://github.com/opensearch-project/anomaly-detection-dashboards-plugin/pull/444))