diff --git a/x-pack/legacy/plugins/ingest_manager/index.ts b/x-pack/legacy/plugins/ingest_manager/index.ts
index 47c6478f66471..df9923d9f11ec 100644
--- a/x-pack/legacy/plugins/ingest_manager/index.ts
+++ b/x-pack/legacy/plugins/ingest_manager/index.ts
@@ -4,43 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { resolve } from 'path';
-import {
-  savedObjectMappings,
-  OUTPUT_SAVED_OBJECT_TYPE,
-  AGENT_CONFIG_SAVED_OBJECT_TYPE,
-  DATASOURCE_SAVED_OBJECT_TYPE,
-  PACKAGES_SAVED_OBJECT_TYPE,
-} from '../../../plugins/ingest_manager/server';
-
-// TODO https://github.com/elastic/kibana/issues/46373
-// const INDEX_NAMES = {
-//   INGEST: '.kibana',
-// };
 
 export function ingestManager(kibana: any) {
   return new kibana.Plugin({
     id: 'ingestManager',
     publicDir: resolve(__dirname, '../../../plugins/ingest_manager/public'),
-    uiExports: {
-      savedObjectSchemas: {
-        [AGENT_CONFIG_SAVED_OBJECT_TYPE]: {
-          isNamespaceAgnostic: true,
-          // indexPattern: INDEX_NAMES.INGEST,
-        },
-        [OUTPUT_SAVED_OBJECT_TYPE]: {
-          isNamespaceAgnostic: true,
-          // indexPattern: INDEX_NAMES.INGEST,
-        },
-        [DATASOURCE_SAVED_OBJECT_TYPE]: {
-          isNamespaceAgnostic: true,
-          // indexPattern: INDEX_NAMES.INGEST,
-        },
-        [PACKAGES_SAVED_OBJECT_TYPE]: {
-          isNamespaceAgnostic: true,
-          // indexPattern: INDEX_NAMES.INGEST,
-        },
-      },
-      mappings: savedObjectMappings,
-    },
   });
 }
diff --git a/x-pack/plugins/ingest_manager/common/constants/agent.ts b/x-pack/plugins/ingest_manager/common/constants/agent.ts
index 0b462fb4c0319..f3990ba78c539 100644
--- a/x-pack/plugins/ingest_manager/common/constants/agent.ts
+++ b/x-pack/plugins/ingest_manager/common/constants/agent.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export const AGENT_SAVED_OBJECT_TYPE = 'agents';
-export const AGENT_EVENT_SAVED_OBJECT_TYPE = 'agent_events';
-export const AGENT_ACTION_SAVED_OBJECT_TYPE = 'agent_actions';
+export const AGENT_SAVED_OBJECT_TYPE = 'fleet-agents';
+export const AGENT_EVENT_SAVED_OBJECT_TYPE = 'fleet-agent-events';
+export const AGENT_ACTION_SAVED_OBJECT_TYPE = 'fleet-agent-actions';
 
 export const AGENT_TYPE_PERMANENT = 'PERMANENT';
 export const AGENT_TYPE_EPHEMERAL = 'EPHEMERAL';
diff --git a/x-pack/plugins/ingest_manager/common/constants/agent_config.ts b/x-pack/plugins/ingest_manager/common/constants/agent_config.ts
index 337022e552278..c5067480fb953 100644
--- a/x-pack/plugins/ingest_manager/common/constants/agent_config.ts
+++ b/x-pack/plugins/ingest_manager/common/constants/agent_config.ts
@@ -5,7 +5,7 @@
  */
 import { AgentConfigStatus, DefaultPackages } from '../types';
 
