diff --git a/packages/catalog-client/package.json b/packages/catalog-client/package.json
index 2fd7f8915e..d5bfbda6a9 100644
--- a/packages/catalog-client/package.json
+++ b/packages/catalog-client/package.json
@@ -51,6 +51,7 @@
   "dependencies": {
     "@backstage/catalog-model": "workspace:^",
     "@backstage/errors": "workspace:^",
+    "@backstage/plugin-catalog-common": "workspace:^",
     "cross-fetch": "^4.0.0",
     "uri-template": "^2.0.0"
   },
diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index 7417af424d..fbc621deff 100644
--- a/plugins/catalog-backend/package.json
+++ b/plugins/catalog-backend/package.json
@@ -53,7 +53,7 @@
     "clean": "backstage-cli package clean",
     "diff": "backstage-repo-tools package schema openapi diff",
     "fuzz": "backstage-repo-tools package schema openapi fuzz --exclude-checks response_schema_conformance",
-    "generate": "backstage-repo-tools package schema openapi generate --server --client-package packages/catalog-client --server-client-import \"@backstage/catalog-client/alpha\"",
+    "generate": "backstage-repo-tools package schema openapi generate --server --client-package plugins/catalog-common --server-client-import \"@backstage/plugin-catalog-common/client\"",
     "lint": "backstage-cli package lint",
     "prepack": "backstage-cli package prepack",
     "postpack": "backstage-cli package postpack",
