diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/src/autocomplete/autocomplete.ts b/plugins/scaffolder-backend-module-bitbucket-cloud/src/autocomplete/autocomplete.ts
index 58d2bc9c6d..75cc170a30 100644
--- a/plugins/scaffolder-backend-module-bitbucket-cloud/src/autocomplete/autocomplete.ts
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/src/autocomplete/autocomplete.ts
@@ -34,29 +34,29 @@ export async function handleAutocompleteRequest({
 
   switch (resource) {
     case 'workspaces': {
-      const result: string[] = [];
+      const results: { title: string }[] = [];
 
       for await (const page of client.listWorkspaces().iteratePages()) {
-        const slugs = [...page.values!].map(p => p.slug!);
-        result.push(...slugs);
+        const slugs = [...page.values!].map(p => ({ title: p.slug! }));
+        results.push(...slugs);
       }
 
-      return { results: result.map(title => ({ title })) };
+      return { results };
     }
     case 'projects': {
       if (!context.workspace)
         throw new InputError('Missing workspace context parameter');
 
-      const result: string[] = [];
+      const results: { title: string }[] = [];
 
       for await (const page of client
         .listProjectsByWorkspace(context.workspace)
         .iteratePages()) {
-        const keys = [...page.values!].map(p => p.key!);
-        result.push(...keys);
+        const keys = [...page.values!].map(p => ({ title: p.key! }));
+        results.push(...keys);
       }
 
-      return { results: result.map(title => ({ title })) };
+      return { results };
     }
     case 'repositories': {
       if (!context.workspace || !context.project)
@@ -64,18 +64,18 @@ export async function handleAutocompleteRequest({
           'Missing workspace and/or project context parameter',
         );
 
-      const result: string[] = [];
+      const results: { title: string }[] = [];
 
       for await (const page of client
         .listRepositoriesByWorkspace(context.workspace, {
           q: `project.key="${context.project}"`,
         })
         .iteratePages()) {
-        const slugs = [...page.values!].map(p => p.slug!);
-        result.push(...slugs);
+        const slugs = [...page.values!].map(p => ({ title: p.slug! }));
+        results.push(...slugs);
       }
 
-      return { results: result.map(title => ({ title })) };
+      return { results };
     }
     case 'branches': {
       if (!context.workspace || !context.repository)
@@ -83,16 +83,16 @@ export async function handleAutocompleteRequest({
           'Missing workspace and/or repository context parameter',
         );
 
-      const result: string[] = [];
+      const results: { title: string }[] = [];
 
       for await (const page of client
         .listBranchesByRepository(context.repository, context.workspace)
         .iteratePages()) {
-        const names = [...page.values!].map(p => p.name!);
-        result.push(...names);
+        const names = [...page.values!].map(p => ({ title: p.name! }));
+        results.push(...names);
       }
 
-      return { results: result.map(title => ({ title })) };
+      return { results };
     }
     default:
       throw new InputError(`Invalid resource: ${resource}`);