diff --git a/src/plugins/embeddable/public/index.ts b/src/plugins/embeddable/public/index.ts
index 3f671b520fb2ef..be8548f0d9d736 100644
--- a/src/plugins/embeddable/public/index.ts
+++ b/src/plugins/embeddable/public/index.ts
@@ -68,4 +68,9 @@ export function plugin(initializerContext: PluginInitializerContext) {
   return new EmbeddablePublicPlugin(initializerContext);
 }
 
-export { EmbeddableSetup, EmbeddableStart } from './plugin';
+export {
+  EmbeddableSetup,
+  EmbeddableStart,
+  EmbeddableSetupDependencies,
+  EmbeddableStartDependencies,
+} from './plugin';
diff --git a/src/plugins/embeddable/public/mocks.ts b/src/plugins/embeddable/public/mocks.ts
index 65b15f3a7614fb..f5487c381cfcb3 100644
--- a/src/plugins/embeddable/public/mocks.ts
+++ b/src/plugins/embeddable/public/mocks.ts
@@ -16,7 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { EmbeddableStart, EmbeddableSetup } from '.';
+import {
+  EmbeddableStart,
+  EmbeddableSetup,
+  EmbeddableSetupDependencies,
+  EmbeddableStartDependencies,
+} from '.';
 import { EmbeddablePublicPlugin } from './plugin';
 import { coreMock } from '../../../core/public/mocks';
 
@@ -45,14 +50,14 @@ const createStartContract = (): Start => {
   return startContract;
 };
 
-const createInstance = () => {
+const createInstance = (setupPlugins: Partial<EmbeddableSetupDependencies> = {}) => {
   const plugin = new EmbeddablePublicPlugin({} as any);
   const setup = plugin.setup(coreMock.createSetup(), {
-    uiActions: uiActionsPluginMock.createSetupContract(),
+    uiActions: setupPlugins.uiActions || uiActionsPluginMock.createSetupContract(),
   });
-  const doStart = () =>
+  const doStart = (startPlugins: Partial<EmbeddableStartDependencies> = {}) =>
     plugin.start(coreMock.createStart(), {
-      uiActions: uiActionsPluginMock.createStartContract(),
+      uiActions: startPlugins.uiActions || uiActionsPluginMock.createStartContract(),
       inspector: inspectorPluginMock.createStartContract(),
     });
   return {
diff --git a/src/plugins/ui_actions/public/actions/action_factory_definition.ts b/src/plugins/ui_actions/public/actions/action_factory_definition.ts
deleted file mode 100644
index 7ac94a41e70767..00000000000000
--- a/src/plugins/ui_actions/public/actions/action_factory_definition.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { ActionDefinition } from './action';
-import { Presentable, Configurable } from '../util';
-import { SerializedAction } from './types';
-
-/**
- * This is a convenience interface for registering new action factories.
- */
-export interface ActionFactoryDefinition<
-  Config extends object = object,
-  FactoryContext extends object = object,
-  ActionContext extends object = object
-> extends Partial<Presentable<FactoryContext>>, Configurable<Config, FactoryContext> {
-  /**
-   * Unique ID of the action factory. This ID is used to identify this action
-   * factory in the registry as well as to construct actions of this type and
-   * identify this action factory when presenting it to the user in UI.
-   */
-  id: string;
-
-  /**
-   * This method should return a definition of a new action, normally used to
-   * register it in `ui_actions` registry.
-   */
-  create(
-    serializedAction: Omit<SerializedAction<Config>, 'factoryId'>
-  ): ActionDefinition<ActionContext>;
-}
diff --git a/src/plugins/ui_actions/public/actions/index.ts b/src/plugins/ui_actions/public/actions/index.ts
index 0b0e60b3cf75ce..88e42ff2ec1131 100644
--- a/src/plugins/ui_actions/public/actions/index.ts
+++ b/src/plugins/ui_actions/public/actions/index.ts
@@ -19,8 +19,5 @@
 
 export * from './action';
 export * from './action_internal';
-export * from './action_factory_definition';
-export * from './action_factory';
 export * from './create_action';
 export * from './incompatible_action_error';
-export * from './types';
diff --git a/src/plugins/ui_actions/public/actions/types.ts b/src/plugins/ui_actions/public/actions/types.ts
deleted file mode 100644
index d29e97eea532f5..00000000000000
--- a/src/plugins/ui_actions/public/actions/types.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export interface SerializedAction<Config> {
-  readonly factoryId: string;
-  readonly name: string;
-  readonly config: Config;
-}
-
-export interface SerializedEvent {
-  eventId: string;
-  triggers: string[];
-  action: SerializedAction<unknown>;
-}
diff --git a/src/plugins/ui_actions/public/index.ts b/src/plugins/ui_actions/public/index.ts
index 4f00ac4a26fc39..19c9b0a41a0935 100644
--- a/src/plugins/ui_actions/public/index.ts
+++ b/src/plugins/ui_actions/public/index.ts
@@ -29,12 +29,9 @@ export { UiActionsServiceParams, UiActionsService } from './service';
 export {
   Action,
   ActionDefinition as UiActionsActionDefinition,
-  ActionFactoryDefinition as UiActionsActionFactoryDefinition,
   ActionInternal as UiActionsActionInternal,
   createAction,
   IncompatibleActionError,
-  SerializedAction as UiActionsSerializedAction,
-  SerializedEvent as UiActionsSerializedEvent,
 } from './actions';
 export { buildContextMenuForActions } from './context_menu';
 export {
diff --git a/src/plugins/ui_actions/public/mocks.ts b/src/plugins/ui_actions/public/mocks.ts
index 4de38eb5421e98..3522ac4941ba0a 100644
--- a/src/plugins/ui_actions/public/mocks.ts
+++ b/src/plugins/ui_actions/public/mocks.ts
@@ -32,7 +32,6 @@ const createSetupContract = (): Setup => {
     attachAction: jest.fn(),
     detachAction: jest.fn(),
     registerAction: jest.fn(),
-    registerActionFactory: jest.fn(),
     registerTrigger: jest.fn(),
     unregisterAction: jest.fn(),
   };
@@ -49,13 +48,10 @@ const createStartContract = (): Start => {
     executeTriggerActions: jest.fn(),
     fork: jest.fn(),
     getAction: jest.fn(),
-    getActionFactories: jest.fn(),
-    getActionFactory: jest.fn(),
     getTrigger: jest.fn(),
     getTriggerActions: jest.fn((id: TriggerId) => []),
     getTriggerCompatibleActions: jest.fn(),
     registerAction: jest.fn(),
-    registerActionFactory: jest.fn(),
     registerTrigger: jest.fn(),
   };
 
diff --git a/src/plugins/ui_actions/public/plugin.ts b/src/plugins/ui_actions/public/plugin.ts
index 88a5cb04eac6f8..71148656cbb164 100644
--- a/src/plugins/ui_actions/public/plugin.ts
+++ b/src/plugins/ui_actions/public/plugin.ts
@@ -27,7 +27,6 @@ export type UiActionsSetup = Pick<
   | 'attachAction'
   | 'detachAction'
   | 'registerAction'
-  | 'registerActionFactory'
   | 'registerTrigger'
   | 'unregisterAction'
 >;
diff --git a/src/plugins/ui_actions/public/service/ui_actions_service.test.ts b/src/plugins/ui_actions/public/service/ui_actions_service.test.ts
index 41e2b57d53dd85..45a1bdffa52adf 100644
--- a/src/plugins/ui_actions/public/service/ui_actions_service.test.ts
+++ b/src/plugins/ui_actions/public/service/ui_actions_service.test.ts
@@ -18,13 +18,7 @@
  */
 
 import { UiActionsService } from './ui_actions_service';
-import {
-  Action,
-  ActionInternal,
-  createAction,
-  ActionFactoryDefinition,
-  ActionFactory,
-} from '../actions';
+import { Action, ActionInternal, createAction } from '../actions';
 import { createHelloWorldAction } from '../tests/test_samples';
 import { ActionRegistry, TriggerRegistry, TriggerId, ActionType } from '../types';
 import { Trigger } from '../triggers';
@@ -497,64 +491,4 @@ describe('UiActionsService', () => {
       );
     });
   });
-
-  describe('action factories', () => {
-    const factoryDefinition1: ActionFactoryDefinition = {
-      id: 'test-factory-1',
-      CollectConfig: {} as any,
-      createConfig: () => ({}),
-      isConfigValid: () => true,
-      create: () => ({} as any),
-    };
-    const factoryDefinition2: ActionFactoryDefinition = {
-      id: 'test-factory-2',
-      CollectConfig: {} as any,
-      createConfig: () => ({}),
-      isConfigValid: () => true,
-      create: () => ({} as any),
-    };
-
-    test('.getActionFactories() returns empty array if no action factories registered', () => {
-      const service = new UiActionsService();
-
-      const factories = service.getActionFactories();
-
-      expect(factories).toEqual([]);
-    });
-
-    test('can register and retrieve an action factory', () => {
-      const service = new UiActionsService();
-
-      service.registerActionFactory(factoryDefinition1);
-
-      const factory = service.getActionFactory(factoryDefinition1.id);
-
-      expect(factory).toBeInstanceOf(ActionFactory);
-      expect(factory.id).toBe(factoryDefinition1.id);
-    });
-
-    test('can retrieve all action factories', () => {
-      const service = new UiActionsService();
-
-      service.registerActionFactory(factoryDefinition1);
-      service.registerActionFactory(factoryDefinition2);
-
-      const factories = service.getActionFactories();
-      const factoriesSorted = [...factories].sort((f1, f2) => (f1.id > f2.id ? 1 : -1));
-
-      expect(factoriesSorted.length).toBe(2);
-      expect(factoriesSorted[0].id).toBe(factoryDefinition1.id);
-      expect(factoriesSorted[1].id).toBe(factoryDefinition2.id);
-    });
-
-    test('throws when retrieving action factory that does not exist', () => {
-      const service = new UiActionsService();
-
-      service.registerActionFactory(factoryDefinition1);
-
-      expect(() => service.getActionFactory('UNKNOWN_ID')).toThrowError(
-        'Action factory [actionFactoryId = UNKNOWN_ID] does not exist.'
-      );
-    });
-  });
 });
