diff --git a/plugins/scaffolder-backend/src/ScaffolderPlugin.ts b/plugins/scaffolder-backend/src/ScaffolderPlugin.ts
index a8213cf585..9fc4b2537a 100644
--- a/plugins/scaffolder-backend/src/ScaffolderPlugin.ts
+++ b/plugins/scaffolder-backend/src/ScaffolderPlugin.ts
@@ -29,6 +29,7 @@ import {
 } from '@backstage/plugin-scaffolder-node';
 import {
   scaffolderActionsExtensionPoint,
+  scaffolderAutocompleteExtensionPoint,
   scaffolderTaskBrokerExtensionPoint,
   scaffolderTemplatingExtensionPoint,
 } from '@backstage/plugin-scaffolder-node/alpha';
@@ -82,6 +83,13 @@ export const scaffolderPlugin = createBackendPlugin({
       },
     });
 
+    const autocompleteResolers = [];
+    env.registerExtensionPoint(scaffolderAutocompleteExtensionPoint, {
+      addAutocompleteProvider(provider) {
+        autocompleteResolers.push(provider);
+      },
+    });
+
     env.registerInit({
       deps: {
         logger: coreServices.logger,
diff --git a/plugins/scaffolder-backend/src/service/autocomplete.ts b/plugins/scaffolder-backend/src/service/autocomplete.ts
index 034a201450..131305d53e 100644
--- a/plugins/scaffolder-backend/src/service/autocomplete.ts
+++ b/plugins/scaffolder-backend/src/service/autocomplete.ts
@@ -17,7 +17,7 @@
 import { InputError } from '@backstage/errors';
 import { BitbucketCloudClient } from '@backstage/plugin-bitbucket-cloud-common';
 
-export async function handleBitbucketCloudRequest(
+export async function handleAutocompleteRequest(
   token: string,
   resource: string,
   parameters: Record<string, string>,
diff --git a/plugins/scaffolder-node/src/alpha.ts b/plugins/scaffolder-node/src/alpha.ts
index b85da5b590..3644d48b7c 100644
--- a/plugins/scaffolder-node/src/alpha.ts
+++ b/plugins/scaffolder-node/src/alpha.ts
@@ -79,3 +79,31 @@ export const scaffolderTemplatingExtensionPoint =
   createExtensionPoint<ScaffolderTemplatingExtensionPoint>({
     id: 'scaffolder.templating',
   });
+
+/**
+ * Extension point for adding autocomplete handler providers
+ * @alpha
+ */
+export interface ScaffolderAutocompleteExtensionPoint {
+  addAutocompleteProvider(
+    provider: ({
+      type,
+      token,
+      query,
+    }: {
+      type: string;
+      token: string;
+      query: Record<string, string>;
+    }) => Promise<{ results: { title: string }[] }>,
+  ): void;
+}
+
+/**
+ * Extension point for adding template filters and globals.
+ *
+ * @alpha
+ */
+export const scaffolderAutocompleteExtensionPoint =
+  createExtensionPoint<ScaffolderAutocompleteExtensionPoint>({
+    id: 'scaffolder.autocomplete',
+  });