diff --git a/.changeset/cold-numbers-sleep.md b/.changeset/cold-numbers-sleep.md
new file mode 100644
index 0000000000..ac53307b07
--- /dev/null
+++ b/.changeset/cold-numbers-sleep.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Fix the get entities query in the `MyGroupsPicker` to query the `kind=Group` entities.
diff --git a/plugins/scaffolder/src/components/fields/MyGroupsPicker/MyGroupsPicker.test.tsx b/plugins/scaffolder/src/components/fields/MyGroupsPicker/MyGroupsPicker.test.tsx
index 0bdfe5f153..099d6fa6ed 100644
--- a/plugins/scaffolder/src/components/fields/MyGroupsPicker/MyGroupsPicker.test.tsx
+++ b/plugins/scaffolder/src/components/fields/MyGroupsPicker/MyGroupsPicker.test.tsx
@@ -129,7 +129,7 @@ describe('<MyGroupsPicker />', () => {
 
     expect(catalogApi.getEntities).toHaveBeenCalledWith({
       filter: {
-        type: 'Group',
+        kind: 'Group',
         'relations.hasMember': ['user:default/bob'],
       },
     });
@@ -201,8 +201,8 @@ describe('<MyGroupsPicker />', () => {
 
     // Simulate user input
     const inputField = getByRole('combobox');
-    userEvent.click(inputField);
-    userEvent.type(inputField, 'group');
+    await userEvent.click(inputField);
+    await userEvent.type(inputField, 'group');
 
     // Wait for the dropdown elements to appear
     await waitFor(() => {
@@ -257,8 +257,8 @@ describe('<MyGroupsPicker />', () => {
     );
 
     const inputField = getByRole('combobox');
-    userEvent.click(inputField);
-    userEvent.type(inputField, 'group');
+    await userEvent.click(inputField);
+    await userEvent.type(inputField, 'group');
 
     await waitFor(() => {
       expect(
@@ -267,7 +267,7 @@ describe('<MyGroupsPicker />', () => {
     });
 
     const option = getByRole('option', { name: 'My First Group' });
-    userEvent.click(option);
+    await userEvent.click(option);
 
     await waitFor(() => {
       expect(onChange).toHaveBeenCalledTimes(1);
diff --git a/plugins/scaffolder/src/components/fields/MyGroupsPicker/MyGroupsPicker.tsx b/plugins/scaffolder/src/components/fields/MyGroupsPicker/MyGroupsPicker.tsx
index 28bc2b93fa..fefdd4230c 100644
--- a/plugins/scaffolder/src/components/fields/MyGroupsPicker/MyGroupsPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/MyGroupsPicker/MyGroupsPicker.tsx
@@ -62,7 +62,7 @@ export const MyGroupsPicker = (props: MyGroupsPickerProps) => {
 
     const { items } = await catalogApi.getEntities({
       filter: {
-        type: 'Group',
+        kind: 'Group',
         ['relations.hasMember']: [userEntityRef],
       },
     });