diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md
index 0472f019cc..48f24868de 100644
--- a/plugins/scaffolder/api-report.md
+++ b/plugins/scaffolder/api-report.md
@@ -207,6 +207,31 @@ export function makeFieldSchemaFromZod<
     : never
 >;
 
+// @public
+export const MyGroupsPickerFieldExtension: FieldExtensionComponent_2<
+  string,
+  {
+    title?: string | undefined;
+    description?: string | undefined;
+  }
+>;
+
+// @public
+export const MyGroupsPickerFieldSchema: FieldSchema<
+  string,
+  {
+    title?: string | undefined;
+    description?: string | undefined;
+  }
+>;
+
+// @public
+export const MyGroupsPickerSchema: CustomFieldExtensionSchema_2;
+
+// @public
+export type MyGroupsPickerUiOptions =
+  typeof MyGroupsPickerFieldSchema.uiOptionsType;
+
 // @public
 export const OwnedEntityPickerFieldExtension: FieldExtensionComponent_2<
   string,
@@ -292,31 +317,6 @@ export const OwnerPickerFieldSchema: FieldSchema<
 // @public
 export type OwnerPickerUiOptions = typeof OwnerPickerFieldSchema.uiOptionsType;
 
-// @public
-export const OwnershipEntityRefPickerFieldExtension: FieldExtensionComponent_2<
-  string,
-  {
-    title?: string | undefined;
-    description?: string | undefined;
-  }
->;
-
-// @public
-export const OwnershipEntityRefPickerFieldSchema: FieldSchema<
-  string,
-  {
-    title?: string | undefined;
-    description?: string | undefined;
-  }
->;
-
-// @public
-export const OwnershipEntityRefPickerSchema: CustomFieldExtensionSchema_2;
-
-// @public
-export type OwnershipEntityRefPickerUiOptions =
-  typeof OwnershipEntityRefPickerFieldSchema.uiOptionsType;
-
 // @public
 export const repoPickerValidation: (
   value: string,
diff --git a/plugins/scaffolder/src/extensions/default.ts b/plugins/scaffolder/src/extensions/default.ts
index ef827cfaca..013f242a12 100644
--- a/plugins/scaffolder/src/extensions/default.ts
+++ b/plugins/scaffolder/src/extensions/default.ts
@@ -43,7 +43,6 @@ import {
   MyGroupsPicker,
   MyGroupsPickerSchema,
 } from '../components/fields/MyGroupsPicker/MyGroupsPicker';
-import { MyGroupsPickerFieldSchema } from '../components';
 
 export const DEFAULT_SCAFFOLDER_FIELD_EXTENSIONS = [
   {
@@ -81,6 +80,6 @@ export const DEFAULT_SCAFFOLDER_FIELD_EXTENSIONS = [
   {
     component: MyGroupsPicker,
     name: 'MyGroupsPicker',
-    schema: MyGroupsPickerFieldSchema,
+    schema: MyGroupsPickerSchema,
   },
 ];
diff --git a/plugins/scaffolder/src/index.ts b/plugins/scaffolder/src/index.ts
index 7ec9717bdc..ee91d2988c 100644
--- a/plugins/scaffolder/src/index.ts
+++ b/plugins/scaffolder/src/index.ts
@@ -27,7 +27,7 @@ export {
   EntityTagsPickerFieldExtension,
   OwnerPickerFieldExtension,
   OwnedEntityPickerFieldExtension,
-  OwnershipEntityRefPickerFieldExtension,
+  MyGroupsPickerFieldExtension,
   RepoUrlPickerFieldExtension,
   ScaffolderPage,
   scaffolderPlugin,