diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md
index 4c7b11ea43..4d75ed8421 100644
--- a/plugins/scaffolder-backend/api-report.md
+++ b/plugins/scaffolder-backend/api-report.md
@@ -7,6 +7,7 @@
 
 import { ActionContext as ActionContext_2 } from '@backstage/plugin-scaffolder-node';
 import { AuthService } from '@backstage/backend-plugin-api';
+import { AutocompleteHandler } from '@backstage/plugin-scaffolder-node/alpha';
 import * as azure from '@backstage/plugin-scaffolder-backend-module-azure';
 import { BackstageCredentials } from '@backstage/backend-plugin-api';
 import * as bitbucket from '@backstage/plugin-scaffolder-backend-module-bitbucket';
@@ -478,6 +479,8 @@ export interface RouterOptions {
   // (undocumented)
   auth?: AuthService;
   // (undocumented)
+  autocompleteHandlers?: Record<string, AutocompleteHandler>;
+  // (undocumented)
   catalogClient: CatalogApi;
   concurrentTasksLimit?: number;
   // (undocumented)
diff --git a/plugins/scaffolder-node/api-report-alpha.md b/plugins/scaffolder-node/api-report-alpha.md
index c2a2a1597e..aae32d7203 100644
--- a/plugins/scaffolder-node/api-report-alpha.md
+++ b/plugins/scaffolder-node/api-report-alpha.md
@@ -9,6 +9,21 @@ import { TemplateAction } from '@backstage/plugin-scaffolder-node';
 import { TemplateFilter } from '@backstage/plugin-scaffolder-node';
 import { TemplateGlobal } from '@backstage/plugin-scaffolder-node';
 
+// @alpha
+export type AutocompleteHandler = ({
+  resource,
+  token,
+  context,
+}: {
+  resource: string;
+  token: string;
+  context: Record<string, string>;
+}) => Promise<{
+  results: {
+    title: string;
+  }[];
+}>;
+
 // @alpha
 export interface ScaffolderActionsExtensionPoint {
   // (undocumented)
@@ -18,6 +33,21 @@ export interface ScaffolderActionsExtensionPoint {
 // @alpha
 export const scaffolderActionsExtensionPoint: ExtensionPoint<ScaffolderActionsExtensionPoint>;
 
+// @alpha
+export interface ScaffolderAutocompleteExtensionPoint {
+  // (undocumented)
+  addAutocompleteProvider({
+    id,
+    handler,
+  }: {
+    id: string;
+    handler: AutocompleteHandler;
+  }): void;
+}
+
+// @alpha
+export const scaffolderAutocompleteExtensionPoint: ExtensionPoint<ScaffolderAutocompleteExtensionPoint>;
+
 // @alpha
 export interface ScaffolderTaskBrokerExtensionPoint {
   // (undocumented)
diff --git a/plugins/scaffolder-react/api-report.md b/plugins/scaffolder-react/api-report.md
index cc6672a8a5..a14490b80c 100644
--- a/plugins/scaffolder-react/api-report.md
+++ b/plugins/scaffolder-react/api-report.md
@@ -180,12 +180,16 @@ export type ReviewStepProps = {
 // @public
 export interface ScaffolderApi {
   // (undocumented)
-  autocomplete(
-    token: string,
-    provider: string,
-    resource: string,
-    params?: Record<string, string>,
-  ): Promise<string[]>;
+  autocomplete?(options: {
+    token: string;
+    provider: string;
+    resource: string;
+    context?: Record<string, string>;
+  }): Promise<{
+    results: {
+      title: string;
+    }[];
+  }>;
   cancelTask(taskId: string): Promise<void>;
   // (undocumented)
   dryRun?(options: ScaffolderDryRunOptions): Promise<ScaffolderDryRunResponse>;
diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md
index affc69ed93..f479b13ec4 100644
--- a/plugins/scaffolder/api-report.md
+++ b/plugins/scaffolder/api-report.md
@@ -502,12 +502,21 @@ export class ScaffolderClient implements ScaffolderApi_2 {
     useLongPollingLogs?: boolean;
   });
   // (undocumented)
-  autocomplete(
-    token: string,
-    provider: string,
-    resource: string,
-    params?: Record<string, string>,
-  ): Promise<string[]>;
+  autocomplete({
+    token,
+    resource,
+    provider,
+    context,
+  }: {
+    token: string;
+    provider: string;
+    resource: string;
+    context?: Record<string, string>;
+  }): Promise<{
+    results: {
+      title: string;
+    }[];
+  }>;
   // (undocumented)
   cancelTask(taskId: string): Promise<void>;
   // (undocumented)