diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md
index 0a9145c780..3d2fa4982c 100644
--- a/plugins/scaffolder/api-report.md
+++ b/plugins/scaffolder/api-report.md
@@ -32,20 +32,18 @@ import { TemplateEntityV1beta2 } from '@backstage/plugin-scaffolder-common';
 // Warning: (ae-missing-release-tag) "createScaffolderFieldExtension" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export function createScaffolderFieldExtension<T = any>(
-  options: FieldExtensionOptions<T>,
+export function createScaffolderFieldExtension<TReturnValue = unknown>(
+  options: FieldExtensionOptions<TReturnValue>,
 ): Extension<() => null>;
 
 // @public
-export type CustomFieldValidator<T> =
-  | ((data: T, field: FieldValidation) => void)
-  | ((
-      data: T,
-      field: FieldValidation,
-      context: {
-        apiHolder: ApiHolder;
-      },
-    ) => void);
+export type CustomFieldValidator<TReturnValue> = (
+  data: TReturnValue,
+  field: FieldValidation,
+  context: {
+    apiHolder: ApiHolder;
+  },
+) => void;
 
 // Warning: (ae-missing-release-tag) "EntityNamePicker" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
@@ -106,10 +104,10 @@ export interface FieldExtensionComponentProps<
 }
 
 // @public
-export type FieldExtensionOptions<T = any> = {
+export type FieldExtensionOptions<TReturnValue = unknown> = {
   name: string;
-  component: (props: FieldProps<T>) => JSX.Element | null;
-  validation?: CustomFieldValidator<T>;
+  component: (props: FieldProps<TReturnValue>) => JSX.Element | null;
+  validation?: CustomFieldValidator<TReturnValue>;
 };
 
 // Warning: (ae-missing-release-tag) "OwnedEntityPicker" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
diff --git a/plugins/scaffolder/src/extensions/default.ts b/plugins/scaffolder/src/extensions/default.ts
index 820cc0e6d3..10c0746e41 100644
--- a/plugins/scaffolder/src/extensions/default.ts
+++ b/plugins/scaffolder/src/extensions/default.ts
@@ -27,31 +27,32 @@ import {
 import { FieldExtensionOptions } from './types';
 import { OwnedEntityPicker } from '../components/fields/OwnedEntityPicker';
 
-export const DEFAULT_SCAFFOLDER_FIELD_EXTENSIONS: FieldExtensionOptions[] = [
-  {
-    component: EntityPicker,
-    name: 'EntityPicker',
-  },
-  {
-    component: EntityNamePicker,
-    name: 'EntityNamePicker',
-    validation: entityNamePickerValidation,
-  },
-  {
-    component: EntityTagsPicker,
-    name: 'EntityTagsPicker',
-  },
-  {
-    component: RepoUrlPicker,
-    name: 'RepoUrlPicker',
-    validation: repoPickerValidation,
-  },
-  {
-    component: OwnerPicker,
-    name: 'OwnerPicker',
-  },
-  {
-    component: OwnedEntityPicker,
-    name: 'OwnedEntityPicker',
-  },
-];
+export const DEFAULT_SCAFFOLDER_FIELD_EXTENSIONS: FieldExtensionOptions<any>[] =
+  [
+    {
+      component: EntityPicker,
+      name: 'EntityPicker',
+    },
+    {
+      component: EntityNamePicker,
+      name: 'EntityNamePicker',
+      validation: entityNamePickerValidation,
+    },
+    {
+      component: EntityTagsPicker,
+      name: 'EntityTagsPicker',
+    },
+    {
+      component: RepoUrlPicker,
+      name: 'RepoUrlPicker',
+      validation: repoPickerValidation,
+    },
+    {
+      component: OwnerPicker,
+      name: 'OwnerPicker',
+    },
+    {
+      component: OwnedEntityPicker,
+      name: 'OwnedEntityPicker',
+    },
+  ];