diff --git a/plugins/scaffolder/report-alpha.api.md b/plugins/scaffolder/report-alpha.api.md
index 892d5139dc..08ddf7323f 100644
--- a/plugins/scaffolder/report-alpha.api.md
+++ b/plugins/scaffolder/report-alpha.api.md
@@ -195,8 +195,6 @@ const _default: OverridableFrontendPlugin<
       };
     }>;
     'page:scaffolder': OverridableExtensionDefinition<{
-      kind: 'page';
-      name: undefined;
       config: {
         path: string | undefined;
         title: string | undefined;
@@ -260,7 +258,21 @@ const _default: OverridableFrontendPlugin<
             internal: false;
           }
         >;
+        formFields: ExtensionInput<
+          ConfigurableExtensionDataRef<
+            () => Promise<FormField>,
+            'scaffolder.form-field-loader',
+            {}
+          >,
+          {
+            singleton: false;
+            optional: false;
+            internal: false;
+          }
+        >;
       };
+      kind: 'page';
+      name: undefined;
       params: {
         path: string;
         title?: string;
@@ -561,20 +573,7 @@ const _default: OverridableFrontendPlugin<
               optional: true;
             }
           >;
-      inputs: {
-        formFields: ExtensionInput<
-          ConfigurableExtensionDataRef<
-            () => Promise<FormField>,
-            'scaffolder.form-field-loader',
-            {}
-          >,
-          {
-            singleton: false;
-            optional: false;
-            internal: false;
-          }
-        >;
-      };
+      inputs: {};
       kind: 'sub-page';
       name: 'templates';
       params: {
diff --git a/plugins/scaffolder/src/alpha/extensions.tsx b/plugins/scaffolder/src/alpha/extensions.tsx
index 8632268014..712b97a2c9 100644
--- a/plugins/scaffolder/src/alpha/extensions.tsx
+++ b/plugins/scaffolder/src/alpha/extensions.tsx
@@ -34,37 +34,31 @@ import { scmIntegrationsApiRef } from '@backstage/integration-react';
 import { scaffolderApiRef } from '@backstage/plugin-scaffolder-react';
 import { ScaffolderClient } from '../api';
 
-export const scaffolderPage = PageBlueprint.make({
-  params: {
-    routeRef: rootRouteRef,
-    path: '/create',
-    title: 'Create',
+export const scaffolderPage = PageBlueprint.makeWithOverrides({
+  inputs: {
+    formFields: createExtensionInput([
+      FormFieldBlueprint.dataRefs.formFieldLoader,
+    ]),
+  },
+  factory(originalFactory) {
+    return originalFactory({
+      routeRef: rootRouteRef,
+      path: '/create',
+      title: 'Create',
+    });
   },
 });
 
 export const scaffolderTemplatesSubPage = SubPageBlueprint.makeWithOverrides({
   name: 'templates',
-  inputs: {
-    formFields: createExtensionInput(
-      [FormFieldBlueprint.dataRefs.formFieldLoader],
-      { replaces: [{ id: 'page:scaffolder', input: 'formFields' }] },
-    ),
-  },
-  factory(originalFactory, { apis, inputs }) {
+  factory(originalFactory, { apis }) {
     const formFieldsApi = apis.get(formFieldsApiRef);
 
     return originalFactory({
       path: 'templates',
       title: 'Templates',
       loader: async () => {
-        const apiFormFields = (await formFieldsApi?.loadFormFields()) ?? [];
-        const formFieldLoaders = inputs.formFields.map(output =>
-          output.get(FormFieldBlueprint.dataRefs.formFieldLoader),
-        );
-        const loadedFormFields = await Promise.all(
-          formFieldLoaders.map(loader => loader()),
-        );
-        const formFields = [...apiFormFields, ...loadedFormFields];
+        const formFields = (await formFieldsApi?.loadFormFields()) ?? [];
 
         return import('./components/TemplatesSubPage').then(m => (
           <m.TemplatesSubPage formFields={formFields} />