diff --git a/packages/app/src/components/scaffolder/defaultPreviewTemplate.ts b/packages/app/src/components/scaffolder/defaultPreviewTemplate.ts
index db0725591c..2abed330c4 100644
--- a/packages/app/src/components/scaffolder/defaultPreviewTemplate.ts
+++ b/packages/app/src/components/scaffolder/defaultPreviewTemplate.ts
@@ -17,7 +17,7 @@
 export const defaultPreviewTemplate = `# Edit the template parameters below to see how they will render in the scaffolder form UI
 parameters:
   - title: Fill in some steps
-    ui:ObjectFieldTemplate: 'CustomLayout'
+    ui:layout: 'CustomLayout'
     required:
       - name
     properties:
diff --git a/plugins/scaffolder/src/layouts/resolveStepLayout.ts b/plugins/scaffolder/src/layouts/resolveStepLayout.ts
index bdcbf5817d..7e4e4f7c11 100644
--- a/plugins/scaffolder/src/layouts/resolveStepLayout.ts
+++ b/plugins/scaffolder/src/layouts/resolveStepLayout.ts
@@ -22,10 +22,9 @@ export function resolveStepLayout(
   uiSchema: UiSchema = {},
   layouts: LayoutOptions[],
 ): ObjectFieldTemplate {
-  const layoutName =
-    uiSchema?.['ui:ObjectFieldTemplate'] ?? DEFAULT_SCAFFOLDER_LAYOUT.name;
+  const layoutName = uiSchema?.['ui:layout'] ?? DEFAULT_SCAFFOLDER_LAYOUT.name;
 
-  delete uiSchema?.['ui:ObjectFieldTemplate'];
+  delete uiSchema?.['ui:layout'];
 
   const LayoutComponent = layouts.find(
     layout => layout.name === layoutName,
diff --git a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/useTemplateSchema.test.tsx b/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/useTemplateSchema.test.tsx
index 838eecae7a..e699ee703a 100644
--- a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/useTemplateSchema.test.tsx
+++ b/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/useTemplateSchema.test.tsx
@@ -41,7 +41,7 @@ describe('useTemplateSchema', () => {
           description: 'Step 2 Description',
           schema: {
             type: 'object',
-            'ui:ObjectFieldTemplate': 'MyLayout',
+            'ui:layout': 'MyLayout',
             properties: {
               field2: { type: 'string', 'ui:field': 'MyCoolerComponent' },
             },
@@ -75,7 +75,7 @@ describe('useTemplateSchema', () => {
 
     expect(second.uiSchema).toEqual({
       field2: { 'ui:field': 'MyCoolerComponent' },
-      'ui:ObjectFieldTemplate': 'MyLayout',
+      'ui:layout': 'MyLayout',
     });
 
     expect(second.schema).toEqual({