-export const AGENT_CONFIG_SAVED_OBJECT_TYPE = 'agent_configs';
+export const AGENT_CONFIG_SAVED_OBJECT_TYPE = 'ingest-agent-configs';
 
 export const DEFAULT_AGENT_CONFIG = {
   name: 'Default config',
diff --git a/x-pack/plugins/ingest_manager/common/constants/datasource.ts b/x-pack/plugins/ingest_manager/common/constants/datasource.ts
index 0ff472b2afeb0..08113cff53bda 100644
--- a/x-pack/plugins/ingest_manager/common/constants/datasource.ts
+++ b/x-pack/plugins/ingest_manager/common/constants/datasource.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export const DATASOURCE_SAVED_OBJECT_TYPE = 'datasources';
+export const DATASOURCE_SAVED_OBJECT_TYPE = 'ingest-datasources';
diff --git a/x-pack/plugins/ingest_manager/common/constants/enrollment_api_key.ts b/x-pack/plugins/ingest_manager/common/constants/enrollment_api_key.ts
index f4a4bcde2f393..fd28b6632b15c 100644
--- a/x-pack/plugins/ingest_manager/common/constants/enrollment_api_key.ts
+++ b/x-pack/plugins/ingest_manager/common/constants/enrollment_api_key.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export const ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE = 'enrollment_api_keys';
+export const ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE = 'fleet-enrollment-api-keys';
diff --git a/x-pack/plugins/ingest_manager/common/constants/epm.ts b/x-pack/plugins/ingest_manager/common/constants/epm.ts
index eb72c28e7bf39..1edf108736e47 100644
--- a/x-pack/plugins/ingest_manager/common/constants/epm.ts
+++ b/x-pack/plugins/ingest_manager/common/constants/epm.ts
@@ -4,5 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export const PACKAGES_SAVED_OBJECT_TYPE = 'epm-package';
+export const PACKAGES_SAVED_OBJECT_TYPE = 'epm-packages';
 export const INDEX_PATTERN_SAVED_OBJECT_TYPE = 'index-pattern';
diff --git a/x-pack/plugins/ingest_manager/common/constants/output.ts b/x-pack/plugins/ingest_manager/common/constants/output.ts
index 4c22d0e3fe7a3..fd88d56ebb0da 100644
--- a/x-pack/plugins/ingest_manager/common/constants/output.ts
+++ b/x-pack/plugins/ingest_manager/common/constants/output.ts
@@ -5,7 +5,7 @@
  */
 import { OutputType } from '../types';
 
-export const OUTPUT_SAVED_OBJECT_TYPE = 'outputs';
+export const OUTPUT_SAVED_OBJECT_TYPE = 'fleet-outputs';
 
 export const DEFAULT_OUTPUT = {
   name: 'default',
diff --git a/x-pack/plugins/ingest_manager/server/index.ts b/x-pack/plugins/ingest_manager/server/index.ts
index 851a58f5adac2..2221831b386e9 100644
--- a/x-pack/plugins/ingest_manager/server/index.ts
+++ b/x-pack/plugins/ingest_manager/server/index.ts
@@ -43,13 +43,3 @@ export type IngestManagerConfigType = TypeOf<typeof config.schema>;
 export const plugin = (initializerContext: PluginInitializerContext) => {
   return new IngestManagerPlugin(initializerContext);
 };
-
-// Saved object information bootstrapped by legacy `ingest_manager` plugin
-// TODO: Remove once saved object mappings can be done from NP
-export { savedObjectMappings } from './saved_objects';
-export {
-  OUTPUT_SAVED_OBJECT_TYPE,
-  AGENT_CONFIG_SAVED_OBJECT_TYPE,
-  DATASOURCE_SAVED_OBJECT_TYPE,
-  PACKAGES_SAVED_OBJECT_TYPE,
-} from './constants';
diff --git a/x-pack/plugins/ingest_manager/server/plugin.ts b/x-pack/plugins/ingest_manager/server/plugin.ts
index c07d2efba6756..248b21eb4df9f 100644
--- a/x-pack/plugins/ingest_manager/server/plugin.ts
+++ b/x-pack/plugins/ingest_manager/server/plugin.ts
@@ -29,7 +29,7 @@ import {
   AGENT_EVENT_SAVED_OBJECT_TYPE,
   ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE,
 } from './constants';
-import { registerEncryptedSavedObjects } from './saved_objects';
+import { registerSavedObjects, registerEncryptedSavedObjects } from './saved_objects';
 import {
   registerEPMRoutes,
   registerDatasourceRoutes,
@@ -101,6 +101,7 @@ export class IngestManagerPlugin
       this.security = deps.security;
     }
 
+    registerSavedObjects(core.savedObjects);
     registerEncryptedSavedObjects(deps.encryptedSavedObjects);
 
     // Register feature
diff --git a/x-pack/plugins/ingest_manager/server/saved_objects.ts b/x-pack/plugins/ingest_manager/server/saved_objects.ts
index 37a00228443e1..3f799f06ba7c1 100644
--- a/x-pack/plugins/ingest_manager/server/saved_objects.ts
+++ b/x-pack/plugins/ingest_manager/server/saved_objects.ts
@@ -3,6 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+
+import { SavedObjectsServiceSetup, SavedObjectsType } from 'kibana/server';
+import { EncryptedSavedObjectsPluginSetup } from '../../encrypted_saved_objects/server';
 import {
   OUTPUT_SAVED_OBJECT_TYPE,
   AGENT_CONFIG_SAVED_OBJECT_TYPE,
@@ -13,156 +16,225 @@ import {
   AGENT_ACTION_SAVED_OBJECT_TYPE,
   ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE,
 } from './constants';
-import { EncryptedSavedObjectsPluginSetup } from '../../encrypted_saved_objects/server';
 
 /*
- * Saved object mappings
+ * Saved object types and mappings
  *
  * Please update typings in `/common/types` if mappings are updated.
  */
-export const savedObjectMappings = {
+const savedObjectTypes: { [key: string]: SavedObjectsType } = {
   [AGENT_SAVED_OBJECT_TYPE]: {
-    properties: {
-      shared_id: { type: 'keyword' },
-      type: { type: 'keyword' },
-      active: { type: 'boolean' },
-      enrolled_at: { type: 'date' },
-      access_api_key_id: { type: 'keyword' },
-      version: { type: 'keyword' },
-      user_provided_metadata: { type: 'text' },
-      local_metadata: { type: 'text' },
-      config_id: { type: 'keyword' },
-      last_updated: { type: 'date' },
-      last_checkin: { type: 'date' },
-      config_revision: { type: 'integer' },
-      config_newest_revision: { type: 'integer' },
-      default_api_key_id: { type: 'keyword' },
-      default_api_key: { type: 'keyword' },
-      updated_at: { type: 'date' },
-      current_error_events: { type: 'text' },
+    name: AGENT_SAVED_OBJECT_TYPE,
+    hidden: false,
+    namespaceType: 'agnostic',
+    management: {
+      importableAndExportable: false,
+    },
+    mappings: {
+      properties: {
+        shared_id: { type: 'keyword' },
+        type: { type: 'keyword' },
+        active: { type: 'boolean' },
+        enrolled_at: { type: 'date' },
+        access_api_key_id: { type: 'keyword' },
+        version: { type: 'keyword' },
+        user_provided_metadata: { type: 'text' },
+        local_metadata: { type: 'text' },
+        config_id: { type: 'keyword' },
+        last_updated: { type: 'date' },
+        last_checkin: { type: 'date' },
+        config_revision: { type: 'integer' },
+        config_newest_revision: { type: 'integer' },
+        default_api_key_id: { type: 'keyword' },
+        default_api_key: { type: 'keyword' },
+        updated_at: { type: 'date' },
+        current_error_events: { type: 'text' },
+      },
     },
   },
   [AGENT_ACTION_SAVED_OBJECT_TYPE]: {
-    properties: {
-      agent_id: { type: 'keyword' },
-      type: { type: 'keyword' },
-      data: { type: 'binary' },
-      sent_at: { type: 'date' },
-      created_at: { type: 'date' },
+    name: AGENT_ACTION_SAVED_OBJECT_TYPE,
+    hidden: false,
+    namespaceType: 'agnostic',
+    management: {
+      importableAndExportable: false,
+    },
+    mappings: {
+      properties: {
+        agent_id: { type: 'keyword' },
+        type: { type: 'keyword' },
+        data: { type: 'binary' },
+        sent_at: { type: 'date' },
+        created_at: { type: 'date' },
+      },
     },
   },
   [AGENT_EVENT_SAVED_OBJECT_TYPE]: {
-    properties: {
-      type: { type: 'keyword' },
-      subtype: { type: 'keyword' },
-      agent_id: { type: 'keyword' },
-      action_id: { type: 'keyword' },
-      config_id: { type: 'keyword' },
-      stream_id: { type: 'keyword' },
-      timestamp: { type: 'date' },
-      message: { type: 'text' },
-      payload: { type: 'text' },
-      data: { type: 'text' },
+    name: AGENT_EVENT_SAVED_OBJECT_TYPE,
+    hidden: false,
+    namespaceType: 'agnostic',
+    management: {
+      importableAndExportable: false,
+    },
+    mappings: {
+      properties: {
+        type: { type: 'keyword' },
+        subtype: { type: 'keyword' },
+        agent_id: { type: 'keyword' },
+        action_id: { type: 'keyword' },
+        config_id: { type: 'keyword' },
+        stream_id: { type: 'keyword' },
+        timestamp: { type: 'date' },
+        message: { type: 'text' },
+        payload: { type: 'text' },
+        data: { type: 'text' },
+      },
     },
   },
   [AGENT_CONFIG_SAVED_OBJECT_TYPE]: {
-    properties: {
-      id: { type: 'keyword' },
-      name: { type: 'text' },
-      is_default: { type: 'boolean' },
-      namespace: { type: 'keyword' },
-      description: { type: 'text' },
-      status: { type: 'keyword' },
-      datasources: { type: 'keyword' },
-      updated_on: { type: 'keyword' },
-      updated_by: { type: 'keyword' },
-      revision: { type: 'integer' },
+    name: AGENT_CONFIG_SAVED_OBJECT_TYPE,
+    hidden: false,
+    namespaceType: 'agnostic',
+    management: {
+      importableAndExportable: false,
+    },
+    mappings: {
+      properties: {
+        id: { type: 'keyword' },
+        name: { type: 'text' },
+        is_default: { type: 'boolean' },
+        namespace: { type: 'keyword' },
+        description: { type: 'text' },
+        status: { type: 'keyword' },
+        datasources: { type: 'keyword' },
+        updated_on: { type: 'keyword' },
+        updated_by: { type: 'keyword' },
+        revision: { type: 'integer' },
+      },
     },
   },
   [ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE]: {
-    properties: {
-      name: { type: 'keyword' },
-      type: { type: 'keyword' },
-      api_key: { type: 'binary' },
-      api_key_id: { type: 'keyword' },
-      config_id: { type: 'keyword' },
-      created_at: { type: 'date' },
-      updated_at: { type: 'date' },
-      expire_at: { type: 'date' },
-      active: { type: 'boolean' },
+    name: ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE,
+    hidden: false,
+    namespaceType: 'agnostic',
+    management: {
+      importableAndExportable: false,
+    },
+    mappings: {
+      properties: {
+        name: { type: 'keyword' },
+        type: { type: 'keyword' },
+        api_key: { type: 'binary' },
+        api_key_id: { type: 'keyword' },
+        config_id: { type: 'keyword' },
+        created_at: { type: 'date' },
+        updated_at: { type: 'date' },
+        expire_at: { type: 'date' },
+        active: { type: 'boolean' },
+      },
     },
   },
   [OUTPUT_SAVED_OBJECT_TYPE]: {
-    properties: {
-      name: { type: 'keyword' },
-      type: { type: 'keyword' },
-      is_default: { type: 'boolean' },
-      hosts: { type: 'keyword' },
-      ca_sha256: { type: 'keyword' },
-      fleet_enroll_username: { type: 'binary' },
-      fleet_enroll_password: { type: 'binary' },
-      config: { type: 'flattened' },
+    name: OUTPUT_SAVED_OBJECT_TYPE,
+    hidden: false,
+    namespaceType: 'agnostic',
+    management: {
+      importableAndExportable: false,
+    },
+    mappings: {
+      properties: {
+        name: { type: 'keyword' },
+        type: { type: 'keyword' },
+        is_default: { type: 'boolean' },
+        hosts: { type: 'keyword' },
+        ca_sha256: { type: 'keyword' },
+        fleet_enroll_username: { type: 'binary' },
+        fleet_enroll_password: { type: 'binary' },
+        config: { type: 'flattened' },
+      },
     },
   },
   [DATASOURCE_SAVED_OBJECT_TYPE]: {
-    properties: {
-      name: { type: 'keyword' },
-      description: { type: 'text' },
-      namespace: { type: 'keyword' },
-      config_id: { type: 'keyword' },
-      enabled: { type: 'boolean' },
-      package: {
-        properties: {
-          name: { type: 'keyword' },
-          title: { type: 'keyword' },
-          version: { type: 'keyword' },
+    name: DATASOURCE_SAVED_OBJECT_TYPE,
+    hidden: false,
+    namespaceType: 'agnostic',
+    management: {
+      importableAndExportable: false,
+    },
+    mappings: {
+      properties: {
+        name: { type: 'keyword' },
+        description: { type: 'text' },
+        namespace: { type: 'keyword' },
+        config_id: { type: 'keyword' },
+        enabled: { type: 'boolean' },
+        package: {
+          properties: {
+            name: { type: 'keyword' },
+            title: { type: 'keyword' },
+            version: { type: 'keyword' },
+          },
         },
-      },
-      output_id: { type: 'keyword' },
-      inputs: {
-        type: 'nested',
-        properties: {
-          type: { type: 'keyword' },
-          enabled: { type: 'boolean' },
-          processors: { type: 'keyword' },
-          config: { type: 'flattened' },
-          streams: {
-            type: 'nested',
-            properties: {
-              id: { type: 'keyword' },
-              enabled: { type: 'boolean' },
-              dataset: { type: 'keyword' },
-              processors: { type: 'keyword' },
-              config: { type: 'flattened' },
-              pkg_stream: { type: 'flattened' },
+        output_id: { type: 'keyword' },
+        inputs: {
+          type: 'nested',
+          properties: {
+            type: { type: 'keyword' },
+            enabled: { type: 'boolean' },
+            processors: { type: 'keyword' },
+            config: { type: 'flattened' },
+            streams: {
+              type: 'nested',
+              properties: {
+                id: { type: 'keyword' },
+                enabled: { type: 'boolean' },
+                dataset: { type: 'keyword' },
+                processors: { type: 'keyword' },
+                config: { type: 'flattened' },
+                pkg_stream: { type: 'flattened' },
+              },
             },
           },
         },
+        revision: { type: 'integer' },
       },
-      revision: { type: 'integer' },
     },
   },
   [PACKAGES_SAVED_OBJECT_TYPE]: {
-    properties: {
-      name: { type: 'keyword' },
-      version: { type: 'keyword' },
-      internal: { type: 'boolean' },
-      removable: { type: 'boolean' },
-      es_index_patterns: {
-        dynamic: false,
-        type: 'object',
-      },
-      installed: {
-        type: 'nested',
-        properties: {
-          id: { type: 'keyword' },
-          type: { type: 'keyword' },
+    name: PACKAGES_SAVED_OBJECT_TYPE,
+    hidden: false,
+    namespaceType: 'agnostic',
+    management: {
+      importableAndExportable: false,
+    },
+    mappings: {
+      properties: {
+        name: { type: 'keyword' },
+        version: { type: 'keyword' },
+        internal: { type: 'boolean' },
+        removable: { type: 'boolean' },
+        es_index_patterns: {
+          dynamic: 'false',
+          type: 'object',
+        },
+        installed: {
+          type: 'nested',
+          properties: {
+            id: { type: 'keyword' },
+            type: { type: 'keyword' },
+          },
         },
       },
     },
   },
 };
 
+export function registerSavedObjects(savedObjects: SavedObjectsServiceSetup) {
+  Object.entries(savedObjectTypes).forEach(([, type]) => {
+    savedObjects.registerType(type);
+  });
+}
+
 export function registerEncryptedSavedObjects(
   encryptedSavedObjects: EncryptedSavedObjectsPluginSetup
 ) {