diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md
index fdeeddf4f3..ccea88e27c 100644
--- a/plugins/scaffolder/api-report.md
+++ b/plugins/scaffolder/api-report.md
@@ -210,8 +210,8 @@ export function makeFieldSchemaFromZod<
     : never
 >;
 
-// @public (undocumented)
-export const MultiEntityPickerFieldSchema: FieldSchema<
+// @public
+export const MultiEntityPickerFieldExtension: FieldExtensionComponent_2<
   string[],
   {
     defaultKind?: string | undefined;
@@ -238,10 +238,6 @@ export const MultiEntityPickerFieldSchema: FieldSchema<
   }
 >;
 
-// @public
-export type MultiEntityPickerUiOptions =
-  typeof MultiEntityPickerFieldSchema.uiOptionsType;
-
 // @public
 export const MyGroupsPickerFieldExtension: FieldExtensionComponent_2<
   string,
diff --git a/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.tsx b/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.tsx
index 68bc729024..d850bbd435 100644
--- a/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.tsx
@@ -47,8 +47,6 @@ export { MultiEntityPickerSchema } from './schema';
 /**
  * The underlying component that is rendered in the form for the `MultiEntityPicker`
  * field extension.
- *
- * @public
  */
 export const MultiEntityPicker = (props: MultiEntityPickerProps) => {
   const {
diff --git a/plugins/scaffolder/src/components/fields/MultiEntityPicker/schema.ts b/plugins/scaffolder/src/components/fields/MultiEntityPicker/schema.ts
index 00ce4c90c2..2621157d02 100644
--- a/plugins/scaffolder/src/components/fields/MultiEntityPicker/schema.ts
+++ b/plugins/scaffolder/src/components/fields/MultiEntityPicker/schema.ts
@@ -16,9 +16,6 @@
 import { z } from 'zod';
 import { makeFieldSchemaFromZod } from '../utils';
 
-/**
- * @public
- */
 export const entityQueryFilterExpressionSchema = z.record(
   z
     .string()
@@ -26,9 +23,6 @@ export const entityQueryFilterExpressionSchema = z.record(
     .or(z.array(z.string())),
 );
 
-/**
- * @public
- */
 export const MultiEntityPickerFieldSchema = makeFieldSchemaFromZod(
   z.array(z.string()),
   z.object({
@@ -59,8 +53,6 @@ export const MultiEntityPickerFieldSchema = makeFieldSchemaFromZod(
 /**
  * The input props that can be specified under `ui:options` for the
  * `EntityPicker` field extension.
- *
- * @public
  */
 export type MultiEntityPickerUiOptions =
   typeof MultiEntityPickerFieldSchema.uiOptionsType;
diff --git a/plugins/scaffolder/src/components/fields/index.ts b/plugins/scaffolder/src/components/fields/index.ts
index e8a7b8cc91..7f119f27be 100644
--- a/plugins/scaffolder/src/components/fields/index.ts
+++ b/plugins/scaffolder/src/components/fields/index.ts
@@ -19,5 +19,5 @@ export * from './RepoUrlPicker';
 export * from './OwnedEntityPicker';
 export * from './EntityTagsPicker';
 export * from './MyGroupsPicker';
-export * from './MultiEntityPicker';
+
 export { type FieldSchema, makeFieldSchemaFromZod } from './utils';
diff --git a/plugins/scaffolder/src/index.ts b/plugins/scaffolder/src/index.ts
index ee91d2988c..d809ec00f9 100644
--- a/plugins/scaffolder/src/index.ts
+++ b/plugins/scaffolder/src/index.ts
@@ -29,6 +29,7 @@ export {
   OwnedEntityPickerFieldExtension,
   MyGroupsPickerFieldExtension,
   RepoUrlPickerFieldExtension,
+  MultiEntityPickerFieldExtension,
   ScaffolderPage,
   scaffolderPlugin,
 } from './plugin';