diff --git a/plugins/catalog-backend/src/generated/apis/DefaultApi.server.ts b/plugins/catalog-backend/src/generated/apis/DefaultApi.server.ts
index 3d03476a47..c390e14dbf 100644
--- a/plugins/catalog-backend/src/generated/apis/DefaultApi.server.ts
+++ b/plugins/catalog-backend/src/generated/apis/DefaultApi.server.ts
@@ -34,7 +34,7 @@ import type {
   GetLocations,
   RefreshEntity,
   ValidateEntity,
-} from '@backstage/catalog-client/alpha';
+} from '@backstage/plugin-catalog-common/client';
 
 /**
  * no description
diff --git a/plugins/catalog-common/package.json b/plugins/catalog-common/package.json
index 6e69dd0ef8..bf80779bf0 100644
--- a/plugins/catalog-common/package.json
+++ b/plugins/catalog-common/package.json
@@ -30,6 +30,7 @@
   "exports": {
     ".": "./src/index.ts",
     "./alpha": "./src/alpha.ts",
+    "./client": "./src/client.ts",
     "./package.json": "./package.json"
   },
   "main": "src/index.ts",
@@ -39,6 +40,9 @@
       "alpha": [
         "src/alpha.ts"
       ],
+      "client": [
+        "src/client.ts"
+      ],
       "package.json": [
         "package.json"
       ]
@@ -58,7 +62,9 @@
   "dependencies": {
     "@backstage/catalog-model": "workspace:^",
     "@backstage/plugin-permission-common": "workspace:^",
-    "@backstage/plugin-search-common": "workspace:^"
+    "@backstage/plugin-search-common": "workspace:^",
+    "cross-fetch": "^4.0.0",
+    "uri-template": "^2.0.0"
   },
   "devDependencies": {
     "@backstage/cli": "workspace:^"
diff --git a/plugins/catalog-common/src/client.ts b/plugins/catalog-common/src/client.ts
new file mode 100644
index 0000000000..db98243cbf
--- /dev/null
+++ b/plugins/catalog-common/src/client.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2024 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.
+ */
+
+export * from './generated';
diff --git a/packages/catalog-client/src/generated/apis/DefaultApi.client.ts b/plugins/catalog-common/src/generated/apis/DefaultApi.client.ts
similarity index 100%
rename from packages/catalog-client/src/generated/apis/DefaultApi.client.ts
rename to plugins/catalog-common/src/generated/apis/DefaultApi.client.ts
diff --git a/packages/catalog-client/src/generated/apis/index.ts b/plugins/catalog-common/src/generated/apis/index.ts
similarity index 100%
rename from packages/catalog-client/src/generated/apis/index.ts
rename to plugins/catalog-common/src/generated/apis/index.ts
diff --git a/packages/catalog-client/src/generated/index.ts b/plugins/catalog-common/src/generated/index.ts
similarity index 100%
rename from packages/catalog-client/src/generated/index.ts
rename to plugins/catalog-common/src/generated/index.ts
diff --git a/packages/catalog-client/src/generated/models/AnalyzeLocationEntityField.model.ts b/plugins/catalog-common/src/generated/models/AnalyzeLocationEntityField.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/AnalyzeLocationEntityField.model.ts
rename to plugins/catalog-common/src/generated/models/AnalyzeLocationEntityField.model.ts
diff --git a/packages/catalog-client/src/generated/models/AnalyzeLocationExistingEntity.model.ts b/plugins/catalog-common/src/generated/models/AnalyzeLocationExistingEntity.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/AnalyzeLocationExistingEntity.model.ts
rename to plugins/catalog-common/src/generated/models/AnalyzeLocationExistingEntity.model.ts
diff --git a/packages/catalog-client/src/generated/models/AnalyzeLocationGenerateEntity.model.ts b/plugins/catalog-common/src/generated/models/AnalyzeLocationGenerateEntity.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/AnalyzeLocationGenerateEntity.model.ts
rename to plugins/catalog-common/src/generated/models/AnalyzeLocationGenerateEntity.model.ts
diff --git a/packages/catalog-client/src/generated/models/AnalyzeLocationRequest.model.ts b/plugins/catalog-common/src/generated/models/AnalyzeLocationRequest.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/AnalyzeLocationRequest.model.ts
rename to plugins/catalog-common/src/generated/models/AnalyzeLocationRequest.model.ts
diff --git a/packages/catalog-client/src/generated/models/AnalyzeLocationResponse.model.ts b/plugins/catalog-common/src/generated/models/AnalyzeLocationResponse.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/AnalyzeLocationResponse.model.ts
rename to plugins/catalog-common/src/generated/models/AnalyzeLocationResponse.model.ts
diff --git a/packages/catalog-client/src/generated/models/CreateLocation201Response.model.ts b/plugins/catalog-common/src/generated/models/CreateLocation201Response.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/CreateLocation201Response.model.ts
rename to plugins/catalog-common/src/generated/models/CreateLocation201Response.model.ts
diff --git a/packages/catalog-client/src/generated/models/CreateLocationRequest.model.ts b/plugins/catalog-common/src/generated/models/CreateLocationRequest.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/CreateLocationRequest.model.ts
rename to plugins/catalog-common/src/generated/models/CreateLocationRequest.model.ts
diff --git a/packages/catalog-client/src/generated/models/EntitiesBatchResponse.model.ts b/plugins/catalog-common/src/generated/models/EntitiesBatchResponse.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/EntitiesBatchResponse.model.ts
rename to plugins/catalog-common/src/generated/models/EntitiesBatchResponse.model.ts
diff --git a/packages/catalog-client/src/generated/models/EntitiesQueryResponse.model.ts b/plugins/catalog-common/src/generated/models/EntitiesQueryResponse.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/EntitiesQueryResponse.model.ts
rename to plugins/catalog-common/src/generated/models/EntitiesQueryResponse.model.ts
diff --git a/packages/catalog-client/src/generated/models/EntitiesQueryResponsePageInfo.model.ts b/plugins/catalog-common/src/generated/models/EntitiesQueryResponsePageInfo.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/EntitiesQueryResponsePageInfo.model.ts
rename to plugins/catalog-common/src/generated/models/EntitiesQueryResponsePageInfo.model.ts
diff --git a/packages/catalog-client/src/generated/models/Entity.model.ts b/plugins/catalog-common/src/generated/models/Entity.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/Entity.model.ts
rename to plugins/catalog-common/src/generated/models/Entity.model.ts
diff --git a/packages/catalog-client/src/generated/models/EntityAncestryResponse.model.ts b/plugins/catalog-common/src/generated/models/EntityAncestryResponse.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/EntityAncestryResponse.model.ts
rename to plugins/catalog-common/src/generated/models/EntityAncestryResponse.model.ts
diff --git a/packages/catalog-client/src/generated/models/EntityAncestryResponseItemsInner.model.ts b/plugins/catalog-common/src/generated/models/EntityAncestryResponseItemsInner.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/EntityAncestryResponseItemsInner.model.ts
rename to plugins/catalog-common/src/generated/models/EntityAncestryResponseItemsInner.model.ts
diff --git a/packages/catalog-client/src/generated/models/EntityFacet.model.ts b/plugins/catalog-common/src/generated/models/EntityFacet.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/EntityFacet.model.ts
rename to plugins/catalog-common/src/generated/models/EntityFacet.model.ts
diff --git a/packages/catalog-client/src/generated/models/EntityFacetsResponse.model.ts b/plugins/catalog-common/src/generated/models/EntityFacetsResponse.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/EntityFacetsResponse.model.ts
rename to plugins/catalog-common/src/generated/models/EntityFacetsResponse.model.ts
diff --git a/packages/catalog-client/src/generated/models/EntityLink.model.ts b/plugins/catalog-common/src/generated/models/EntityLink.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/EntityLink.model.ts
rename to plugins/catalog-common/src/generated/models/EntityLink.model.ts
diff --git a/packages/catalog-client/src/generated/models/EntityMeta.model.ts b/plugins/catalog-common/src/generated/models/EntityMeta.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/EntityMeta.model.ts
rename to plugins/catalog-common/src/generated/models/EntityMeta.model.ts
diff --git a/packages/catalog-client/src/generated/models/EntityRelation.model.ts b/plugins/catalog-common/src/generated/models/EntityRelation.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/EntityRelation.model.ts
rename to plugins/catalog-common/src/generated/models/EntityRelation.model.ts
diff --git a/packages/catalog-client/src/generated/models/ErrorError.model.ts b/plugins/catalog-common/src/generated/models/ErrorError.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/ErrorError.model.ts
rename to plugins/catalog-common/src/generated/models/ErrorError.model.ts
diff --git a/packages/catalog-client/src/generated/models/ErrorRequest.model.ts b/plugins/catalog-common/src/generated/models/ErrorRequest.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/ErrorRequest.model.ts
rename to plugins/catalog-common/src/generated/models/ErrorRequest.model.ts
diff --git a/packages/catalog-client/src/generated/models/ErrorResponse.model.ts b/plugins/catalog-common/src/generated/models/ErrorResponse.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/ErrorResponse.model.ts
rename to plugins/catalog-common/src/generated/models/ErrorResponse.model.ts
diff --git a/packages/catalog-client/src/generated/models/GetEntitiesByRefsRequest.model.ts b/plugins/catalog-common/src/generated/models/GetEntitiesByRefsRequest.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/GetEntitiesByRefsRequest.model.ts
rename to plugins/catalog-common/src/generated/models/GetEntitiesByRefsRequest.model.ts
diff --git a/packages/catalog-client/src/generated/models/GetLocations200ResponseInner.model.ts b/plugins/catalog-common/src/generated/models/GetLocations200ResponseInner.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/GetLocations200ResponseInner.model.ts
rename to plugins/catalog-common/src/generated/models/GetLocations200ResponseInner.model.ts
diff --git a/packages/catalog-client/src/generated/models/Location.model.ts b/plugins/catalog-common/src/generated/models/Location.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/Location.model.ts
rename to plugins/catalog-common/src/generated/models/Location.model.ts
diff --git a/packages/catalog-client/src/generated/models/LocationInput.model.ts b/plugins/catalog-common/src/generated/models/LocationInput.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/LocationInput.model.ts
rename to plugins/catalog-common/src/generated/models/LocationInput.model.ts
diff --git a/packages/catalog-client/src/generated/models/LocationSpec.model.ts b/plugins/catalog-common/src/generated/models/LocationSpec.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/LocationSpec.model.ts
rename to plugins/catalog-common/src/generated/models/LocationSpec.model.ts
diff --git a/packages/catalog-client/src/generated/models/ModelError.model.ts b/plugins/catalog-common/src/generated/models/ModelError.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/ModelError.model.ts
rename to plugins/catalog-common/src/generated/models/ModelError.model.ts
diff --git a/packages/catalog-client/src/generated/models/NullableEntity.model.ts b/plugins/catalog-common/src/generated/models/NullableEntity.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/NullableEntity.model.ts
rename to plugins/catalog-common/src/generated/models/NullableEntity.model.ts
diff --git a/packages/catalog-client/src/generated/models/RecursivePartialEntity.model.ts b/plugins/catalog-common/src/generated/models/RecursivePartialEntity.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/RecursivePartialEntity.model.ts
rename to plugins/catalog-common/src/generated/models/RecursivePartialEntity.model.ts
diff --git a/packages/catalog-client/src/generated/models/RecursivePartialEntityMeta.model.ts b/plugins/catalog-common/src/generated/models/RecursivePartialEntityMeta.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/RecursivePartialEntityMeta.model.ts
rename to plugins/catalog-common/src/generated/models/RecursivePartialEntityMeta.model.ts
diff --git a/packages/catalog-client/src/generated/models/RecursivePartialEntityMetaAllOf.model.ts b/plugins/catalog-common/src/generated/models/RecursivePartialEntityMetaAllOf.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/RecursivePartialEntityMetaAllOf.model.ts
rename to plugins/catalog-common/src/generated/models/RecursivePartialEntityMetaAllOf.model.ts
diff --git a/packages/catalog-client/src/generated/models/RecursivePartialEntityRelation.model.ts b/plugins/catalog-common/src/generated/models/RecursivePartialEntityRelation.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/RecursivePartialEntityRelation.model.ts
rename to plugins/catalog-common/src/generated/models/RecursivePartialEntityRelation.model.ts
diff --git a/packages/catalog-client/src/generated/models/RefreshEntityRequest.model.ts b/plugins/catalog-common/src/generated/models/RefreshEntityRequest.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/RefreshEntityRequest.model.ts
rename to plugins/catalog-common/src/generated/models/RefreshEntityRequest.model.ts
diff --git a/packages/catalog-client/src/generated/models/ValidateEntity400Response.model.ts b/plugins/catalog-common/src/generated/models/ValidateEntity400Response.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/ValidateEntity400Response.model.ts
rename to plugins/catalog-common/src/generated/models/ValidateEntity400Response.model.ts
diff --git a/packages/catalog-client/src/generated/models/ValidateEntity400ResponseErrorsInner.model.ts b/plugins/catalog-common/src/generated/models/ValidateEntity400ResponseErrorsInner.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/ValidateEntity400ResponseErrorsInner.model.ts
rename to plugins/catalog-common/src/generated/models/ValidateEntity400ResponseErrorsInner.model.ts
diff --git a/packages/catalog-client/src/generated/models/ValidateEntityRequest.model.ts b/plugins/catalog-common/src/generated/models/ValidateEntityRequest.model.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/ValidateEntityRequest.model.ts
rename to plugins/catalog-common/src/generated/models/ValidateEntityRequest.model.ts
diff --git a/packages/catalog-client/src/generated/models/index.ts b/plugins/catalog-common/src/generated/models/index.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/index.ts
rename to plugins/catalog-common/src/generated/models/index.ts
diff --git a/packages/catalog-client/src/generated/pluginId.ts b/plugins/catalog-common/src/generated/pluginId.ts
similarity index 100%
rename from packages/catalog-client/src/generated/pluginId.ts
rename to plugins/catalog-common/src/generated/pluginId.ts
diff --git a/packages/catalog-client/src/generated/types/discovery.ts b/plugins/catalog-common/src/generated/types/discovery.ts
similarity index 100%
rename from packages/catalog-client/src/generated/types/discovery.ts
rename to plugins/catalog-common/src/generated/types/discovery.ts
diff --git a/packages/catalog-client/src/generated/types/fetch.ts b/plugins/catalog-common/src/generated/types/fetch.ts
similarity index 100%
rename from packages/catalog-client/src/generated/types/fetch.ts
rename to plugins/catalog-common/src/generated/types/fetch.ts
diff --git a/yarn.lock b/yarn.lock
index 40eadc3977..1ad8ac75b0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3860,6 +3860,7 @@ __metadata:
     "@backstage/catalog-model": "workspace:^"
     "@backstage/cli": "workspace:^"
     "@backstage/errors": "workspace:^"
+    "@backstage/plugin-catalog-common": "workspace:^"
     cross-fetch: ^4.0.0
     msw: ^1.0.0
     uri-template: ^2.0.0
@@ -6070,6 +6071,8 @@ __metadata:
     "@backstage/cli": "workspace:^"
     "@backstage/plugin-permission-common": "workspace:^"
     "@backstage/plugin-search-common": "workspace:^"
+    cross-fetch: ^4.0.0
+    uri-template: ^2.0.0
   languageName: unknown
   linkType: soft