diff --git a/.changeset/angry-ladybugs-retire.md b/.changeset/angry-ladybugs-retire.md
deleted file mode 100644
index ca2b34676b..0000000000
--- a/.changeset/angry-ladybugs-retire.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder': minor
----
-
-Added autocompletion for Bitbucket Cloud
diff --git a/.changeset/five-forks-retire.md b/.changeset/five-forks-retire.md
deleted file mode 100644
index 9b9573bfd4..0000000000
--- a/.changeset/five-forks-retire.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-bitbucket-cloud-common': patch
----
-
-Added support for access tokens
diff --git a/.changeset/friendly-masks-type.md b/.changeset/friendly-masks-type.md
new file mode 100644
index 0000000000..6f38ddefa3
--- /dev/null
+++ b/.changeset/friendly-masks-type.md
@@ -0,0 +1,5 @@
+---
+'@backstage/integration': minor
+---
+
+Add support for `token` for `bitbucketCloud` integration
diff --git a/.changeset/great-colts-enjoy.md b/.changeset/great-colts-enjoy.md
deleted file mode 100644
index 6907f661a5..0000000000
--- a/.changeset/great-colts-enjoy.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-bitbucket-cloud-common': patch
----
-
-Added method `listProjectsByWorkspace` for retrieving projects by workspace
diff --git a/.changeset/light-avocados-worry.md b/.changeset/light-avocados-worry.md
new file mode 100644
index 0000000000..a3605a1451
--- /dev/null
+++ b/.changeset/light-avocados-worry.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-scaffolder-backend-module-bitbucket-cloud': patch
+'@backstage/plugin-bitbucket-cloud-common': patch
+---
+
+Add support for `autocomplete` handler to provide autocomplete options for `RepoUrlPicker`
diff --git a/.changeset/nine-seals-sit.md b/.changeset/nine-seals-sit.md
deleted file mode 100644
index 0055a1be24..0000000000
--- a/.changeset/nine-seals-sit.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/integration': minor
----
-
-Added support for access tokens to Bitbucket Cloud
diff --git a/.changeset/rare-planes-switch.md b/.changeset/rare-planes-switch.md
deleted file mode 100644
index 622c6d48d8..0000000000
--- a/.changeset/rare-planes-switch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-bitbucket-cloud-common': patch
----
-
-Added method `listWorkspaces` for retrieving workspaces
diff --git a/.changeset/selfish-turtles-jog.md b/.changeset/selfish-turtles-jog.md
new file mode 100644
index 0000000000..02506ec068
--- /dev/null
+++ b/.changeset/selfish-turtles-jog.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-scaffolder-backend': minor
+'@backstage/plugin-scaffolder-node': patch
+---
+
+Add support for `autocomplete` extension point to provide additional `autocomplete` handlers
diff --git a/.changeset/slimy-ties-relate.md b/.changeset/slimy-ties-relate.md
deleted file mode 100644
index d4da9972f1..0000000000
--- a/.changeset/slimy-ties-relate.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend': patch
----
-
-Added endpoint for autocompleting provider resources (currently only supports Bitbucket)
diff --git a/.changeset/tame-geese-run.md b/.changeset/tame-geese-run.md
deleted file mode 100644
index 785ae6c7fc..0000000000
--- a/.changeset/tame-geese-run.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-react': patch
----
-
-Added method `autocomplete` to interface `ScaffolderApi`
diff --git a/.changeset/young-donuts-swim.md b/.changeset/young-donuts-swim.md
new file mode 100644
index 0000000000..edd854f6dc
--- /dev/null
+++ b/.changeset/young-donuts-swim.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-scaffolder-react': minor
+'@backstage/plugin-scaffolder': minor
+---
+
+Add support for `bitbucketCloud` autocomplete in `RepoUrlPicker`
diff --git a/packages/integration/api-report.md b/packages/integration/api-report.md
index 91abc7473f..4c8e8accf2 100644
--- a/packages/integration/api-report.md
+++ b/packages/integration/api-report.md
@@ -186,7 +186,7 @@ export type BitbucketCloudIntegrationConfig = {
   apiBaseUrl: string;
   username?: string;
   appPassword?: string;
-  accessToken?: string;
+  token?: string;
 };
 
 // @public @deprecated
diff --git a/packages/integration/src/bitbucketCloud/config.ts b/packages/integration/src/bitbucketCloud/config.ts
index 2f533480cc..32a2af9313 100644
--- a/packages/integration/src/bitbucketCloud/config.ts
+++ b/packages/integration/src/bitbucketCloud/config.ts
@@ -50,7 +50,7 @@ export type BitbucketCloudIntegrationConfig = {
   /**
    * The access token to use for requests to Bitbucket Cloud (bitbucket.org).
    */
-  accessToken?: string;
+  token?: string;
 };
 
 /**
diff --git a/plugins/bitbucket-cloud-common/src/BitbucketCloudClient.ts b/plugins/bitbucket-cloud-common/src/BitbucketCloudClient.ts
index a06f7425d0..f1b7d60e41 100644
--- a/plugins/bitbucket-cloud-common/src/BitbucketCloudClient.ts
+++ b/plugins/bitbucket-cloud-common/src/BitbucketCloudClient.ts
@@ -139,11 +139,10 @@ export class BitbucketCloudClient {
         'utf8',
       );
       headers.Authorization = `Basic ${buffer.toString('base64')}`;
+    } else if (this.config.token) {
+      headers.Authorization = `Bearer ${this.config.token}`;
     }
 
-    if (this.config.accessToken)
-      headers.Authorization = `Bearer ${this.config.accessToken}`;
-
     return headers;
   }
 }
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/src/autocomplete/autocomplete.test.ts b/plugins/scaffolder-backend-module-bitbucket-cloud/src/autocomplete/autocomplete.test.ts
index 7367504d93..0447ff2d28 100644
--- a/plugins/scaffolder-backend-module-bitbucket-cloud/src/autocomplete/autocomplete.test.ts
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/src/autocomplete/autocomplete.test.ts
@@ -50,7 +50,7 @@ describe('handleAutocompleteRequest', () => {
     });
 
     expect(fromConfig).toHaveBeenCalledWith(
-      expect.objectContaining({ accessToken }),
+      expect.objectContaining({ token: accessToken }),
     );
   });
 
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 50723fb41d..31a2103088 100644
--- a/plugins/scaffolder-backend-module-bitbucket-cloud/src/autocomplete/autocomplete.ts
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/src/autocomplete/autocomplete.ts
@@ -29,7 +29,7 @@ export async function handleAutocompleteRequest({
   const client = BitbucketCloudClient.fromConfig({
     host: 'bitbucket.org',
     apiBaseUrl: 'https://api.bitbucket.org/2.0',
-    accessToken: token,
+    token,
   });
 
   switch (resource) {