diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f21dc9c86fd..dc0d4559de27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -168,6 +168,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - [Console] Replace jQuery.ajax with core.http when calling OSD APIs in console ([#3080](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3080))
 - [I18n] Fix Listr type errors and error handlers ([#3629](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3629))
 - [Multiple DataSource]Refactor authentication type selection in create and edit data source forms to use EuiSelect ([#3693](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3693))
+
 ### 🔩 Tests
 
 - [Multi DataSource] Add unit test coverage for Update Data source management stack ([#2567](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2567))
diff --git a/src/plugins/data_source_management/public/components/create_data_source_wizard/components/create_form/create_data_source_form.tsx b/src/plugins/data_source_management/public/components/create_data_source_wizard/components/create_form/create_data_source_form.tsx
index e03831878398..1c08da5d6371 100644
--- a/src/plugins/data_source_management/public/components/create_data_source_wizard/components/create_form/create_data_source_form.tsx
+++ b/src/plugins/data_source_management/public/components/create_data_source_wizard/components/create_form/create_data_source_form.tsx
@@ -120,7 +120,7 @@ export class CreateDataSourceForm extends React.Component<
     });
   };
 
-  onChangeAuthType = (e: { target: { value: any } }) => {
+  onChangeAuthType = (e: React.ChangeEvent<HTMLSelectElement>) => {
     this.setState({ auth: { ...this.state.auth, type: e.target.value as AuthType } });
   };
 
diff --git a/src/plugins/data_source_management/public/components/edit_data_source/components/edit_form/edit_data_source_form.test.tsx b/src/plugins/data_source_management/public/components/edit_data_source/components/edit_form/edit_data_source_form.test.tsx
index 527c8ab0f141..41133f65035a 100644
--- a/src/plugins/data_source_management/public/components/edit_data_source/components/edit_form/edit_data_source_form.test.tsx
+++ b/src/plugins/data_source_management/public/components/edit_data_source/components/edit_form/edit_data_source_form.test.tsx
@@ -290,7 +290,7 @@ describe('Datasource Management: Edit Datasource Form', () => {
     });
 
     /* Save Changes */
-    test('should update the form with NoAUth on click save chan ges', async () => {
+    test('should update the form with NoAuth on click save changes', async () => {
       await new Promise((resolve) =>
         setTimeout(() => {
           updateInputFieldAndBlur(component, descriptionFieldIdentifier, '');
diff --git a/src/plugins/data_source_management/public/components/edit_data_source/components/edit_form/edit_data_source_form.tsx b/src/plugins/data_source_management/public/components/edit_data_source/components/edit_form/edit_data_source_form.tsx
index 44ee6b2986d5..82464d018768 100644
--- a/src/plugins/data_source_management/public/components/edit_data_source/components/edit_form/edit_data_source_form.tsx
+++ b/src/plugins/data_source_management/public/components/edit_data_source/components/edit_form/edit_data_source_form.tsx
@@ -162,7 +162,7 @@ export class EditDataSourceForm extends React.Component<EditDataSourceProps, Edi
     });
   };
 
-  onChangeAuthType = (e: { target: { value: any } }) => {
+  onChangeAuthType = (e: React.ChangeEvent<HTMLSelectElement>) => {
     this.setState({ auth: { ...this.state.auth, type: e.target.value as AuthType } }, () => {
       this.onChangeFormValues();
     });
@@ -738,13 +738,6 @@ export class EditDataSourceForm extends React.Component<EditDataSourceProps, Edi
             defaultMessage: 'Credential',
           })}
         >
-          {/* <EuiRadioGroup
-            options={credentialSourceOptions}
-            idSelected={this.state.auth.type}
-            onChange={(id) => this.onChangeAuthType(id)}
-            name="Credential"
-            data-test-subj="editDataSourceSelectAuthType"
-          /> */}
           <EuiSelect
             options={credentialSourceOptions}
             value={this.state.auth.type}
diff --git a/src/plugins/data_source_management/public/types.ts b/src/plugins/data_source_management/public/types.ts
index 6274f6ac5dc8..296cfd17b541 100644
--- a/src/plugins/data_source_management/public/types.ts
+++ b/src/plugins/data_source_management/public/types.ts
@@ -56,12 +56,6 @@ export enum AuthType {
   SigV4 = 'sigv4',
 }
 
-// export const credentialSourceOptions = [
-//   { id: AuthType.NoAuth, label: 'No authentication' },
-//   { id: AuthType.UsernamePasswordType, label: 'Username & Password' },
-//   { id: AuthType.SigV4, label: 'AWS SigV4' },
-// ];
-
 export const credentialSourceOptions = [
   { value: AuthType.NoAuth, text: 'No authentication' },
   { value: AuthType.UsernamePasswordType, text: 'Username & Password' },