diff --git a/src/plugins/ui_actions/public/service/ui_actions_service.ts b/src/plugins/ui_actions/public/service/ui_actions_service.ts
index 8bd3bb34fbbd81..f00877f812b24a 100644
--- a/src/plugins/ui_actions/public/service/ui_actions_service.ts
+++ b/src/plugins/ui_actions/public/service/ui_actions_service.ts
@@ -24,17 +24,8 @@ import {
   TriggerId,
   TriggerContextMapping,
   ActionType,
-  ActionFactoryRegistry,
 } from '../types';
-import {
-  ActionInternal,
-  Action,
-  ActionByType,
-  ActionFactory,
-  ActionDefinition,
-  ActionFactoryDefinition,
-  ActionContext,
-} from '../actions';
+import { ActionInternal, Action, ActionByType, ActionDefinition, ActionContext } from '../actions';
 import { Trigger, TriggerContext } from '../triggers/trigger';
 import { TriggerInternal } from '../triggers/trigger_internal';
 import { TriggerContract } from '../triggers/trigger_contract';
@@ -47,25 +38,21 @@ export interface UiActionsServiceParams {
    * A 1-to-N mapping from `Trigger` to zero or more `Action`.
    */
   readonly triggerToActions?: TriggerToActionsRegistry;
-  readonly actionFactories?: ActionFactoryRegistry;
 }
 
 export class UiActionsService {
   protected readonly triggers: TriggerRegistry;
   protected readonly actions: ActionRegistry;
   protected readonly triggerToActions: TriggerToActionsRegistry;
-  protected readonly actionFactories: ActionFactoryRegistry;
 
   constructor({
     triggers = new Map(),
     actions = new Map(),
     triggerToActions = new Map(),
-    actionFactories = new Map(),
   }: UiActionsServiceParams = {}) {
     this.triggers = triggers;
     this.actions = actions;
     this.triggerToActions = triggerToActions;
-    this.actionFactories = actionFactories;
   }
 
   public readonly registerTrigger = (trigger: Trigger) => {
@@ -215,7 +202,6 @@ export class UiActionsService {
     this.actions.clear();
     this.triggers.clear();
     this.triggerToActions.clear();
-    this.actionFactories.clear();
   };
 
   /**
@@ -235,41 +221,4 @@ export class UiActionsService {
 
     return new UiActionsService({ triggers, actions, triggerToActions });
   };
-
-  /**
-   * Register an action factory. Action factories are used to configure and
-   * serialize/deserialize dynamic actions.
-   */
-  public readonly registerActionFactory = <
-    Config extends object = object,
-    FactoryContext extends object = object,
-    ActionContext extends object = object
-  >(
-    definition: ActionFactoryDefinition<Config, FactoryContext, ActionContext>
-  ) => {
-    if (this.actionFactories.has(definition.id)) {
-      throw new Error(`ActionFactory [actionFactory.id = ${definition.id}] already registered.`);
-    }
-
-    const actionFactory = new ActionFactory<Config, FactoryContext, ActionContext>(definition);
-
-    this.actionFactories.set(actionFactory.id, actionFactory as ActionFactory<any, any, any>);
-  };
-
-  public readonly getActionFactory = (actionFactoryId: string): ActionFactory => {
-    const actionFactory = this.actionFactories.get(actionFactoryId);
-
-    if (!actionFactory) {
-      throw new Error(`Action factory [actionFactoryId = ${actionFactoryId}] does not exist.`);
-    }
-
-    return actionFactory;
-  };
-
-  /**
-   * Returns an array of all action factories.
-   */
-  public readonly getActionFactories = (): ActionFactory[] => {
-    return [...this.actionFactories.values()];
-  };
 }
diff --git a/src/plugins/ui_actions/public/types.ts b/src/plugins/ui_actions/public/types.ts
index 2cb4a8f26a879d..ddfdad7b9716c3 100644
--- a/src/plugins/ui_actions/public/types.ts
+++ b/src/plugins/ui_actions/public/types.ts
@@ -19,7 +19,6 @@
 
 import { ActionInternal } from './actions/action_internal';
 import { TriggerInternal } from './triggers/trigger_internal';
-import { ActionFactory } from './actions';
 import { EmbeddableVisTriggerContext, IEmbeddable } from '../../embeddable/public';
 import { Filter } from '../../data/public';
 import { SELECT_RANGE_TRIGGER, VALUE_CLICK_TRIGGER, APPLY_FILTER_TRIGGER } from './triggers';
@@ -27,7 +26,6 @@ import { SELECT_RANGE_TRIGGER, VALUE_CLICK_TRIGGER, APPLY_FILTER_TRIGGER } from
 export type TriggerRegistry = Map<TriggerId, TriggerInternal<any>>;
 export type ActionRegistry = Map<string, ActionInternal>;
 export type TriggerToActionsRegistry = Map<TriggerId, string[]>;
-export type ActionFactoryRegistry = Map<string, ActionFactory>;
 
 const DEFAULT_TRIGGER = '';
 
diff --git a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.tsx b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.tsx
index 846f6d41eb30d1..ac6aead489edd5 100644
--- a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.tsx
+++ b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.tsx
@@ -16,7 +16,7 @@ import {
 } from '@elastic/eui';
 import { txtChangeButton } from './i18n';
 import './action_wizard.scss';
-import { ActionFactory } from '../../services';
+import { ActionFactory } from '../../dynamic_actions';
 
 type ActionBaseConfig = object;
 type ActionFactoryBaseContext = object;
diff --git a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/test_data.tsx b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/test_data.tsx
index 167cb130fdb4aa..102aee1878bc5d 100644
--- a/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/test_data.tsx
+++ b/x-pack/plugins/advanced_ui_actions/public/components/action_wizard/test_data.tsx
@@ -8,7 +8,7 @@ import React, { useState } from 'react';
 import { EuiFieldText, EuiFormRow, EuiSelect, EuiSwitch } from '@elastic/eui';
 import { reactToUiComponent } from '../../../../../../src/plugins/kibana_react/public';
 import { ActionWizard } from './action_wizard';
-import { ActionFactoryDefinition, ActionFactory } from '../../services';
+import { ActionFactoryDefinition, ActionFactory } from '../../dynamic_actions';
 import { CollectConfigProps } from '../../util';
 
 type ActionBaseConfig = object;
diff --git a/src/plugins/ui_actions/public/actions/action_factory.ts b/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/action_factory.ts
similarity index 65%
rename from src/plugins/ui_actions/public/actions/action_factory.ts
rename to x-pack/plugins/advanced_ui_actions/public/dynamic_actions/action_factory.ts
index bc0ec844d00f5f..cf2e16e1805e7e 100644
--- a/src/plugins/ui_actions/public/actions/action_factory.ts
+++ b/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/action_factory.ts
@@ -1,25 +1,14 @@
 /*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
  */
 
-import { uiToReactComponent } from '../../../kibana_react/public';
-import { Presentable } from '../util/presentable';
-import { ActionDefinition } from './action';
+import { uiToReactComponent } from '../../../../../src/plugins/kibana_react/public';
+import {
+  UiActionsActionDefinition as ActionDefinition,
+  UiActionsPresentable as Presentable,
+} from '../../../../../src/plugins/ui_actions/public';
 import { ActionFactoryDefinition } from './action_factory_definition';
 import { Configurable } from '../util';
 import { SerializedAction } from './types';
diff --git a/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/action_factory_definition.ts b/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/action_factory_definition.ts
new file mode 100644
index 00000000000000..7cb21ee29f70ce
--- /dev/null
+++ b/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/action_factory_definition.ts
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  UiActionsActionDefinition as ActionDefinition,
+  UiActionsPresentable as Presentable,
+} from '../../../../../src/plugins/ui_actions/public';
+import { Configurable } from '../util';
+import { SerializedAction } from './types';
+
+/**
+ * This is a convenience interface for registering new action factories.
+ */
+export interface ActionFactoryDefinition<
+  Config extends object = object,
+  FactoryContext extends object = object,
+  ActionContext extends object = object
+> extends Partial<Presentable<FactoryContext>>, Configurable<Config, FactoryContext> {
+  /**
+   * Unique ID of the action factory. This ID is used to identify this action
+   * factory in the registry as well as to construct actions of this type and
+   * identify this action factory when presenting it to the user in UI.
+   */
+  id: string;
+
+  /**
+   * This method should return a definition of a new action, normally used to
+   * register it in `ui_actions` registry.
+   */
+  create(
+    serializedAction: Omit<SerializedAction<Config>, 'factoryId'>
+  ): ActionDefinition<ActionContext>;
+}
diff --git a/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/dynamic_action_manager.test.ts b/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/dynamic_action_manager.test.ts
index e4bd73558b3578..9e9712304af3f6 100644
--- a/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/dynamic_action_manager.test.ts
+++ b/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/dynamic_action_manager.test.ts
@@ -5,14 +5,15 @@
  */
 
 import { DynamicActionManager } from './dynamic_action_manager';
