diff --git a/packages/app/src/components/scaffolder/defaultPreviewTemplate.ts b/packages/app/src/components/scaffolder/defaultPreviewTemplate.ts
index 56f34779de..5d8a2accda 100644
--- a/packages/app/src/components/scaffolder/defaultPreviewTemplate.ts
+++ b/packages/app/src/components/scaffolder/defaultPreviewTemplate.ts
@@ -31,8 +31,8 @@ parameters:
         description: Owner of the component
         ui:field: OwnerPicker
         ui:options:
-          allowedKinds:
-            - Group
+          catalogFilter:
+            kind: Group
   - title: Choose a location
     required:
       - repoUrl
diff --git a/plugins/scaffolder-backend/sample-templates/bitbucket-demo/template.yaml b/plugins/scaffolder-backend/sample-templates/bitbucket-demo/template.yaml
index 52714f6d73..64dda93b07 100644
--- a/plugins/scaffolder-backend/sample-templates/bitbucket-demo/template.yaml
+++ b/plugins/scaffolder-backend/sample-templates/bitbucket-demo/template.yaml
@@ -39,8 +39,8 @@ spec:
           description: Owner of the component
           ui:field: OwnerPicker
           ui:options:
-            allowedKinds:
-              - Group
+            catalogFilter:
+              kind: Group
 
   steps:
     - id: fetch-base
diff --git a/plugins/scaffolder/src/components/TemplateEditorPage/TemplateFormPreviewer.tsx b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateFormPreviewer.tsx
index 041b7797ee..5bc32ed581 100644
--- a/plugins/scaffolder/src/components/TemplateEditorPage/TemplateFormPreviewer.tsx
+++ b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateFormPreviewer.tsx
@@ -53,8 +53,8 @@ parameters:
         description: Owner of the component
         ui:field: OwnerPicker
         ui:options:
-          allowedKinds:
-            - Group
+          catalogFilter:
+            kind: Group
   - title: Choose a location
     required:
       - repoUrl