diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md
index 0c3904adf6..28dc0b7e40 100644
--- a/plugins/scaffolder/api-report.md
+++ b/plugins/scaffolder/api-report.md
@@ -36,6 +36,17 @@ export function createScaffolderFieldExtension<T = any>(
   options: FieldExtensionOptions<T>,
 ): Extension<() => null>;
 
+// Warning: (ae-missing-release-tag) "CustomFieldExtension" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface CustomFieldExtension<ReturnValue, UiOptions extends {} = {}>
+  extends FieldProps<ReturnValue> {
+  // (undocumented)
+  uiSchema: {
+    'ui:options'?: UiOptions;
+  };
+}
+
 // Warning: (ae-missing-release-tag) "CustomFieldValidator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -137,15 +148,16 @@ export const OwnerPicker: ({
 // @public (undocumented)
 export const OwnerPickerFieldExtension: () => null;
 
+// Warning: (ae-forgotten-export) The symbol "RepoUrlPickerUiOptions" needs to be exported by the entry point index.d.ts
 // Warning: (ae-missing-release-tag) "RepoUrlPicker" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const RepoUrlPicker: ({
-  onChange,
   uiSchema,
+  onChange,
   rawErrors,
   formData,
-}: FieldProps<string>) => JSX.Element;
+}: CustomFieldExtension<string, RepoUrlPickerUiOptions>) => JSX.Element;
 
 // Warning: (ae-missing-release-tag) "RepoUrlPickerFieldExtension" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/index.ts b/plugins/scaffolder/src/components/fields/RepoUrlPicker/index.ts
index 7e14d6d62b..2fdbf0aac9 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/index.ts
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/index.ts
@@ -14,4 +14,5 @@
  * limitations under the License.
  */
 export { RepoUrlPicker } from './RepoUrlPicker';
+export type { RepoUrlPickerUiOptions } from './RepoUrlPicker';
 export { repoPickerValidation } from './validation';
diff --git a/plugins/scaffolder/src/index.ts b/plugins/scaffolder/src/index.ts
index 3851b2151b..86f684cb2d 100644
--- a/plugins/scaffolder/src/index.ts
+++ b/plugins/scaffolder/src/index.ts
@@ -26,7 +26,11 @@ export {
   createScaffolderFieldExtension,
   ScaffolderFieldExtensions,
 } from './extensions';
-export type { CustomFieldValidator, FieldExtensionOptions } from './extensions';
+export type {
+  CustomFieldValidator,
+  FieldExtensionOptions,
+  CustomFieldExtension,
+} from './extensions';
 export {
   EntityPickerFieldExtension,
   EntityNamePickerFieldExtension,