-import { ActionStorage, MemoryActionStorage, SerializedEvent } from './dynamic_action_storage';
+import { ActionStorage, MemoryActionStorage } from './dynamic_action_storage';
 import {
   UiActionsService,
-  UiActionsActionFactoryDefinition as ActionFactoryDefinition,
-  UiActionsSerializedAction as SerializedAction,
   UiActionsActionInternal as ActionInternal,
 } from '../../../../../src/plugins/ui_actions/public';
 import { of } from '../../../../../src/plugins/kibana_utils';
+import { UiActionsServiceEnhancements } from '../services';
+import { ActionFactoryDefinition } from './action_factory_definition';
+import { SerializedAction, SerializedEvent } from './types';
 
 const actionFactoryDefinition1: ActionFactoryDefinition = {
   id: 'ACTION_FACTORY_1',
@@ -75,10 +76,11 @@ const setup = (events: readonly SerializedEvent[] = []) => {
   const uiActions = new UiActionsService({
     actions,
   });
+  const uiActionsEnhancements = new UiActionsServiceEnhancements();
   const manager = new DynamicActionManager({
     isCompatible,
     storage,
-    uiActions,
+    uiActions: { ...uiActions, ...uiActionsEnhancements },
   });
 
   uiActions.registerTrigger({
@@ -89,7 +91,7 @@ const setup = (events: readonly SerializedEvent[] = []) => {
     isCompatible,
     actions,
     storage,
-    uiActions,
+    uiActions: { ...uiActions, ...uiActionsEnhancements },
     manager,
   };
 };
diff --git a/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/dynamic_action_manager.ts b/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/dynamic_action_manager.ts
index 73aff70332fc3c..df214bfe80cc70 100644
--- a/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/dynamic_action_manager.ts
+++ b/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/dynamic_action_manager.ts
@@ -6,15 +6,15 @@
 
 import { v4 as uuidv4 } from 'uuid';
 import { Subscription } from 'rxjs';
-import { ActionStorage, SerializedEvent } from './dynamic_action_storage';
+import { ActionStorage } from './dynamic_action_storage';
 import {
-  UiActionsService,
-  UiActionsSerializedAction as SerializedAction,
   TriggerContextMapping,
   UiActionsActionDefinition as ActionDefinition,
 } from '../../../../../src/plugins/ui_actions/public';
 import { defaultState, transitions, selectors, State } from './dynamic_action_manager_state';
 import { StateContainer, createStateContainer } from '../../../../../src/plugins/kibana_utils';
+import { StartContract } from '../plugin';
+import { SerializedAction, SerializedEvent } from './types';
 
 const compareEvents = (
   a: ReadonlyArray<{ eventId: string }>,
@@ -30,7 +30,7 @@ export type DynamicActionManagerState = State;
 export interface DynamicActionManagerParams {
   storage: ActionStorage;
   uiActions: Pick<
-    UiActionsService,
+    StartContract,
     'registerAction' | 'attachAction' | 'unregisterAction' | 'detachAction' | 'getActionFactory'
   >;
   isCompatible: <C = unknown>(context: C) => Promise<boolean>;
diff --git a/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/dynamic_action_manager_state.ts b/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/dynamic_action_manager_state.ts
index 9f10eced43a659..61e8604baa9133 100644
--- a/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/dynamic_action_manager_state.ts
+++ b/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/dynamic_action_manager_state.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SerializedEvent } from './dynamic_action_storage';
+import { SerializedEvent } from './types';
 
 /**
  * This interface represents the state of @type {DynamicActionManager} at any
diff --git a/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/dynamic_action_storage.ts b/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/dynamic_action_storage.ts
index 92d2e8f0c3da77..e40441e67f033e 100644
--- a/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/dynamic_action_storage.ts
+++ b/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/dynamic_action_storage.ts
@@ -7,16 +7,7 @@
 /* eslint-disable max-classes-per-file */
 
 import { Observable, Subject } from 'rxjs';
-import { UiActionsSerializedAction as SerializedAction } from '../../../../../src/plugins/ui_actions/public';
-
-/**
- * Serialized representation of event-action pair, used to persist in storage.
- */
-export interface SerializedEvent {
-  eventId: string;
-  triggers: string[];
-  action: SerializedAction<unknown>;
-}
+import { SerializedEvent } from './types';
 
 /**
  * This CRUD interface needs to be implemented by dynamic action users if they
diff --git a/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/index.ts b/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/index.ts
index a2f2818d297311..bb37cf5e69535b 100644
--- a/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/index.ts
+++ b/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/index.ts
@@ -4,6 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+export * from './types';
+export * from './action_factory';
+export * from './action_factory_definition';
 export * from './dynamic_action_storage';
 export * from './dynamic_action_manager_state';
 export * from './dynamic_action_manager';
diff --git a/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/types.ts b/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/types.ts
new file mode 100644
index 00000000000000..9148d1ec7055aa
--- /dev/null
+++ b/x-pack/plugins/advanced_ui_actions/public/dynamic_actions/types.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export interface SerializedAction<Config> {
+  readonly factoryId: string;
+  readonly name: string;
+  readonly config: Config;
+}
+
+/**
+ * Serialized representation of a triggers-action pair, used to persist in storage.
+ */
+export interface SerializedEvent {
+  eventId: string;
+  triggers: string[];
+  action: SerializedAction<unknown>;
+}
diff --git a/x-pack/plugins/advanced_ui_actions/public/index.ts b/x-pack/plugins/advanced_ui_actions/public/index.ts
index 9672fb10f9e164..79fb03e9adbe63 100644
--- a/x-pack/plugins/advanced_ui_actions/public/index.ts
+++ b/x-pack/plugins/advanced_ui_actions/public/index.ts
@@ -21,7 +21,9 @@ export { ActionWizard } from './components';
 export {
   ActionFactoryDefinition as AdvancedUiActionsActionFactoryDefinition,
   ActionFactory as AdvancedUiActionsActionFactory,
-} from './services/action_factory_service';
+  SerializedAction as UiActionsEnhancedSerializedAction,
+  SerializedEvent as UiActionsEnhancedSerializedEvent,
+} from './dynamic_actions';
 export {
   Configurable as AdvancedUiActionsConfigurable,
   CollectConfigProps as AdvancedUiActionsCollectConfigProps,
diff --git a/x-pack/plugins/advanced_ui_actions/public/mocks.ts b/x-pack/plugins/advanced_ui_actions/public/mocks.ts
new file mode 100644
index 00000000000000..39d88b017ca074
--- /dev/null
+++ b/x-pack/plugins/advanced_ui_actions/public/mocks.ts
@@ -0,0 +1,73 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { CoreSetup, CoreStart } from '../../../../src/core/public';
+import { coreMock } from '../../../../src/core/public/mocks';
+import { uiActionsPluginMock } from '../../../../src/plugins/ui_actions/public/mocks';
+import { embeddablePluginMock } from '../../../../src/plugins/embeddable/public/mocks';
+import { AdvancedUiActionsSetup, AdvancedUiActionsStart } from '.';
+import { plugin as pluginInitializer } from '.';
+
+export type Setup = jest.Mocked<AdvancedUiActionsSetup>;
+export type Start = jest.Mocked<AdvancedUiActionsStart>;
+
+const createSetupContract = (): Setup => {
+  const setupContract: Setup = {
+    ...uiActionsPluginMock.createSetupContract(),
+    registerActionFactory: jest.fn(),
+  };
+  return setupContract;
+};
+
+const createStartContract = (): Start => {
+  const startContract: Start = {
+    ...uiActionsPluginMock.createStartContract(),
+    getActionFactories: jest.fn(),
+    getActionFactory: jest.fn(),
+  };
+
+  return startContract;
+};
+
+const createPlugin = (
+  coreSetup: CoreSetup = coreMock.createSetup(),
+  coreStart: CoreStart = coreMock.createStart()
+) => {
+  const pluginInitializerContext = coreMock.createPluginInitializerContext();
+  const uiActions = uiActionsPluginMock.createPlugin();
+  const embeddable = embeddablePluginMock.createInstance({
+    uiActions: uiActions.setup,
+  });
+  const plugin = pluginInitializer(pluginInitializerContext);
+  const setup = plugin.setup(coreSetup, {
+    uiActions: uiActions.setup,
+    embeddable: embeddable.setup,
+  });
+
+  return {
+    pluginInitializerContext,
+    coreSetup,
+    coreStart,
+    plugin,
+    setup,
+    doStart: (anotherCoreStart: CoreStart = coreStart) => {
+      const uiActionsStart = uiActions.doStart();
+      const embeddableStart = embeddable.doStart({
+        uiActions: uiActionsStart,
+      });
+      return plugin.start(anotherCoreStart, {
+        uiActions: uiActionsStart,
+        embeddable: embeddableStart,
+      });
+    },
+  };
+};
+
+export const uiActionsEnhancedPluginMock = {
+  createSetupContract,
+  createStartContract,
+  createPlugin,
+};
diff --git a/x-pack/plugins/advanced_ui_actions/public/plugin.ts b/x-pack/plugins/advanced_ui_actions/public/plugin.ts
index 71ea72499d87fd..cb2bbdba0a313b 100644
--- a/x-pack/plugins/advanced_ui_actions/public/plugin.ts
+++ b/x-pack/plugins/advanced_ui_actions/public/plugin.ts
@@ -30,6 +30,7 @@ import {
   TimeBadgeActionContext,
 } from './custom_time_range_badge';
 import { CommonlyUsedRange } from './types';
+import { UiActionsServiceEnhancements } from './services';
 
 interface SetupDependencies {
   embeddable: EmbeddableSetup; // Embeddable are needed because they register basic triggers/actions.
@@ -41,10 +42,13 @@ interface StartDependencies {
   uiActions: UiActionsStart;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface SetupContract extends UiActionsSetup {}
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface StartContract extends UiActionsStart {}
+export interface SetupContract
+  extends UiActionsSetup,
+    Pick<UiActionsServiceEnhancements, 'registerActionFactory'> {}
+
+export interface StartContract
+  extends UiActionsStart,
+    Pick<UiActionsServiceEnhancements, 'getActionFactory' | 'getActionFactories'> {}
 
 declare module '../../../../src/plugins/ui_actions/public' {
   export interface ActionContextMapping {
@@ -55,11 +59,14 @@ declare module '../../../../src/plugins/ui_actions/public' {
 
 export class AdvancedUiActionsPublicPlugin
   implements Plugin<SetupContract, StartContract, SetupDependencies, StartDependencies> {
+  private readonly enhancements = new UiActionsServiceEnhancements();
+
   constructor(initializerContext: PluginInitializerContext) {}
 
   public setup(core: CoreSetup, { uiActions }: SetupDependencies): SetupContract {
     return {
       ...uiActions,
+      ...this.enhancements,
     };
   }
 
@@ -83,6 +90,7 @@ export class AdvancedUiActionsPublicPlugin
 
     return {
       ...uiActions,
+      ...this.enhancements,
     };
   }
 
diff --git a/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/action_factory.ts b/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/action_factory.ts
deleted file mode 100644
index 66e2a4eafa880b..00000000000000
--- a/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/action_factory.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-/* eslint-disable */
-
-export {
-  ActionFactory
-} from '../../../../../../src/plugins/ui_actions/public/actions/action_factory';
diff --git a/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/action_factory_definition.ts b/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/action_factory_definition.ts
deleted file mode 100644
index f8669a4bf813f3..00000000000000
--- a/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/action_factory_definition.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-/* eslint-disable */
-
-export {
-  ActionFactoryDefinition
-} from '../../../../../../src/plugins/ui_actions/public/actions/action_factory_definition';
diff --git a/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/index.ts b/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/index.ts
deleted file mode 100644
index db5bb3aa62a163..00000000000000
--- a/x-pack/plugins/advanced_ui_actions/public/services/action_factory_service/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export * from './action_factory_definition';
-export * from './action_factory';
diff --git a/x-pack/plugins/advanced_ui_actions/public/services/index.ts b/x-pack/plugins/advanced_ui_actions/public/services/index.ts
index 0f8b4c8d8f409e..71a3429800c431 100644
--- a/x-pack/plugins/advanced_ui_actions/public/services/index.ts
+++ b/x-pack/plugins/advanced_ui_actions/public/services/index.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export * from './action_factory_service';
+export * from './ui_actions_service_enhancements';
diff --git a/x-pack/plugins/advanced_ui_actions/public/services/ui_actions_service_enhancements.test.ts b/x-pack/plugins/advanced_ui_actions/public/services/ui_actions_service_enhancements.test.ts
new file mode 100644
index 00000000000000..3137e35a2fe476
--- /dev/null
+++ b/x-pack/plugins/advanced_ui_actions/public/services/ui_actions_service_enhancements.test.ts
@@ -0,0 +1,70 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { UiActionsServiceEnhancements } from './ui_actions_service_enhancements';
+import { ActionFactoryDefinition, ActionFactory } from '../dynamic_actions';
+
+describe('UiActionsService', () => {
+  describe('action factories', () => {
+    const factoryDefinition1: ActionFactoryDefinition = {
+      id: 'test-factory-1',
+      CollectConfig: {} as any,
+      createConfig: () => ({}),
+      isConfigValid: () => true,
+      create: () => ({} as any),
+    };
+    const factoryDefinition2: ActionFactoryDefinition = {
+      id: 'test-factory-2',
+      CollectConfig: {} as any,
+      createConfig: () => ({}),
+      isConfigValid: () => true,
+      create: () => ({} as any),
+    };
+
+    test('.getActionFactories() returns empty array if no action factories registered', () => {
+      const service = new UiActionsServiceEnhancements();
+
+      const factories = service.getActionFactories();
+
+      expect(factories).toEqual([]);
+    });
+
+    test('can register and retrieve an action factory', () => {
+      const service = new UiActionsServiceEnhancements();
+
+      service.registerActionFactory(factoryDefinition1);
+
+      const factory = service.getActionFactory(factoryDefinition1.id);
+
+      expect(factory).toBeInstanceOf(ActionFactory);
+      expect(factory.id).toBe(factoryDefinition1.id);
+    });
+
+    test('can retrieve all action factories', () => {
+      const service = new UiActionsServiceEnhancements();
+
+      service.registerActionFactory(factoryDefinition1);
+      service.registerActionFactory(factoryDefinition2);
+
+      const factories = service.getActionFactories();
+      const factoriesSorted = [...factories].sort((f1, f2) => (f1.id > f2.id ? 1 : -1));
+
+      expect(factoriesSorted.length).toBe(2);
+      expect(factoriesSorted[0].id).toBe(factoryDefinition1.id);
+      expect(factoriesSorted[1].id).toBe(factoryDefinition2.id);
+    });
+
+    test('throws when retrieving action factory that does not exist', () => {
+      const service = new UiActionsServiceEnhancements();
+
+      service.registerActionFactory(factoryDefinition1);
+
+      expect(() => service.getActionFactory('UNKNOWN_ID')).toThrowError(
+        'Action factory [actionFactoryId = UNKNOWN_ID] does not exist.'
+      );
+    });
+  });
+});
diff --git a/x-pack/plugins/advanced_ui_actions/public/services/ui_actions_service_enhancements.ts b/x-pack/plugins/advanced_ui_actions/public/services/ui_actions_service_enhancements.ts
new file mode 100644
index 00000000000000..87bbc803964931
--- /dev/null
+++ b/x-pack/plugins/advanced_ui_actions/public/services/ui_actions_service_enhancements.ts
@@ -0,0 +1,57 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ActionFactoryRegistry } from '../types';
+import { ActionFactory, ActionFactoryDefinition } from '../dynamic_actions';
+
+export interface UiActionsServiceEnhancementsParams {
+  readonly actionFactories?: ActionFactoryRegistry;
+}
+
+export class UiActionsServiceEnhancements {
+  protected readonly actionFactories: ActionFactoryRegistry;
+
+  constructor({ actionFactories = new Map() }: UiActionsServiceEnhancementsParams = {}) {
+    this.actionFactories = actionFactories;
+  }
+
+  /**
+   * Register an action factory. Action factories are used to configure and
+   * serialize/deserialize dynamic actions.
+   */
+  public readonly registerActionFactory = <
+    Config extends object = object,
+    FactoryContext extends object = object,
+    ActionContext extends object = object
+  >(
+    definition: ActionFactoryDefinition<Config, FactoryContext, ActionContext>
+  ) => {
+    if (this.actionFactories.has(definition.id)) {
+      throw new Error(`ActionFactory [actionFactory.id = ${definition.id}] already registered.`);
+    }
+
+    const actionFactory = new ActionFactory<Config, FactoryContext, ActionContext>(definition);
+
+    this.actionFactories.set(actionFactory.id, actionFactory as ActionFactory<any, any, any>);
+  };
+
+  public readonly getActionFactory = (actionFactoryId: string): ActionFactory => {
+    const actionFactory = this.actionFactories.get(actionFactoryId);
+
+    if (!actionFactory) {
+      throw new Error(`Action factory [actionFactoryId = ${actionFactoryId}] does not exist.`);
+    }
+
+    return actionFactory;
+  };
+
+  /**
+   * Returns an array of all action factories.
+   */
+  public readonly getActionFactories = (): ActionFactory[] => {
+    return [...this.actionFactories.values()];
+  };
+}
diff --git a/x-pack/plugins/advanced_ui_actions/public/types.ts b/x-pack/plugins/advanced_ui_actions/public/types.ts
index 313b09535b196a..5c960192dcaff9 100644
--- a/x-pack/plugins/advanced_ui_actions/public/types.ts
+++ b/x-pack/plugins/advanced_ui_actions/public/types.ts
@@ -5,6 +5,7 @@
  */
 
 import { KibanaReactOverlays } from '../../../../src/plugins/kibana_react/public';
+import { ActionFactory } from './dynamic_actions';
 
 export interface CommonlyUsedRange {
   from: string;
@@ -13,3 +14,5 @@ export interface CommonlyUsedRange {
 }
 
 export type OpenModal = KibanaReactOverlays['openModal'];
+
+export type ActionFactoryRegistry = Map<string, ActionFactory>;
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.test.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.test.tsx
index 06a36542582910..e44f363f411809 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.test.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.test.tsx
@@ -8,13 +8,13 @@ import { FlyoutEditDrilldownAction, FlyoutEditDrilldownParams } from './flyout_e
 import { coreMock } from '../../../../../../../../src/core/public/mocks';
 import { drilldownsPluginMock } from '../../../../../../drilldowns/public/mocks';
 import { ViewMode } from '../../../../../../../../src/plugins/embeddable/public';
-import { uiActionsPluginMock } from '../../../../../../../../src/plugins/ui_actions/public/mocks';
+import { uiActionsEnhancedPluginMock } from '../../../../../../advanced_ui_actions/public/mocks';
 import { EnhancedEmbeddable } from '../../../../../../embeddable_enhanced/public';
 import { MockEmbeddable, enhanceEmbeddable } from '../test_helpers';
 
 const overlays = coreMock.createStart().overlays;
 const drilldowns = drilldownsPluginMock.createStartContract();
-const uiActionsPlugin = uiActionsPluginMock.createPlugin();
+const uiActionsPlugin = uiActionsEnhancedPluginMock.createPlugin();
 const uiActions = uiActionsPlugin.doStart();
 
 uiActionsPlugin.setup.registerActionFactory({
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/test_helpers.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/test_helpers.ts
index 07751f383fe156..47685f43888766 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/test_helpers.ts
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/test_helpers.ts
@@ -9,12 +9,13 @@ import { EnhancedEmbeddable } from '../../../../../embeddable_enhanced/public';
 import {
   UiActionsEnhancedMemoryActionStorage as MemoryActionStorage,
   UiActionsEnhancedDynamicActionManager as DynamicActionManager,
+  AdvancedUiActionsStart,
 } from '../../../../../advanced_ui_actions/public';
 import {
   TriggerContextMapping,
   UiActionsStart,
 } from '../../../../../../../src/plugins/ui_actions/public';
-import { uiActionsPluginMock } from '../../../../../../../src/plugins/ui_actions/public/mocks';
+import { uiActionsEnhancedPluginMock } from '../../../../../advanced_ui_actions/public/mocks';
 
 export class MockEmbeddable extends Embeddable {
   public readonly type = 'mock';
@@ -35,7 +36,7 @@ export class MockEmbeddable extends Embeddable {
 
 export const enhanceEmbeddable = <E extends MockEmbeddable>(
   embeddable: E,
-  uiActions: UiActionsStart = uiActionsPluginMock.createStartContract()
+  uiActions: AdvancedUiActionsStart = uiActionsEnhancedPluginMock.createStartContract()
 ): EnhancedEmbeddable<E> => {
   (embeddable as EnhancedEmbeddable<E>).enhancements = {
     dynamicActions: new DynamicActionManager({
diff --git a/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.tsx b/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.tsx
index f4dcbf64d895e0..c8a67a20aa5c16 100644
--- a/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.tsx
+++ b/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.tsx
@@ -10,14 +10,14 @@ import {
   AdvancedUiActionsActionFactory as ActionFactory,
   AdvancedUiActionsStart,
   UiActionsEnhancedDynamicActionManager as DynamicActionManager,
+  UiActionsEnhancedSerializedAction,
+  UiActionsEnhancedSerializedEvent,
 } from '../../../../advanced_ui_actions/public';
 import { NotificationsStart } from '../../../../../../src/core/public';
 import { DrilldownWizardConfig, FlyoutDrilldownWizard } from '../flyout_drilldown_wizard';
 import { FlyoutListManageDrilldowns } from '../flyout_list_manage_drilldowns';
 import { IStorageWrapper } from '../../../../../../src/plugins/kibana_utils/public';
 import {
-  UiActionsSerializedEvent,
-  UiActionsSerializedAction,
   VALUE_CLICK_TRIGGER,
   SELECT_RANGE_TRIGGER,
   TriggerContextMapping,
@@ -132,7 +132,7 @@ export function createFlyoutManageDrilldowns({
      * Maps drilldown to list item view model
      */
     function mapToDrilldownToDrilldownListItem(
-      drilldown: UiActionsSerializedEvent
+      drilldown: UiActionsEnhancedSerializedEvent
     ): DrilldownListItem {
       const actionFactory = allActionFactoriesById[drilldown.action.factoryId];
       return {
@@ -284,7 +284,7 @@ function useDrilldownsStateManager(
   }
 
   async function createDrilldown(
-    action: UiActionsSerializedAction<any>,
+    action: UiActionsEnhancedSerializedAction<any>,
     selectedTriggers: Array<keyof TriggerContextMapping>
   ) {
     await run(async () => {
@@ -298,7 +298,7 @@ function useDrilldownsStateManager(
 
   async function editDrilldown(
     drilldownId: string,
-    action: UiActionsSerializedAction<any>,
+    action: UiActionsEnhancedSerializedAction<any>,
     selectedTriggers: Array<keyof TriggerContextMapping>
   ) {
     await run(async () => {
diff --git a/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/test_data.ts b/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/test_data.ts
index 780c91eee56c39..47a04222286cbf 100644
--- a/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/test_data.ts
+++ b/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/test_data.ts
@@ -8,11 +8,9 @@ import uuid from 'uuid';
 import {
   UiActionsEnhancedDynamicActionManager as DynamicActionManager,
   UiActionsEnhancedDynamicActionManagerState as DynamicActionManagerState,
+  UiActionsEnhancedSerializedAction,
 } from '../../../../advanced_ui_actions/public';
-import {
-  UiActionsSerializedAction,
-  TriggerContextMapping,
-} from '../../../../../../src/plugins/ui_actions/public';
+import { TriggerContextMapping } from '../../../../../../src/plugins/ui_actions/public';
 import { createStateContainer } from '../../../../../../src/plugins/kibana_utils/common';
 
 class MockDynamicActionManager implements PublicMethodsOf<DynamicActionManager> {
@@ -31,7 +29,7 @@ class MockDynamicActionManager implements PublicMethodsOf<DynamicActionManager>
   }
 
   async createEvent(
-    action: UiActionsSerializedAction<any>,
+    action: UiActionsEnhancedSerializedAction<any>,
     triggers: Array<keyof TriggerContextMapping>
   ) {
     const event = {
@@ -62,7 +60,7 @@ class MockDynamicActionManager implements PublicMethodsOf<DynamicActionManager>
 
   async updateEvent(
     eventId: string,
-    action: UiActionsSerializedAction<unknown>,
+    action: UiActionsEnhancedSerializedAction<unknown>,
     triggers: Array<keyof TriggerContextMapping>
   ) {
     const state = this.state.get();
diff --git a/x-pack/plugins/drilldowns/public/services/drilldown_service.ts b/x-pack/plugins/drilldowns/public/services/drilldown_service.ts
index bfbe514d460955..cafaa945683546 100644
--- a/x-pack/plugins/drilldowns/public/services/drilldown_service.ts
+++ b/x-pack/plugins/drilldowns/public/services/drilldown_service.ts
@@ -5,9 +5,11 @@
  */
 
 import { CoreSetup } from 'src/core/public';
-import { AdvancedUiActionsSetup } from '../../../advanced_ui_actions/public';
+import {
+  AdvancedUiActionsSetup,
+  AdvancedUiActionsActionFactoryDefinition as ActionFactoryDefinition,
+} from '../../../advanced_ui_actions/public';
 import { DrilldownDefinition, DrilldownFactoryContext } from '../types';
-import { UiActionsActionFactoryDefinition as ActionFactoryDefinition } from '../../../../../src/plugins/ui_actions/public';
 
 export interface DrilldownServiceSetupDeps {
   advancedUiActions: AdvancedUiActionsSetup;
diff --git a/x-pack/plugins/embeddable_enhanced/kibana.json b/x-pack/plugins/embeddable_enhanced/kibana.json
index 9f63a55d5731d6..780a1d5d89870e 100644
--- a/x-pack/plugins/embeddable_enhanced/kibana.json
+++ b/x-pack/plugins/embeddable_enhanced/kibana.json
@@ -3,5 +3,5 @@
   "version": "kibana",
   "server": false,
   "ui": true,
-  "requiredPlugins": ["uiActions", "embeddable"]
+  "requiredPlugins": ["embeddable", "advancedUiActions"]
 }
diff --git a/x-pack/plugins/embeddable_enhanced/public/embeddables/embeddable_action_storage.test.ts b/x-pack/plugins/embeddable_enhanced/public/embeddables/embeddable_action_storage.test.ts
index f2aa0f8ed8fdf9..4eeda32a2de76e 100644
--- a/x-pack/plugins/embeddable_enhanced/public/embeddables/embeddable_action_storage.test.ts
+++ b/x-pack/plugins/embeddable_enhanced/public/embeddables/embeddable_action_storage.test.ts
@@ -10,7 +10,7 @@ import {
   ViewMode,
 } from '../../../../../src/plugins/embeddable/public';
 import { EmbeddableActionStorage } from './embeddable_action_storage';
-import { UiActionsSerializedEvent } from '../../../../../src/plugins/ui_actions/public';
+import { UiActionsEnhancedSerializedEvent } from '../../../advanced_ui_actions/public';
 import { of } from '../../../../../src/plugins/kibana_utils/public';
 
 class TestEmbeddable extends Embeddable<EmbeddableInput> {
@@ -32,7 +32,7 @@ describe('EmbeddableActionStorage', () => {
     test('can add event to embeddable', async () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
-      const event: UiActionsSerializedEvent = {
+      const event: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID',
         triggers: ['TRIGGER-ID'],
         action: {} as any,
@@ -50,7 +50,7 @@ describe('EmbeddableActionStorage', () => {
     test('does not merge .getInput() into .updateInput()', async () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
-      const event: UiActionsSerializedEvent = {
+      const event: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID',
         triggers: ['TRIGGER-ID'],
         action: {} as any,
@@ -68,17 +68,17 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event1: UiActionsSerializedEvent = {
+      const event1: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID1',
         triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
-      const event2: UiActionsSerializedEvent = {
+      const event2: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID2',
         triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
-      const event3: UiActionsSerializedEvent = {
+      const event3: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID3',
         triggers: ['TRIGGER-ID'],
         action: {} as any,
@@ -102,7 +102,7 @@ describe('EmbeddableActionStorage', () => {
     test('throws when creating an event with the same ID', async () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
-      const event: UiActionsSerializedEvent = {
+      const event: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID',
         triggers: ['TRIGGER-ID'],
         action: {} as any,
@@ -129,14 +129,14 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event1: UiActionsSerializedEvent = {
+      const event1: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID',
         triggers: ['TRIGGER-ID'],
         action: {
           name: 'foo',
         } as any,
       };
-      const event2: UiActionsSerializedEvent = {
+      const event2: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID',
         triggers: ['TRIGGER-ID'],
         action: {
@@ -155,28 +155,28 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event1: UiActionsSerializedEvent = {
+      const event1: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID1',
         triggers: ['TRIGGER-ID'],
         action: {
           name: 'foo',
         } as any,
       };
-      const event2: UiActionsSerializedEvent = {
+      const event2: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID2',
         triggers: ['TRIGGER-ID'],
         action: {
           name: 'bar',
         } as any,
       };
-      const event22: UiActionsSerializedEvent = {
+      const event22: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID2',
         triggers: ['TRIGGER-ID'],
         action: {
           name: 'baz',
         } as any,
       };
-      const event3: UiActionsSerializedEvent = {
+      const event3: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID3',
         triggers: ['TRIGGER-ID'],
         action: {
@@ -206,7 +206,7 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event: UiActionsSerializedEvent = {
+      const event: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID',
         triggers: ['TRIGGER-ID'],
         action: {} as any,
@@ -224,12 +224,12 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event1: UiActionsSerializedEvent = {
+      const event1: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID1',
         triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
-      const event2: UiActionsSerializedEvent = {
+      const event2: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID2',
         triggers: ['TRIGGER-ID'],
         action: {} as any,
@@ -256,7 +256,7 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event: UiActionsSerializedEvent = {
+      const event: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID',
         triggers: ['TRIGGER-ID'],
         action: {} as any,
@@ -273,21 +273,21 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event1: UiActionsSerializedEvent = {
+      const event1: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID1',
         triggers: ['TRIGGER-ID'],
         action: {
           name: 'foo',
         } as any,
       };
-      const event2: UiActionsSerializedEvent = {
+      const event2: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID2',
         triggers: ['TRIGGER-ID'],
         action: {
           name: 'bar',
         } as any,
       };
-      const event3: UiActionsSerializedEvent = {
+      const event3: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID3',
         triggers: ['TRIGGER-ID'],
         action: {
@@ -334,7 +334,7 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event: UiActionsSerializedEvent = {
+      const event: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID',
         triggers: ['TRIGGER-ID'],
         action: {} as any,
@@ -362,7 +362,7 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event: UiActionsSerializedEvent = {
+      const event: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID',
         triggers: ['TRIGGER-ID'],
         action: {} as any,
@@ -390,7 +390,7 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event: UiActionsSerializedEvent = {
+      const event: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID',
         triggers: ['TRIGGER-ID'],
         action: {} as any,
@@ -409,17 +409,17 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event1: UiActionsSerializedEvent = {
+      const event1: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID1',
         triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
-      const event2: UiActionsSerializedEvent = {
+      const event2: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID2',
         triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
-      const event3: UiActionsSerializedEvent = {
+      const event3: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID3',
         triggers: ['TRIGGER-ID'],
         action: {} as any,
@@ -509,13 +509,13 @@ describe('EmbeddableActionStorage', () => {
       const embeddable = new TestEmbeddable();
       const storage = new EmbeddableActionStorage(embeddable);
 
-      const event1: UiActionsSerializedEvent = {
+      const event1: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID1',
         triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
 
-      const event2: UiActionsSerializedEvent = {
+      const event2: UiActionsEnhancedSerializedEvent = {
         eventId: 'EVENT_ID2',
         triggers: ['TRIGGER-ID'],
         action: {} as any,
diff --git a/x-pack/plugins/embeddable_enhanced/public/embeddables/embeddable_action_storage.ts b/x-pack/plugins/embeddable_enhanced/public/embeddables/embeddable_action_storage.ts
index ad4f82cc529b59..d02d39b5b172c6 100644
--- a/x-pack/plugins/embeddable_enhanced/public/embeddables/embeddable_action_storage.ts
+++ b/x-pack/plugins/embeddable_enhanced/public/embeddables/embeddable_action_storage.ts
@@ -4,8 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { UiActionsSerializedEvent as SerializedEvent } from '../../../../../src/plugins/ui_actions/public';
-import { UiActionsEnhancedAbstractActionStorage as AbstractActionStorage } from '../../../advanced_ui_actions/public';
+import {
+  UiActionsEnhancedAbstractActionStorage as AbstractActionStorage,
+  UiActionsEnhancedSerializedEvent as SerializedEvent,
+} from '../../../advanced_ui_actions/public';
 import { IEmbeddable } from '../../../../../src/plugins/embeddable/public';
 
 export class EmbeddableActionStorage extends AbstractActionStorage {
diff --git a/x-pack/plugins/embeddable_enhanced/public/plugin.ts b/x-pack/plugins/embeddable_enhanced/public/plugin.ts
index 5a1f07a4809372..a7a56d2c0d78d0 100644
--- a/x-pack/plugins/embeddable_enhanced/public/plugin.ts
+++ b/x-pack/plugins/embeddable_enhanced/public/plugin.ts
@@ -6,7 +6,6 @@
 
 import { CoreStart, CoreSetup, Plugin, PluginInitializerContext } from 'src/core/public';
 import { SavedObjectAttributes } from 'kibana/public';
-import { UiActionsSetup, UiActionsStart } from '../../../../src/plugins/ui_actions/public';
 import {
   EmbeddableFactory,
   EmbeddableFactoryDefinition,
@@ -20,16 +19,20 @@ import {
 } from '../../../../src/plugins/embeddable/public';
 import { EnhancedEmbeddable } from './types';
 import { EmbeddableActionStorage } from './embeddables/embeddable_action_storage';
-import { UiActionsEnhancedDynamicActionManager as DynamicActionManager } from '../../advanced_ui_actions/public';
+import {
+  UiActionsEnhancedDynamicActionManager as DynamicActionManager,
+  AdvancedUiActionsSetup,
+  AdvancedUiActionsStart,
+} from '../../advanced_ui_actions/public';
 
 export interface SetupDependencies {
   embeddable: EmbeddableSetup;
-  uiActions: UiActionsSetup;
+  advancedUiActions: AdvancedUiActionsSetup;
 }
 
 export interface StartDependencies {
   embeddable: EmbeddableStart;
-  uiActions: UiActionsStart;
+  advancedUiActions: AdvancedUiActionsStart;
 }
 
 // eslint-disable-next-line
@@ -42,7 +45,7 @@ export class EmbeddableEnhancedPlugin
   implements Plugin<SetupContract, StartContract, SetupDependencies, StartDependencies> {
   constructor(protected readonly context: PluginInitializerContext) {}
 
-  private uiActions?: StartDependencies['uiActions'];
+  private uiActions?: StartDependencies['advancedUiActions'];
 
   public setup(core: CoreSetup<StartDependencies>, plugins: SetupDependencies): SetupContract {
     this.setCustomEmbeddableFactoryProvider(plugins);
@@ -51,7 +54,7 @@ export class EmbeddableEnhancedPlugin
   }
 
   public start(core: CoreStart, plugins: StartDependencies): StartContract {
-    this.uiActions = plugins.uiActions;
+    this.uiActions = plugins.advancedUiActions;
 
     return {};
   }