diff --git a/plugins/scaffolder-backend/src/ScaffolderPlugin.ts b/plugins/scaffolder-backend/src/ScaffolderPlugin.ts
index 9fc4b2537a..c83c6d437d 100644
--- a/plugins/scaffolder-backend/src/ScaffolderPlugin.ts
+++ b/plugins/scaffolder-backend/src/ScaffolderPlugin.ts
@@ -28,6 +28,7 @@ import {
   TemplateGlobal,
 } from '@backstage/plugin-scaffolder-node';
 import {
+  AutocompleteHandler,
   scaffolderActionsExtensionPoint,
   scaffolderAutocompleteExtensionPoint,
   scaffolderTaskBrokerExtensionPoint,
@@ -83,10 +84,10 @@ export const scaffolderPlugin = createBackendPlugin({
       },
     });
 
-    const autocompleteResolers = [];
+    const autocompleteHandlers: Record<string, AutocompleteHandler> = {};
     env.registerExtensionPoint(scaffolderAutocompleteExtensionPoint, {
       addAutocompleteProvider(provider) {
-        autocompleteResolers.push(provider);
+        autocompleteHandlers[provider.id] = provider.handler;
       },
     });
 
@@ -170,6 +171,7 @@ export const scaffolderPlugin = createBackendPlugin({
           httpAuth,
           discovery,
           permissions,
+          autocompleteHandlers,
         });
         httpRouter.use(router);
       },
diff --git a/plugins/scaffolder-backend/src/service/router.test.ts b/plugins/scaffolder-backend/src/service/router.test.ts
index 10975d6b52..4bd3847666 100644
--- a/plugins/scaffolder-backend/src/service/router.test.ts
+++ b/plugins/scaffolder-backend/src/service/router.test.ts
@@ -46,7 +46,6 @@ import {
   PermissionEvaluator,
 } from '@backstage/plugin-permission-common';
 import { mockCredentials, mockServices } from '@backstage/backend-test-utils';
-import { handleBitbucketCloudRequest } from '@backstage/plugin-scaffolder-backend-module-bitbucket-cloud/src/autocomplete/autocomplete';
 
 const mockAccess = jest.fn();