diff --git a/src/plugins/credential_management/.i18nrc.json b/src/plugins/credential_management/.i18nrc.json
deleted file mode 100644
index 5f769fc1890..00000000000
--- a/src/plugins/credential_management/.i18nrc.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "prefix": "credentialManagement",
-  "paths": {
-    "credentialManagement": "."
-  },
-  "translations": ["translations/ja-JP.json"]
-}
diff --git a/src/plugins/credential_management/opensearch_dashboards.json b/src/plugins/credential_management/opensearch_dashboards.json
index d9f92589c06..c076c2d9ed1 100644
--- a/src/plugins/credential_management/opensearch_dashboards.json
+++ b/src/plugins/credential_management/opensearch_dashboards.json
@@ -1,7 +1,7 @@
 {
   "id": "credentialManagement",
   "version": "opensearchDashboards",
-  "server": true,
+  "server": false,
   "ui": true,
   "requiredPlugins": ["management"],
   "requiredBundles": ["opensearchDashboardsReact"]
diff --git a/src/plugins/credential_management/public/components/create_button/create_button.tsx b/src/plugins/credential_management/public/components/create_button/create_button.tsx
index 88e96bac6ce..41b580fcf8c 100644
--- a/src/plugins/credential_management/public/components/create_button/create_button.tsx
+++ b/src/plugins/credential_management/public/components/create_button/create_button.tsx
@@ -3,16 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-// @ts-ignore
-import { euiColorAccent } from '@elastic/eui/dist/eui_theme_light.json';
 import React from 'react';
-import * as H from 'history';
+import { History } from 'history';
 
 import { EuiButton } from '@elastic/eui';
 import { FormattedMessage } from '@osd/i18n/react';
 
 interface Props {
-  history: H.History;
+  history: History;
 }
 
 export const CreateButton = ({ history }: Props) => {
diff --git a/src/plugins/credential_management/server/index.ts b/src/plugins/credential_management/server/index.ts
deleted file mode 100644
index 1a9890c4545..00000000000
--- a/src/plugins/credential_management/server/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { PluginInitializerContext } from '../../../core/server';
-import { CredentialManagementPlugin } from './plugin';
-
-// This exports static code and TypeScript types,
-// as well as, OpenSearch Dashboards Platform `plugin()` initializer.
-
-export function plugin(initializerContext: PluginInitializerContext) {
-  return new CredentialManagementPlugin(initializerContext);
-}
-
-export { CredentialManagementPluginSetup, CredentialManagementPluginStart } from './types';
diff --git a/src/plugins/credential_management/server/plugin.ts b/src/plugins/credential_management/server/plugin.ts
deleted file mode 100644
index 060b5290fd8..00000000000
--- a/src/plugins/credential_management/server/plugin.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {
-  PluginInitializerContext,
-  CoreSetup,
-  CoreStart,
-  Plugin,
-  Logger,
-} from '../../../core/server';
-
-import { CredentialManagementPluginSetup, CredentialManagementPluginStart } from './types';
-import { credentialSavedObjectType } from './saved_objects';
-
-export class CredentialManagementPlugin
-  implements Plugin<CredentialManagementPluginSetup, CredentialManagementPluginStart> {
-  private readonly logger: Logger;
-
-  constructor(initializerContext: PluginInitializerContext) {
-    this.logger = initializerContext.logger.get();
-  }
-
-  public setup(core: CoreSetup) {
-    this.logger.debug('credentialManagement: Setup');
-
-    // Register credential saved object type
-    core.savedObjects.registerType(credentialSavedObjectType);
-
-    return {};
-  }
-
-  public start(core: CoreStart) {
-    this.logger.debug('credentialManagement: Started');
-    return {};
-  }
-
-  public stop() {}
-}
diff --git a/src/plugins/credential_management/server/saved_objects/index.ts b/src/plugins/credential_management/server/saved_objects/index.ts
deleted file mode 100644
index b0367f785e0..00000000000
--- a/src/plugins/credential_management/server/saved_objects/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-export { credentialSavedObjectType } from './credential_saved_objects_type';
diff --git a/src/plugins/credential_management/server/types.ts b/src/plugins/credential_management/server/types.ts
deleted file mode 100644
index c8c0a3279e5..00000000000
--- a/src/plugins/credential_management/server/types.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface CredentialManagementPluginSetup {}
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface CredentialManagementPluginStart {}
diff --git a/src/plugins/data_source/server/plugin.ts b/src/plugins/data_source/server/plugin.ts
index 0efe687f4a3..b92d6dffd9d 100644
--- a/src/plugins/data_source/server/plugin.ts
+++ b/src/plugins/data_source/server/plugin.ts
@@ -4,7 +4,7 @@
  */
 
 import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from 'src/core/server';
-import { dataSource } from './saved_objects';
+import { dataSource, credential } from './saved_objects';
 
 import { DataSourcePluginSetup, DataSourcePluginStart } from './types';
 
@@ -17,6 +17,11 @@ export class DataSourcePlugin implements Plugin<DataSourcePluginSetup, DataSourc
 
   public setup(core: CoreSetup) {
     this.logger.debug('data_source: Setup');
+
+    // Register credential saved object type
+    core.savedObjects.registerType(credential);
+
+    // Register data source saved object type
     core.savedObjects.registerType(dataSource);
 
     return {};
diff --git a/src/plugins/credential_management/server/saved_objects/credential_saved_objects_type.ts b/src/plugins/data_source/server/saved_objects/credential_saved_objects_type.ts
similarity index 94%
rename from src/plugins/credential_management/server/saved_objects/credential_saved_objects_type.ts
rename to src/plugins/data_source/server/saved_objects/credential_saved_objects_type.ts
index 82d894845df..adab9f3e4d7 100644
--- a/src/plugins/credential_management/server/saved_objects/credential_saved_objects_type.ts
+++ b/src/plugins/data_source/server/saved_objects/credential_saved_objects_type.ts
@@ -5,7 +5,7 @@
 
 import { SavedObjectsType } from 'opensearch-dashboards/server';
 
-export const credentialSavedObjectType: SavedObjectsType = {
+export const credential: SavedObjectsType = {
   name: 'credential',
   hidden: false,
   namespaceType: 'agnostic',
diff --git a/src/plugins/data_source/server/saved_objects/index.ts b/src/plugins/data_source/server/saved_objects/index.ts
index b6597dcb5d3..aa3411811e8 100644
--- a/src/plugins/data_source/server/saved_objects/index.ts
+++ b/src/plugins/data_source/server/saved_objects/index.ts
@@ -3,4 +3,5 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+export { credential } from './credential_saved_objects_type';
 export { dataSource } from './data_source';