diff --git a/plugins/catalog-backend-module-bitbucket-server/package.json b/plugins/catalog-backend-module-bitbucket-server/package.json
index 41c4fabd69..1f9b8baa27 100644
--- a/plugins/catalog-backend-module-bitbucket-server/package.json
+++ b/plugins/catalog-backend-module-bitbucket-server/package.json
@@ -21,16 +21,12 @@
   "license": "Apache-2.0",
   "exports": {
     ".": "./src/index.ts",
-    "./alpha": "./src/alpha.ts",
     "./package.json": "./package.json"
   },
   "main": "src/index.ts",
   "types": "src/index.ts",
   "typesVersions": {
     "*": {
-      "alpha": [
-        "src/alpha.ts"
-      ],
       "package.json": [
         "package.json"
       ]
diff --git a/plugins/catalog-backend-module-bitbucket-server/report-alpha.api.md b/plugins/catalog-backend-module-bitbucket-server/report-alpha.api.md
deleted file mode 100644
index 7082701333..0000000000
--- a/plugins/catalog-backend-module-bitbucket-server/report-alpha.api.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## API Report File for "@backstage/plugin-catalog-backend-module-bitbucket-server"
-
-> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
-
-```ts
-// (No @packageDocumentation comment for this package)
-```
diff --git a/plugins/catalog-backend-module-bitbucket-server/report.api.md b/plugins/catalog-backend-module-bitbucket-server/report.api.md
index cdbe714be3..7cb13e651f 100644
--- a/plugins/catalog-backend-module-bitbucket-server/report.api.md
+++ b/plugins/catalog-backend-module-bitbucket-server/report.api.md
@@ -86,52 +86,6 @@ export class BitbucketServerEntityProvider implements EntityProvider {
   refresh(logger: LoggerService): Promise<void>;
 }
 
-// @public (undocumented)
-export namespace BitbucketServerEvents {
-  // (undocumented)
-  export type Actor = {
-    name?: string;
-    id: number;
-  };
-  // (undocumented)
-  export type Change = {
-    ref: {
-      id: string;
-      displayId: string;
-      type: string;
-    };
-  };
-  // (undocumented)
-  export interface Event {
-    // (undocumented)
-    eventKey: string;
-  }
-  // (undocumented)
-  export interface RefsChangedEvent extends Event {
-    // (undocumented)
-    actor: Actor;
-    // (undocumented)
-    changes: Change[];
-    // (undocumented)
-    commits: undefined;
-    // (undocumented)
-    date: string;
-    // (undocumented)
-    repository: Repository;
-    // (undocumented)
-    ToCommit: undefined;
-  }
-  // (undocumented)
-  export type Repository = {
-    slug: string;
-    id: number;
-    name: string;
-    project: BitbucketServerProject;
-  };
-  {
-  }
-}
-
 // @public (undocumented)
 export type BitbucketServerListOptions = {
   [key: string]: number | undefined;
@@ -181,12 +135,4 @@ export type BitbucketServerRepository = {
 // @public (undocumented)
 const catalogModuleBitbucketServerEntityProvider: BackendFeature;
 export default catalogModuleBitbucketServerEntityProvider;
-
-// @public (undocumented)
-export function paginated(
-  request: (
-    options: BitbucketServerListOptions,
-  ) => Promise<BitbucketServerPagedResponse<any>>,
-  options?: BitbucketServerListOptions,
-): AsyncGenerator<any, void, unknown>;
 ```
diff --git a/plugins/catalog-backend-module-bitbucket-server/src/alpha.ts b/plugins/catalog-backend-module-bitbucket-server/src/alpha.ts
deleted file mode 100644
index 706d03bd5d..0000000000
--- a/plugins/catalog-backend-module-bitbucket-server/src/alpha.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright 2023 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {} from './module';
diff --git a/plugins/catalog-backend-module-bitbucket-server/src/index.ts b/plugins/catalog-backend-module-bitbucket-server/src/index.ts
index 96e3a1a0a7..722be03d7a 100644
--- a/plugins/catalog-backend-module-bitbucket-server/src/index.ts
+++ b/plugins/catalog-backend-module-bitbucket-server/src/index.ts
@@ -21,7 +21,16 @@
  */
 
 export { default } from './module';
-export * from './lib';
+
+export { BitbucketServerClient } from './lib';
+
+export type {
+  BitbucketServerProject,
+  BitbucketServerRepository,
+  BitbucketServerPagedResponse,
+  BitbucketServerListOptions,
+  BitbucketServerDefaultBranch,
+} from './lib';
 
 export { BitbucketServerEntityProvider } from './providers';
 export type { BitbucketServerLocationParser } from './providers';
diff --git a/plugins/catalog-backend-module-bitbucket-server/src/lib/BitbucketServerClient.ts b/plugins/catalog-backend-module-bitbucket-server/src/lib/BitbucketServerClient.ts
index 6deb47ca6a..70e791c992 100644
--- a/plugins/catalog-backend-module-bitbucket-server/src/lib/BitbucketServerClient.ts
+++ b/plugins/catalog-backend-module-bitbucket-server/src/lib/BitbucketServerClient.ts
@@ -198,9 +198,6 @@ export type BitbucketServerPagedResponse<T> = {
   nextPageStart: number;
 };
 
-/**
- * @public
- */
 export async function* paginated(
   request: (
     options: BitbucketServerListOptions,
diff --git a/plugins/catalog-backend-module-bitbucket-server/src/lib/index.ts b/plugins/catalog-backend-module-bitbucket-server/src/lib/index.ts
index 14fb01629e..4533cb1305 100644
--- a/plugins/catalog-backend-module-bitbucket-server/src/lib/index.ts
+++ b/plugins/catalog-backend-module-bitbucket-server/src/lib/index.ts
@@ -19,4 +19,10 @@ export type {
   BitbucketServerPagedResponse,
   BitbucketServerListOptions,
 } from './BitbucketServerClient';
-export * from './types';
+export type {
+  BitbucketServerDefaultBranch,
+  BitbucketServerRepository,
+  BitbucketServerEvents,
+  BitbucketServerProject,
+} from './types';
+// export * from './types';
diff --git a/plugins/catalog-backend-module-bitbucket-server/src/lib/types.ts b/plugins/catalog-backend-module-bitbucket-server/src/lib/types.ts
index e014528791..efdf3d7cf8 100644
--- a/plugins/catalog-backend-module-bitbucket-server/src/lib/types.ts
+++ b/plugins/catalog-backend-module-bitbucket-server/src/lib/types.ts
@@ -46,7 +46,6 @@ type BitbucketServerDefaultBranch = {
   isDefault: boolean;
 };
 
-/** @public */
 namespace BitbucketServerEvents {
   interface Event {
     eventKey: string;
diff --git a/plugins/events-backend-module-bitbucket-server/package.json b/plugins/events-backend-module-bitbucket-server/package.json
index 4cfe424618..29945bd16f 100644
--- a/plugins/events-backend-module-bitbucket-server/package.json
+++ b/plugins/events-backend-module-bitbucket-server/package.json
@@ -18,16 +18,12 @@
   "license": "Apache-2.0",
   "exports": {
     ".": "./src/index.ts",
-    "./alpha": "./src/alpha.ts",
     "./package.json": "./package.json"
   },
   "main": "src/index.ts",
   "types": "src/index.ts",
   "typesVersions": {
     "*": {
-      "alpha": [
-        "src/alpha.ts"
-      ],
       "package.json": [
         "package.json"
       ]
diff --git a/plugins/events-backend-module-bitbucket-server/report-alpha.api.md b/plugins/events-backend-module-bitbucket-server/report-alpha.api.md
deleted file mode 100644
index 47b9068604..0000000000
--- a/plugins/events-backend-module-bitbucket-server/report-alpha.api.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## API Report File for "@backstage/plugin-events-backend-module-bitbucket-server"
-
-> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
-
-```ts
-// (No @packageDocumentation comment for this package)
-```
diff --git a/plugins/events-backend-module-bitbucket-server/report.api.md b/plugins/events-backend-module-bitbucket-server/report.api.md
index 916f7fa2ab..913556cfe9 100644
--- a/plugins/events-backend-module-bitbucket-server/report.api.md
+++ b/plugins/events-backend-module-bitbucket-server/report.api.md
@@ -8,5 +8,4 @@ import { BackendFeature } from '@backstage/backend-plugin-api';
 // @public
 const eventsModuleBitbucketServerEventRouter: BackendFeature;
 export default eventsModuleBitbucketServerEventRouter;
-export { eventsModuleBitbucketServerEventRouter };
 ```
diff --git a/plugins/events-backend-module-bitbucket-server/src/alpha.ts b/plugins/events-backend-module-bitbucket-server/src/alpha.ts
deleted file mode 100644
index 588ee62daa..0000000000
--- a/plugins/events-backend-module-bitbucket-server/src/alpha.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright 2023 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {} from './service/eventsModuleBitbucketServerEventRouter';
diff --git a/plugins/events-backend-module-bitbucket-server/src/index.ts b/plugins/events-backend-module-bitbucket-server/src/index.ts
index 6cf9aeb5e2..8a765ecfdf 100644
--- a/plugins/events-backend-module-bitbucket-server/src/index.ts
+++ b/plugins/events-backend-module-bitbucket-server/src/index.ts
@@ -20,6 +20,4 @@
  *
  * @packageDocumentation
  */
-
-export { eventsModuleBitbucketServerEventRouter } from './service/eventsModuleBitbucketServerEventRouter';
 export { eventsModuleBitbucketServerEventRouter as default } from './service/eventsModuleBitbucketServerEventRouter';