diff --git a/.changeset/big-tips-heal.md b/.changeset/big-tips-heal.md
new file mode 100644
index 0000000000..a223cda256
--- /dev/null
+++ b/.changeset/big-tips-heal.md
@@ -0,0 +1,5 @@
+---
+'@backstage/catalog-client': minor
+---
+
+Internal update to use the updated generated code from `backstage-cli package schema openapi generate --client-package ...`.
diff --git a/.changeset/fresh-jeans-relate.md b/.changeset/fresh-jeans-relate.md
new file mode 100644
index 0000000000..a8f6ad8e0b
--- /dev/null
+++ b/.changeset/fresh-jeans-relate.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': minor
+---
+
+**BREAKING**: Updates ESLint config to ignore all generated source code under `src/**/generated/**/*.ts`.
diff --git a/.changeset/healthy-tables-wonder.md b/.changeset/healthy-tables-wonder.md
new file mode 100644
index 0000000000..be6da63de0
--- /dev/null
+++ b/.changeset/healthy-tables-wonder.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-catalog-backend': minor
+'@backstage/plugin-search-backend': minor
+---
+
+Internal update to use the new generated server types from `backstage-cli package schema openapi generate --server`.
diff --git a/.changeset/silver-ears-grin.md b/.changeset/silver-ears-grin.md
new file mode 100644
index 0000000000..104c18719e
--- /dev/null
+++ b/.changeset/silver-ears-grin.md
@@ -0,0 +1,5 @@
+---
+'@backstage/repo-tools': minor
+---
+
+`backstage-repo-tools package schema openapi generate --server` now generates complete TS interfaces for all request/response objects in your OpenAPI schema. This fixes an edge case around recursive schemas and standardizes both the generated client and server to have similar generated types.
diff --git a/.changeset/ten-pears-unite.md b/.changeset/ten-pears-unite.md
new file mode 100644
index 0000000000..75f7e2cc22
--- /dev/null
+++ b/.changeset/ten-pears-unite.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-openapi-utils': minor
+---
+
+Adds a new `createValidatedOpenApiRouterFromGeneratedEndpointMap` function that uses the new static server generation in `backstage-cli package schema openapi generate --server` to create a typed express router.
diff --git a/docs/openapi/01-getting-started.md b/docs/openapi/01-getting-started.md
index 156df9bd17..ce14cf6a7f 100644
--- a/docs/openapi/01-getting-started.md
+++ b/docs/openapi/01-getting-started.md
@@ -35,10 +35,10 @@ There are two required npm packages before we start,
 1. `@backstage/repo-tools`, this package contains all OpenAPI-related commands for your plugins. We will be using this throughout the tutorial.
 2. `@useoptic/optic`, this package is a dependency of `@backstage/repo-tools` but is only required for OpenAPI-related commands.
 
-Further, for generating the client a `java` binary has to be available on your PATH.
-
 You should install both of the above packages in the _root_ of your workspace.
 
+Further, a `java` binary has to be available on your PATH.
+
 ## Storing your OpenAPI specification
 
 You should create a new folder, `src/schema` in your backend plugin to store your OpenAPI (and any other) specifications. For example, if you're adding a specification to the catalog plugin, you would add a `src/schema` folder to `plugins/catalog-backend`, making a `plugins/catalog-backend/src/schema` directory. This directory should have an `openapi.yaml` file inside.
@@ -47,12 +47,14 @@ You should create a new folder, `src/schema` in your backend plugin to store you
 
 ## Generating a typed express router from a spec
 
-Run `yarn backstage-repo-tools package schema openapi generate --server` from the directory with your plugin. This will create an `openapi.generated.ts` file in the `src/schema` directory that contains the OpenAPI schema as well as a generated express router with types. You should add this command to your `package.json` for future use, and you can combine both the server generation and the client generation below, like so, `yarn backstage-repo-tools package schema openapi generate --server --client-package <clientPackageDirectory>`
+Run `yarn backstage-repo-tools package schema openapi generate --server` from the directory with your plugin. This will create a `router.ts` file in the `src/schema/openapi/generated` directory that contains the OpenAPI schema as well as a factory function for a generated express router with types that match your schema.
+
+You should add this command to your `package.json` for future use and you can combine both the server generation and the client generation below like so, `yarn backstage-repo-tools package schema openapi generate --server --client-package <clientPackageDirectory>`
 
 Use it like so, update your `router.ts` or `createRouter.ts` file with the following content,
 
 ```diff
-+ import { createOpenApiRouter } from '../schema/openapi.generated';
++ import { createOpenApiRouter } from '../schema/openapi';
 - import Router from 'express-promise-router';
 
 ...
@@ -65,12 +67,12 @@ export async function createRouter(
 
 ## Generating a typed client from a spec
 
-From your current backend plugin directory, run `yarn backstage-repo-tools package schema openapi generate --client-package <plugin-client-directory>`. `<plugin-client-directory>` is a new directory and npm package that you should create. The general pattern is `plugins/<plugin-name>-client` or if you want to co-locate this with your other shared types, use `plugins/<plugin-name>-common`. You should add this command to your `package.json` for future use.
+From your current backend plugin directory, run `yarn backstage-repo-tools package schema openapi generate --client-package <plugin-client-directory>`. `<plugin-client-directory>` is a new directory and npm package that you should create. The general pattern is to add a new entry point to your plugin's common package, `plugins/<plugin-name>-common/client`. You should add this command to your `package.json` for future use.
 
-The generated client will have a directory `src/generated` that exports a `DefaultApiClient` class and all generated types. You can use the client like so,
+The generated client will have a directory `src/schema/openapi/generated` that exports a `DefaultApiClient` class and all generated types. You can use the client like so,
 
 ```diff
-+ import { DefaultApiClient } from './generated';
++ import { DefaultApiClient } from '../schema/openapi/generated';
 
 export class CatalogClient implements CatalogApi {
 + private readonly apiClient: DefaultApiClient;
diff --git a/docs/openapi/generate-client.md b/docs/openapi/generate-client.md
index b8acc331e5..29756dcad2 100644
--- a/docs/openapi/generate-client.md
+++ b/docs/openapi/generate-client.md
@@ -20,9 +20,7 @@ info:
 
 ### Generating your client
 
-1. Run `yarn backstage-repo-tools package schema openapi generate client --client-package <directory>`. This will create a new folder in `<directory>/src/generated` to house the generated content.
-2. You should use the generated files as follows,
-
-- `apis/DefaultApi.client.ts` - this is the client that you should use. It has types for all of the various operations on your API.
-- `models/*` - These are the types generated from your OpenAPI file, ideally you should not need to use these directly and can instead use the inferred types from `apis/DefaultApi.client.ts`.
-- everything else is directory specific and shouldn't be touched.
+1. Run `yarn backstage-repo-tools package schema openapi generate --client-package <directory>`. This will create a new folder in `<directory>/src/schema/openapi/generated` to house the generated content.
+2. You should not need to import anything from subfolders of the `src/schema/openapi/generated` parent folder, everything you should require will be accessible from the `src/schema/openapi/generated/index.ts` file. Of note,
+3. `DefaultApiClient` - this is the client that you can use to access your specific spec.
+4. Any request or response types - these will be available from the index and should match the names in your spec.
diff --git a/packages/backend-openapi-utils/report.api.md b/packages/backend-openapi-utils/report.api.md
index 2f660cd0d6..399705a9e4 100644
--- a/packages/backend-openapi-utils/report.api.md
+++ b/packages/backend-openapi-utils/report.api.md
@@ -102,12 +102,45 @@ export function createValidatedOpenApiRouter<T extends RequiredDoc>(
   },
 ): ApiRouter<T>;
 
+// @public
+export function createValidatedOpenApiRouterFromGeneratedEndpointMap<
+  T extends EndpointMap,
+>(
+  spec: RequiredDoc,
+  options?: {
+    validatorOptions?: Partial<Parameters<typeof middleware>['0']>;
+    middleware?: RequestHandler[];
+  },
+): TypedRouter<T>;
+
 // @public (undocumented)
 type DiscriminateUnion<T, K extends keyof T, V extends T[K]> = Extract<
   T,
   Record<K, V>
 >;
 
+// @public (undocumented)
+type DocEndpoint<Doc extends EndpointMap> = ValueOf<{
+  [Template in keyof Doc]: Template extends `#${string}|${infer Endpoint}`
+    ? Endpoint
+    : never;
+}>;
+
+// @public (undocumented)
+type DocEndpointMethod<
+  Doc extends EndpointMap,
+  Endpoint extends DocEndpoint<Doc>,
+> = ValueOf<{
+  [Template in keyof Doc]: Template extends `#${infer Method}|${Endpoint}`
+    ? Method
+    : never;
+}>;
+
+// @public (undocumented)
+type DocEndpointTemplate<Doc extends EndpointMap> = PathTemplate<
+  DocEndpoint<Doc>
+>;
+
 // @public (undocumented)
 type DocOperation<
   Doc extends RequiredDoc,
@@ -239,6 +272,85 @@ interface DocRequestMatcher<
   ): T;
 }
 
+// @public (undocumented)
+type EndpointMap = Record<
+  string,
+  {
+    query?: object;
+    body?: object;
+    response?: object | void;
+    path?: object;
+  }
+>;
+
+// @public
+type EndpointMapRequestHandler<
+  Doc extends EndpointMap,
+  Path extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Path>,
+> = core.RequestHandler<
+  StaticPathParamsSchema<Doc, Path, Method>,
+  StaticResponseSchema<Doc, Path, Method>,
+  StaticRequestBodySchema<Doc, Path, Method>,
+  StaticQueryParamsSchema<Doc, Path, Method>,
+  Record<string, string>
+>;
+
+// @public
+type EndpointMapRequestHandlerParams<
+  Doc extends EndpointMap,
+  Path extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Path>,
+> = core.RequestHandlerParams<
+  StaticPathParamsSchema<Doc, Path, Method>,
+  StaticResponseSchema<Doc, Path, Method>,
+  StaticRequestBodySchema<Doc, Path, Method>,
+  StaticQueryParamsSchema<Doc, Path, Method>,
+  Record<string, string>
+>;
+
+// @public
+interface EndpointMapRequestMatcher<
+  Doc extends EndpointMap,
+  T,
+  Method extends HttpMethods,
+> {
+  // (undocumented)
+  <
+    TPath extends MethodAwareDocEndpoints<
+      Doc,
+      DocEndpoint<Doc>,
+      Method & DocEndpointMethod<Doc, DocEndpoint<Doc>>
+    >,
+    TMethod extends Method &
+      DocEndpointMethod<Doc, TemplateToDocEndpoint<Doc, TPath>>,
+  >(
+    path: TPath,
+    ...handlers: Array<
+      EndpointMapRequestHandler<Doc, TemplateToDocEndpoint<Doc, TPath>, TMethod>
+    >
+  ): T;
+  // (undocumented)
+  <
+    TPath extends MethodAwareDocEndpoints<
+      Doc,
+      DocEndpoint<Doc>,
+      Method & DocEndpointMethod<Doc, DocEndpoint<Doc>>
+    >,
+    TMethod extends Method &
+      DocEndpointMethod<Doc, TemplateToDocEndpoint<Doc, TPath>>,
+  >(
+    path: TPath,
+    ...handlers: Array<
+      EndpointMapRequestHandlerParams<
+        Doc,
+        TemplateToDocEndpoint<Doc, TPath>,
+        TMethod
+      >
+    >
+  ): T;
+}
+
 // @public (undocumented)
 type Filter<T, U> = T extends U ? T : never;
 
@@ -278,6 +390,9 @@ type HeaderSchema<
   Method extends DocPathMethod<Doc, Path>,
 > = ParametersSchema<Doc, Path, Method, ImmutableHeaderObject>;
 
+// @public (undocumented)
+type HttpMethods = 'all' | 'put' | 'get' | 'post' | '_delete';
+
 // @public
 type Immutable<T> = T extends
   | Function
@@ -401,6 +516,21 @@ declare namespace internal {
     Response_3 as Response,
     ResponseSchemas,
     ResponseBodyToJsonSchema,
+    EndpointMap,
+    HttpMethods,
+    StaticPathParamsSchema,
+    StaticRequestBodySchema,
+    StaticResponseSchema,
+    StaticQueryParamsSchema,
+    EndpointMapRequestHandler,
+    EndpointMapRequestHandlerParams,
+    DocEndpoint,
+    DocEndpointMethod,
+    MethodAwareDocEndpoints,
+    DocEndpointTemplate,
+    TemplateToDocEndpoint,
+    EndpointMapRequestMatcher,
+    TypedRouter,
   };
 }
 export { internal };
@@ -427,6 +557,19 @@ type MapToSchema<
     : never;
 };
 
+// @public (undocumented)
+type MethodAwareDocEndpoints<
+  Doc extends EndpointMap,
+  Endpoint extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Endpoint>,
+> = ValueOf<{
+  [Template in keyof Doc]: Template extends `#${Method}|${infer E}`
+    ? E extends DocEndpoint<Doc>
+      ? PathTemplate<E>
+      : never
+    : never;
+}>;
+
 // @public (undocumented)
 type MethodAwareDocPath<
   Doc extends PathDoc,
@@ -513,7 +656,7 @@ type PathSchema<
 > = ParametersSchema<Doc, Path, Method, ImmutablePathObject>;
 
 // @public
-type PathTemplate<Path extends string> =
+export type PathTemplate<Path extends string> =
   Path extends `${infer Prefix}{${infer PathName}}${infer Suffix}`
     ? `${Prefix}:${PathName}${PathTemplate<Suffix>}`
     : Path;
@@ -684,6 +827,60 @@ type SchemaRef<Doc extends RequiredDoc, Schema> = Schema extends {
       [Key in keyof Schema]: SchemaRef<Doc, Schema[Key]>;
     };
 
+// @public (undocumented)
+type StaticPathParamsSchema<
+  Doc extends EndpointMap,
+  Endpoint extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Endpoint>,
+> = `#${Method}|${Endpoint}` extends keyof Doc
+  ? 'path' extends keyof Doc[`#${Method}|${Endpoint}`]
+    ? Doc[`#${Method}|${Endpoint}`]['path']
+    : never
+  : never;
+
+// @public (undocumented)
+type StaticQueryParamsSchema<
+  Doc extends EndpointMap,
+  Endpoint extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Endpoint>,
+> = `#${Method}|${Endpoint}` extends keyof Doc
+  ? 'query' extends keyof Doc[`#${Method}|${Endpoint}`]
+    ? Doc[`#${Method}|${Endpoint}`]['query']
+    : never
+  : never;
+
+// @public (undocumented)
+type StaticRequestBodySchema<
+  Doc extends EndpointMap,
+  Endpoint extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Endpoint>,
+> = `#${Method}|${Endpoint}` extends keyof Doc
+  ? 'body' extends keyof Doc[`#${Method}|${Endpoint}`]
+    ? Doc[`#${Method}|${Endpoint}`]['body']
+    : unknown
+  : unknown;
+
+// @public (undocumented)
+type StaticResponseSchema<
+  Doc extends EndpointMap,
+  Endpoint extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Endpoint>,
+> = `#${Method}|${Endpoint}` extends keyof Doc
+  ? 'response' extends keyof Doc[`#${Method}|${Endpoint}`]
+    ? Doc[`#${Method}|${Endpoint}`]['response']
+    : unknown
+  : unknown;
+
+// @public (undocumented)
+type TemplateToDocEndpoint<
+  Doc extends EndpointMap,
+  Path extends DocEndpointTemplate<Doc>,
+> = ValueOf<{
+  [Template in DocEndpoint<Doc>]: Path extends PathTemplate<Template>
+    ? Template
+    : never;
+}>;
+
 // @public
 type TemplateToDocPath<
   Doc extends PathDoc,
@@ -704,6 +901,18 @@ type TuplifyUnion<
   N = [T] extends [never] ? true : false,
 > = true extends N ? [] : Push<TuplifyUnion<Exclude<T, L>>, L>;
 
+// @public (undocumented)
+interface TypedRouter<GeneratedEndpointMap extends EndpointMap> extends Router {
+  // (undocumented)
+  delete: EndpointMapRequestMatcher<GeneratedEndpointMap, this, '_delete'>;
+  // (undocumented)
+  get: EndpointMapRequestMatcher<GeneratedEndpointMap, this, 'get'>;
+  // (undocumented)
+  post: EndpointMapRequestMatcher<GeneratedEndpointMap, this, 'post'>;
+  // (undocumented)
+  put: EndpointMapRequestMatcher<GeneratedEndpointMap, this, 'put'>;
+}
+
 // @public
 type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
   k: infer I,
diff --git a/packages/backend-openapi-utils/src/index.ts b/packages/backend-openapi-utils/src/index.ts
index 57d9f755c2..a66894d473 100644
--- a/packages/backend-openapi-utils/src/index.ts
+++ b/packages/backend-openapi-utils/src/index.ts
@@ -31,5 +31,10 @@ export type {
   PathParameters,
 } from './utility';
 export type { ApiRouter } from './router';
-export { createValidatedOpenApiRouter, getOpenApiSpecRoute } from './stub';
+export type { PathTemplate } from './types/common';
 export { wrapInOpenApiTestServer, wrapServer } from './testUtils';
+export {
+  createValidatedOpenApiRouter,
+  getOpenApiSpecRoute,
+  createValidatedOpenApiRouterFromGeneratedEndpointMap,
+} from './stub';
diff --git a/packages/backend-openapi-utils/src/stub.ts b/packages/backend-openapi-utils/src/stub.ts
index 0f62bf348c..615c32cb31 100644
--- a/packages/backend-openapi-utils/src/stub.ts
+++ b/packages/backend-openapi-utils/src/stub.ts
@@ -16,7 +16,7 @@
 
 import PromiseRouter from 'express-promise-router';
 import { ApiRouter } from './router';
-import { RequiredDoc } from './types';
+import { EndpointMap, RequiredDoc, TypedRouter } from './types';
 import {
   ErrorRequestHandler,
   RequestHandler,
@@ -24,6 +24,7 @@ import {
   Request,
   Response,
   json,
+  Router,
 } from 'express';
 import { InputError } from '@backstage/errors';
 import { middleware as OpenApiValidator } from 'express-openapi-validator';
@@ -58,19 +59,19 @@ export function getOpenApiSpecRoute(baseUrl: string) {
 }
 
 /**
- * Create a new OpenAPI router with some default middleware.
+ * Create a router with validation middleware. This is used by typing methods to create an
+ *  "OpenAPI router" with all of the expected validation + metadata.
  * @param spec - Your OpenAPI spec imported as a JSON object.
  * @param validatorOptions - `openapi-express-validator` options to override the defaults.
  * @returns A new express router with validation middleware.
- * @public
  */
-export function createValidatedOpenApiRouter<T extends RequiredDoc>(
-  spec: T,
+function createRouterWithValidation(
+  spec: RequiredDoc,
   options?: {
     validatorOptions?: Partial<Parameters<typeof OpenApiValidator>['0']>;
     middleware?: RequestHandler[];
   },
-) {
+): Router {
   const router = PromiseRouter();
   router.use(options?.middleware || getDefaultRouterMiddleware());
 
@@ -152,6 +153,41 @@ export function createValidatedOpenApiRouter<T extends RequiredDoc>(
     }
     res.json(mergeOutput.output);
   });
-
-  return router as ApiRouter<typeof spec>;
+  return router;
+}
+
+/**
+ * Create a new OpenAPI router with some default middleware.
+ * @param spec - Your OpenAPI spec imported as a JSON object.
+ * @param validatorOptions - `openapi-express-validator` options to override the defaults.
+ * @returns A new express router with validation middleware.
+ * @public
+ */
+export function createValidatedOpenApiRouter<T extends RequiredDoc>(
+  spec: T,
+  options?: {
+    validatorOptions?: Partial<Parameters<typeof OpenApiValidator>['0']>;
+    middleware?: RequestHandler[];
+  },
+) {
+  return createRouterWithValidation(spec, options) as ApiRouter<typeof spec>;
+}
+
+/**
+ * Create a new OpenAPI router with some default middleware.
+ * @param spec - Your OpenAPI spec imported as a JSON object.
+ * @param validatorOptions - `openapi-express-validator` options to override the defaults.
+ * @returns A new express router with validation middleware.
+ * @public
+ */
+export function createValidatedOpenApiRouterFromGeneratedEndpointMap<
+  T extends EndpointMap,
+>(
+  spec: RequiredDoc,
+  options?: {
+    validatorOptions?: Partial<Parameters<typeof OpenApiValidator>['0']>;
+    middleware?: RequestHandler[];
+  },
+) {
+  return createRouterWithValidation(spec, options) as TypedRouter<T>;
 }
diff --git a/packages/backend-openapi-utils/src/types/generated.ts b/packages/backend-openapi-utils/src/types/generated.ts
new file mode 100644
index 0000000000..b0b80f45fb
--- /dev/null
+++ b/packages/backend-openapi-utils/src/types/generated.ts
@@ -0,0 +1,222 @@
+/*
+ * 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.
+ */
+import { Router } from 'express';
+import type core from 'express-serve-static-core';
+import { PathTemplate, ValueOf } from './common';
+
+/**
+ * @public
+ */
+export type EndpointMap = Record<
+  string,
+  { query?: object; body?: object; response?: object | void; path?: object }
+>;
+
+// OpenAPI generator doesn't emit regular lowercase 'delete'.
+/**
+ * @public
+ */
+export type HttpMethods = 'all' | 'put' | 'get' | 'post' | '_delete';
+
+/**
+ * @public
+ */
+export type StaticPathParamsSchema<
+  Doc extends EndpointMap,
+  Endpoint extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Endpoint>,
+> = `#${Method}|${Endpoint}` extends keyof Doc
+  ? 'path' extends keyof Doc[`#${Method}|${Endpoint}`]
+    ? Doc[`#${Method}|${Endpoint}`]['path']
+    : never
+  : never;
+/**
+ * @public
+ */
+export type StaticRequestBodySchema<
+  Doc extends EndpointMap,
+  Endpoint extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Endpoint>,
+> = `#${Method}|${Endpoint}` extends keyof Doc
+  ? 'body' extends keyof Doc[`#${Method}|${Endpoint}`]
+    ? Doc[`#${Method}|${Endpoint}`]['body']
+    : unknown
+  : unknown;
+/**
+ * @public
+ */
+export type StaticResponseSchema<
+  Doc extends EndpointMap,
+  Endpoint extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Endpoint>,
+> = `#${Method}|${Endpoint}` extends keyof Doc
+  ? 'response' extends keyof Doc[`#${Method}|${Endpoint}`]
+    ? Doc[`#${Method}|${Endpoint}`]['response']
+    : unknown
+  : unknown;
+/**
+ * @public
+ */
+export type StaticQueryParamsSchema<
+  Doc extends EndpointMap,
+  Endpoint extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Endpoint>,
+> = `#${Method}|${Endpoint}` extends keyof Doc
+  ? 'query' extends keyof Doc[`#${Method}|${Endpoint}`]
+    ? Doc[`#${Method}|${Endpoint}`]['query']
+    : never
+  : never;
+
+/**
+ * Typed express request handler.
+ * @public
+ */
+export type EndpointMapRequestHandler<
+  Doc extends EndpointMap,
+  Path extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Path>,
+> = core.RequestHandler<
+  StaticPathParamsSchema<Doc, Path, Method>,
+  StaticResponseSchema<Doc, Path, Method>,
+  StaticRequestBodySchema<Doc, Path, Method>,
+  StaticQueryParamsSchema<Doc, Path, Method>,
+  Record<string, string>
+>;
+
+/**
+ * Typed express error handler / request handler union type.
+ * @public
+ */
+export type EndpointMapRequestHandlerParams<
+  Doc extends EndpointMap,
+  Path extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Path>,
+> = core.RequestHandlerParams<
+  StaticPathParamsSchema<Doc, Path, Method>,
+  StaticResponseSchema<Doc, Path, Method>,
+  StaticRequestBodySchema<Doc, Path, Method>,
+  StaticQueryParamsSchema<Doc, Path, Method>,
+  Record<string, string>
+>;
+
+/**
+ * @public
+ */
+export type DocEndpoint<Doc extends EndpointMap> = ValueOf<{
+  [Template in keyof Doc]: Template extends `#${string}|${infer Endpoint}`
+    ? Endpoint
+    : never;
+}>;
+
+/**
+ * @public
+ */
+export type DocEndpointMethod<
+  Doc extends EndpointMap,
+  Endpoint extends DocEndpoint<Doc>,
+> = ValueOf<{
+  [Template in keyof Doc]: Template extends `#${infer Method}|${Endpoint}`
+    ? Method
+    : never;
+}>;
+
+/**
+ * @public
+ */
+export type MethodAwareDocEndpoints<
+  Doc extends EndpointMap,
+  Endpoint extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Endpoint>,
+> = ValueOf<{
+  [Template in keyof Doc]: Template extends `#${Method}|${infer E}`
+    ? E extends DocEndpoint<Doc>
+      ? PathTemplate<E>
+      : never
+    : never;
+}>;
+
+/**
+ * @public
+ */
+export type DocEndpointTemplate<Doc extends EndpointMap> = PathTemplate<
+  DocEndpoint<Doc>
+>;
+
+/**
+ * @public
+ */
+export type TemplateToDocEndpoint<
+  Doc extends EndpointMap,
+  Path extends DocEndpointTemplate<Doc>,
+> = ValueOf<{
+  [Template in DocEndpoint<Doc>]: Path extends PathTemplate<Template>
+    ? Template
+    : never;
+}>;
+
+/**
+ * Superset of the express router path matcher that enforces typed request and response bodies.
+ * @public
+ */
+export interface EndpointMapRequestMatcher<
+  Doc extends EndpointMap,
+  T,
+  Method extends HttpMethods,
+> {
+  <
+    TPath extends MethodAwareDocEndpoints<
+      Doc,
+      DocEndpoint<Doc>,
+      Method & DocEndpointMethod<Doc, DocEndpoint<Doc>>
+    >,
+    TMethod extends Method &
+      DocEndpointMethod<Doc, TemplateToDocEndpoint<Doc, TPath>>,
+  >(
+    path: TPath,
+    ...handlers: Array<
+      EndpointMapRequestHandler<Doc, TemplateToDocEndpoint<Doc, TPath>, TMethod>
+    >
+  ): T;
+  <
+    TPath extends MethodAwareDocEndpoints<
+      Doc,
+      DocEndpoint<Doc>,
+      Method & DocEndpointMethod<Doc, DocEndpoint<Doc>>
+    >,
+    TMethod extends Method &
+      DocEndpointMethod<Doc, TemplateToDocEndpoint<Doc, TPath>>,
+  >(
+    path: TPath,
+    ...handlers: Array<
+      EndpointMapRequestHandlerParams<
+        Doc,
+        TemplateToDocEndpoint<Doc, TPath>,
+        TMethod
+      >
+    >
+  ): T;
+}
+
+/**
+ * @public
+ */
+export interface TypedRouter<GeneratedEndpointMap extends EndpointMap>
+  extends Router {
+  get: EndpointMapRequestMatcher<GeneratedEndpointMap, this, 'get'>;
+  post: EndpointMapRequestMatcher<GeneratedEndpointMap, this, 'post'>;
+  put: EndpointMapRequestMatcher<GeneratedEndpointMap, this, 'put'>;
+  delete: EndpointMapRequestMatcher<GeneratedEndpointMap, this, '_delete'>;
+}
diff --git a/packages/backend-openapi-utils/src/types/index.ts b/packages/backend-openapi-utils/src/types/index.ts
index 98e58f68ad..473d2be953 100644
--- a/packages/backend-openapi-utils/src/types/index.ts
+++ b/packages/backend-openapi-utils/src/types/index.ts
@@ -20,3 +20,4 @@ export * from './immutable';
 export * from './params';
 export * from './requests';
 export * from './responses';
+export * from './generated';
diff --git a/packages/catalog-client/src/CatalogClient.ts b/packages/catalog-client/src/CatalogClient.ts
index ff3429f81b..8054063c0b 100644
--- a/packages/catalog-client/src/CatalogClient.ts
+++ b/packages/catalog-client/src/CatalogClient.ts
@@ -42,7 +42,7 @@ import {
   ValidateEntityResponse,
 } from './types/api';
 import { isQueryEntitiesInitialRequest, splitRefsIntoChunks } from './utils';
-import { DefaultApiClient, TypedResponse } from './generated';
+import { DefaultApiClient, TypedResponse } from './schema/openapi';
 
 /**
  * A frontend and backend compatible client for communicating with the Backstage
diff --git a/packages/catalog-client/src/generated/apis/DefaultApi.client.ts b/packages/catalog-client/src/schema/openapi/generated/apis/DefaultApi.client.ts
similarity index 76%
rename from packages/catalog-client/src/generated/apis/DefaultApi.client.ts
rename to packages/catalog-client/src/schema/openapi/generated/apis/DefaultApi.client.ts
index 1f1c54d6f8..11fa561e19 100644
--- a/packages/catalog-client/src/generated/apis/DefaultApi.client.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/apis/DefaultApi.client.ts
@@ -56,8 +56,149 @@ export interface RequestOptions {
   token?: string;
 }
 
+/**
+ * @public
+ */
+export type AnalyzeLocation = {
+  body: AnalyzeLocationRequest;
+};
+/**
+ * @public
+ */
+export type CreateLocation = {
+  body: CreateLocationRequest;
+  query: {
+    dryRun?: string;
+  };
+};
+/**
+ * @public
+ */
+export type DeleteEntityByUid = {
+  path: {
+    uid: string;
+  };
+};
+/**
+ * @public
+ */
+export type DeleteLocation = {
+  path: {
+    id: string;
+  };
+};
+/**
+ * @public
+ */
+export type GetEntities = {
+  query: {
+    fields?: Array<string>;
+    limit?: number;
+    filter?: Array<string>;
+    offset?: number;
+    after?: string;
+    order?: Array<string>;
+  };
+};
+/**
+ * @public
+ */
+export type GetEntitiesByQuery = {
+  query: {
+    fields?: Array<string>;
+    limit?: number;
+    offset?: number;
+    orderField?: Array<string>;
+    cursor?: string;
+    filter?: Array<string>;
+    fullTextFilterTerm?: string;
+    fullTextFilterFields?: Array<string>;
+  };
+};
+/**
+ * @public
+ */
+export type GetEntitiesByRefs = {
+  body: GetEntitiesByRefsRequest;
+  query: {
+    filter?: Array<string>;
+  };
+};
+/**
+ * @public
+ */
+export type GetEntityAncestryByName = {
+  path: {
+    kind: string;
+    namespace: string;
+    name: string;
+  };
+};
+/**
+ * @public
+ */
+export type GetEntityByName = {
+  path: {
+    kind: string;
+    namespace: string;
+    name: string;
+  };
+};
+/**
+ * @public
+ */
+export type GetEntityByUid = {
+  path: {
+    uid: string;
+  };
+};
+/**
+ * @public
+ */
+export type GetEntityFacets = {
+  query: {
+    facet: Array<string>;
+    filter?: Array<string>;
+  };
+};
+/**
+ * @public
+ */
+export type GetLocation = {
+  path: {
+    id: string;
+  };
+};
+/**
+ * @public
+ */
+export type GetLocationByEntity = {
+  path: {
+    kind: string;
+    namespace: string;
+    name: string;
+  };
+};
+/**
+ * @public
+ */
+export type GetLocations = {};
+/**
+ * @public
+ */
+export type RefreshEntity = {
+  body: RefreshEntityRequest;
+};
+/**
+ * @public
+ */
+export type ValidateEntity = {
+  body: ValidateEntityRequest;
+};
+
 /**
  * no description
+ * @public
  */
 export class DefaultApiClient {
   private readonly discoveryApi: DiscoveryApi;
@@ -73,13 +214,11 @@ export class DefaultApiClient {
 
   /**
    * Validate a given location.
-   * @param analyzeLocationRequest
+   * @param analyzeLocationRequest -
    */
   public async analyzeLocation(
     // @ts-ignore
-    request: {
-      body: AnalyzeLocationRequest;
-    },
+    request: AnalyzeLocation,
     options?: RequestOptions,
   ): Promise<TypedResponse<AnalyzeLocationResponse>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -100,17 +239,12 @@ export class DefaultApiClient {
 
   /**
    * Create a location for a given target.
-   * @param createLocationRequest
-   * @param dryRun
+   * @param createLocationRequest -
+   * @param dryRun -
    */
   public async createLocation(
     // @ts-ignore
-    request: {
-      body: CreateLocationRequest;
-      query: {
-        dryRun?: string;
-      };
-    },
+    request: CreateLocation,
     options?: RequestOptions,
   ): Promise<TypedResponse<CreateLocation201Response>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -133,15 +267,11 @@ export class DefaultApiClient {
 
   /**
    * Delete a single entity by UID.
-   * @param uid
+   * @param uid -
    */
   public async deleteEntityByUid(
     // @ts-ignore
-    request: {
-      path: {
-        uid: string;
-      };
-    },
+    request: DeleteEntityByUid,
     options?: RequestOptions,
   ): Promise<TypedResponse<void>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -163,15 +293,11 @@ export class DefaultApiClient {
 
   /**
    * Delete a location by id.
-   * @param id
+   * @param id -
    */
   public async deleteLocation(
     // @ts-ignore
-    request: {
-      path: {
-        id: string;
-      };
-    },
+    request: DeleteLocation,
     options?: RequestOptions,
   ): Promise<TypedResponse<void>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -193,25 +319,16 @@ export class DefaultApiClient {
 
   /**
    * Get all entities matching a given filter.
-   * @param fields Restrict to just these fields in the response.
-   * @param limit Number of records to return in the response.
-   * @param filter Filter for just the entities defined by this filter.
-   * @param offset Number of records to skip in the query page.
-   * @param after Pointer to the previous page of results.
-   * @param order
+   * @param fields - Restrict to just these fields in the response.
+   * @param limit - Number of records to return in the response.
+   * @param filter - Filter for just the entities defined by this filter.
+   * @param offset - Number of records to skip in the query page.
+   * @param after - Pointer to the previous page of results.
+   * @param order -
    */
   public async getEntities(
     // @ts-ignore
-    request: {
-      query: {
-        fields?: Array<string>;
-        limit?: number;
-        filter?: Array<string>;
-        offset?: number;
-        after?: string;
-        order?: Array<string>;
-      };
-    },
+    request: GetEntities,
     options?: RequestOptions,
   ): Promise<TypedResponse<Array<Entity>>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -233,28 +350,18 @@ export class DefaultApiClient {
 
   /**
    * Search for entities by a given query.
-   * @param fields Restrict to just these fields in the response.
-   * @param limit Number of records to return in the response.
-   * @param orderField The fields to sort returned results by.
-   * @param cursor Cursor to a set page of results.
-   * @param filter Filter for just the entities defined by this filter.
-   * @param fullTextFilterTerm Text search term.
-   * @param fullTextFilterFields A comma separated list of fields to sort returned results by.
+   * @param fields - Restrict to just these fields in the response.
+   * @param limit - Number of records to return in the response.
+   * @param offset - Number of records to skip in the query page.
+   * @param orderField - The fields to sort returned results by.
+   * @param cursor - Cursor to a set page of results.
+   * @param filter - Filter for just the entities defined by this filter.
+   * @param fullTextFilterTerm - Text search term.
+   * @param fullTextFilterFields - A comma separated list of fields to sort returned results by.
    */
   public async getEntitiesByQuery(
     // @ts-ignore
-    request: {
-      query: {
-        fields?: Array<string>;
-        limit?: number;
-        offset?: number;
-        orderField?: Array<string>;
-        cursor?: string;
-        filter?: Array<string>;
-        fullTextFilterTerm?: string;
-        fullTextFilterFields?: Array<string>;
-      };
-    },
+    request: GetEntitiesByQuery,
     options?: RequestOptions,
   ): Promise<TypedResponse<EntitiesQueryResponse>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -276,23 +383,21 @@ export class DefaultApiClient {
 
   /**
    * Get a batch set of entities given an array of entityRefs.
-   * @param getEntitiesByRefsRequest
+   * @param filter - Filter for just the entities defined by this filter.
+   * @param getEntitiesByRefsRequest -
    */
   public async getEntitiesByRefs(
     // @ts-ignore
-    request: {
-      body: GetEntitiesByRefsRequest;
-      query?: {
-        filter?: Array<string>;
-      };
-    },
+    request: GetEntitiesByRefs,
     options?: RequestOptions,
   ): Promise<TypedResponse<EntitiesBatchResponse>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
 
-    const uriTemplate = `/entities/by-refs/{?filter*}`;
+    const uriTemplate = `/entities/by-refs{?filter*}`;
 
-    const uri = parser.parse(uriTemplate).expand({ ...request.query });
+    const uri = parser.parse(uriTemplate).expand({
+      ...request.query,
+    });
 
     return await this.fetchApi.fetch(`${baseUrl}${uri}`, {
       headers: {
@@ -306,19 +411,13 @@ export class DefaultApiClient {
 
   /**
    * Get an entity's ancestry by entity ref.
-   * @param kind
-   * @param namespace
-   * @param name
+   * @param kind -
+   * @param namespace -
+   * @param name -
    */
   public async getEntityAncestryByName(
     // @ts-ignore
-    request: {
-      path: {
-        kind: string;
-        namespace: string;
-        name: string;
-      };
-    },
+    request: GetEntityAncestryByName,
     options?: RequestOptions,
   ): Promise<TypedResponse<EntityAncestryResponse>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -342,19 +441,13 @@ export class DefaultApiClient {
 
   /**
    * Get an entity by an entity ref.
-   * @param kind
-   * @param namespace
-   * @param name
+   * @param kind -
+   * @param namespace -
+   * @param name -
    */
   public async getEntityByName(
     // @ts-ignore
-    request: {
-      path: {
-        kind: string;
-        namespace: string;
-        name: string;
-      };
-    },
+    request: GetEntityByName,
     options?: RequestOptions,
   ): Promise<TypedResponse<Entity>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -378,15 +471,11 @@ export class DefaultApiClient {
 
   /**
    * Get a single entity by the UID.
-   * @param uid
+   * @param uid -
    */
   public async getEntityByUid(
     // @ts-ignore
-    request: {
-      path: {
-        uid: string;
-      };
-    },
+    request: GetEntityByUid,
     options?: RequestOptions,
   ): Promise<TypedResponse<Entity>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -408,17 +497,12 @@ export class DefaultApiClient {
 
   /**
    * Get all entity facets that match the given filters.
-   * @param facet
-   * @param filter Filter for just the entities defined by this filter.
+   * @param facet -
+   * @param filter - Filter for just the entities defined by this filter.
    */
   public async getEntityFacets(
     // @ts-ignore
-    request: {
-      query: {
-        facet: Array<string>;
-        filter?: Array<string>;
-      };
-    },
+    request: GetEntityFacets,
     options?: RequestOptions,
   ): Promise<TypedResponse<EntityFacetsResponse>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -440,15 +524,11 @@ export class DefaultApiClient {
 
   /**
    * Get a location by id.
-   * @param id
+   * @param id -
    */
   public async getLocation(
     // @ts-ignore
-    request: {
-      path: {
-        id: string;
-      };
-    },
+    request: GetLocation,
     options?: RequestOptions,
   ): Promise<TypedResponse<Location>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -470,19 +550,13 @@ export class DefaultApiClient {
 
   /**
    * Get a location for entity.
-   * @param kind
-   * @param namespace
-   * @param name
+   * @param kind -
+   * @param namespace -
+   * @param name -
    */
   public async getLocationByEntity(
     // @ts-ignore
-    request: {
-      path: {
-        kind: string;
-        namespace: string;
-        name: string;
-      };
-    },
+    request: GetLocationByEntity,
     options?: RequestOptions,
   ): Promise<TypedResponse<Location>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -509,7 +583,7 @@ export class DefaultApiClient {
    */
   public async getLocations(
     // @ts-ignore
-    request: {},
+    request: GetLocations,
     options?: RequestOptions,
   ): Promise<TypedResponse<Array<GetLocations200ResponseInner>>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -529,13 +603,11 @@ export class DefaultApiClient {
 
   /**
    * Refresh the entity related to entityRef.
-   * @param refreshEntityRequest
+   * @param refreshEntityRequest -
    */
   public async refreshEntity(
     // @ts-ignore
-    request: {
-      body: RefreshEntityRequest;
-    },
+    request: RefreshEntity,
     options?: RequestOptions,
   ): Promise<TypedResponse<void>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -556,13 +628,11 @@ export class DefaultApiClient {
 
   /**
    * Validate that a passed in entity has no errors in schema.
-   * @param validateEntityRequest
+   * @param validateEntityRequest -
    */
   public async validateEntity(
     // @ts-ignore
-    request: {
-      body: ValidateEntityRequest;
-    },
+    request: ValidateEntity,
     options?: RequestOptions,
   ): Promise<TypedResponse<void>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
diff --git a/packages/catalog-client/src/generated/apis/index.ts b/packages/catalog-client/src/schema/openapi/generated/apis/index.ts
similarity index 100%
rename from packages/catalog-client/src/generated/apis/index.ts
rename to packages/catalog-client/src/schema/openapi/generated/apis/index.ts
diff --git a/packages/catalog-client/src/generated/index.ts b/packages/catalog-client/src/schema/openapi/generated/index.ts
similarity index 100%
rename from packages/catalog-client/src/generated/index.ts
rename to packages/catalog-client/src/schema/openapi/generated/index.ts
diff --git a/packages/catalog-client/src/generated/models/AnalyzeLocationEntityField.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationEntityField.model.ts
similarity index 97%
rename from packages/catalog-client/src/generated/models/AnalyzeLocationEntityField.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationEntityField.model.ts
index 48d2c897a7..ad2b5aecd1 100644
--- a/packages/catalog-client/src/generated/models/AnalyzeLocationEntityField.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationEntityField.model.ts
@@ -18,6 +18,9 @@
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 
+/**
+ * @public
+ */
 export interface AnalyzeLocationEntityField {
   /**
    * A text to show to the user to inform about the choices made. Like, it could say \"Found a CODEOWNERS file that covers this target, so we suggest leaving this field empty; which would currently make it owned by X\" where X is taken from the codeowners file.
@@ -34,6 +37,9 @@ export interface AnalyzeLocationEntityField {
   field: string;
 }
 
+/**
+ * @public
+ */
 export type AnalyzeLocationEntityFieldStateEnum =
   | 'analysisSuggestedValue'
   | 'analysisSuggestedNoValue'
diff --git a/packages/catalog-client/src/generated/models/AnalyzeLocationExistingEntity.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationExistingEntity.model.ts
similarity index 99%
rename from packages/catalog-client/src/generated/models/AnalyzeLocationExistingEntity.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationExistingEntity.model.ts
index 7a1417145e..fb01ae8e8e 100644
--- a/packages/catalog-client/src/generated/models/AnalyzeLocationExistingEntity.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationExistingEntity.model.ts
@@ -22,6 +22,7 @@ import { LocationSpec } from '../models/LocationSpec.model';
 
 /**
  * If the folder pointed to already contained catalog info yaml files, they are read and emitted like this so that the frontend can inform the user that it located them and can make sure to register them as well if they weren't already
+ * @public
  */
 export interface AnalyzeLocationExistingEntity {
   entity: Entity;
diff --git a/packages/catalog-client/src/generated/models/AnalyzeLocationGenerateEntity.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationGenerateEntity.model.ts
similarity index 99%
rename from packages/catalog-client/src/generated/models/AnalyzeLocationGenerateEntity.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationGenerateEntity.model.ts
index 3e33c59330..e760d9cf94 100644
--- a/packages/catalog-client/src/generated/models/AnalyzeLocationGenerateEntity.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationGenerateEntity.model.ts
@@ -22,6 +22,7 @@ import { RecursivePartialEntity } from '../models/RecursivePartialEntity.model';
 
 /**
  * This is some form of representation of what the analyzer could deduce. We should probably have a chat about how this can best be conveyed to the frontend. It'll probably contain a (possibly incomplete) entity, plus enough info for the frontend to know what form data to show to the user for overriding/completing the info.
+ * @public
  */
 export interface AnalyzeLocationGenerateEntity {
   fields: Array<AnalyzeLocationEntityField>;
diff --git a/packages/catalog-client/src/generated/models/AnalyzeLocationRequest.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationRequest.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/AnalyzeLocationRequest.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationRequest.model.ts
index 15e9b96e2c..c1085a2a7b 100644
--- a/packages/catalog-client/src/generated/models/AnalyzeLocationRequest.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationRequest.model.ts
@@ -19,6 +19,9 @@
 // ******************************************************************
 import { LocationInput } from '../models/LocationInput.model';
 
+/**
+ * @public
+ */
 export interface AnalyzeLocationRequest {
   catalogFileName?: string;
   location: LocationInput;
diff --git a/packages/catalog-client/src/generated/models/AnalyzeLocationResponse.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationResponse.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/AnalyzeLocationResponse.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationResponse.model.ts
index e22d45627a..66fc46bc0f 100644
--- a/packages/catalog-client/src/generated/models/AnalyzeLocationResponse.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationResponse.model.ts
@@ -20,6 +20,9 @@
 import { AnalyzeLocationExistingEntity } from '../models/AnalyzeLocationExistingEntity.model';
 import { AnalyzeLocationGenerateEntity } from '../models/AnalyzeLocationGenerateEntity.model';
 
+/**
+ * @public
+ */
 export interface AnalyzeLocationResponse {
   generateEntities: Array<AnalyzeLocationGenerateEntity>;
   existingEntityFiles: Array<AnalyzeLocationExistingEntity>;
diff --git a/packages/catalog-client/src/generated/models/CreateLocation201Response.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/CreateLocation201Response.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/CreateLocation201Response.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/CreateLocation201Response.model.ts
index 367e701af8..27e557639a 100644
--- a/packages/catalog-client/src/generated/models/CreateLocation201Response.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/CreateLocation201Response.model.ts
@@ -20,6 +20,9 @@
 import { Entity } from '../models/Entity.model';
 import { Location } from '../models/Location.model';
 
+/**
+ * @public
+ */
 export interface CreateLocation201Response {
   exists?: boolean;
   entities: Array<Entity>;
diff --git a/packages/catalog-client/src/generated/models/CreateLocationRequest.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/CreateLocationRequest.model.ts
similarity index 97%
rename from packages/catalog-client/src/generated/models/CreateLocationRequest.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/CreateLocationRequest.model.ts
index badddbf60d..5351ac289b 100644
--- a/packages/catalog-client/src/generated/models/CreateLocationRequest.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/CreateLocationRequest.model.ts
@@ -18,6 +18,9 @@
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 
+/**
+ * @public
+ */
 export interface CreateLocationRequest {
   target: string;
   type: string;
diff --git a/packages/catalog-client/src/generated/models/EntitiesBatchResponse.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/EntitiesBatchResponse.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/EntitiesBatchResponse.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/EntitiesBatchResponse.model.ts
index 3275a7b6e7..1a962367d1 100644
--- a/packages/catalog-client/src/generated/models/EntitiesBatchResponse.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/EntitiesBatchResponse.model.ts
@@ -19,6 +19,9 @@
 // ******************************************************************
 import { NullableEntity } from '../models/NullableEntity.model';
 
+/**
+ * @public
+ */
 export interface EntitiesBatchResponse {
   /**
    * The list of entities, in the same order as the refs in the request. Entries that are null signify that no entity existed with that ref.
diff --git a/packages/catalog-client/src/generated/models/EntitiesQueryResponse.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/EntitiesQueryResponse.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/EntitiesQueryResponse.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/EntitiesQueryResponse.model.ts
index 9950dd98d1..11c42a6aee 100644
--- a/packages/catalog-client/src/generated/models/EntitiesQueryResponse.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/EntitiesQueryResponse.model.ts
@@ -20,6 +20,9 @@
 import { EntitiesQueryResponsePageInfo } from '../models/EntitiesQueryResponsePageInfo.model';
 import { Entity } from '../models/Entity.model';
 
+/**
+ * @public
+ */
 export interface EntitiesQueryResponse {
   /**
    * The list of entities paginated by a specific filter.
diff --git a/packages/catalog-client/src/generated/models/EntitiesQueryResponsePageInfo.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/EntitiesQueryResponsePageInfo.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/EntitiesQueryResponsePageInfo.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/EntitiesQueryResponsePageInfo.model.ts
index 4d2a0af058..07b4137c77 100644
--- a/packages/catalog-client/src/generated/models/EntitiesQueryResponsePageInfo.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/EntitiesQueryResponsePageInfo.model.ts
@@ -18,6 +18,9 @@
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 
+/**
+ * @public
+ */
 export interface EntitiesQueryResponsePageInfo {
   /**
    * The cursor for the next batch of entities.
diff --git a/packages/catalog-client/src/generated/models/Entity.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/Entity.model.ts
similarity index 99%
rename from packages/catalog-client/src/generated/models/Entity.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/Entity.model.ts
index f4a30fbf66..f386f3dd17 100644
--- a/packages/catalog-client/src/generated/models/Entity.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/Entity.model.ts
@@ -22,6 +22,7 @@ import { EntityRelation } from '../models/EntityRelation.model';
 
 /**
  * The parts of the format that's common to all versions/kinds of entity.
+ * @public
  */
 export interface Entity {
   /**
diff --git a/packages/catalog-client/src/generated/models/EntityAncestryResponse.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/EntityAncestryResponse.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/EntityAncestryResponse.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/EntityAncestryResponse.model.ts
index 4e0ead7d3b..a94f784f05 100644
--- a/packages/catalog-client/src/generated/models/EntityAncestryResponse.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/EntityAncestryResponse.model.ts
@@ -19,6 +19,9 @@
 // ******************************************************************
 import { EntityAncestryResponseItemsInner } from '../models/EntityAncestryResponseItemsInner.model';
 
+/**
+ * @public
+ */
 export interface EntityAncestryResponse {
   items: Array<EntityAncestryResponseItemsInner>;
   rootEntityRef: string;
diff --git a/packages/catalog-client/src/generated/models/EntityAncestryResponseItemsInner.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/EntityAncestryResponseItemsInner.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/EntityAncestryResponseItemsInner.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/EntityAncestryResponseItemsInner.model.ts
index 22b59e201f..40594a1515 100644
--- a/packages/catalog-client/src/generated/models/EntityAncestryResponseItemsInner.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/EntityAncestryResponseItemsInner.model.ts
@@ -19,6 +19,9 @@
 // ******************************************************************
 import { Entity } from '../models/Entity.model';
 
+/**
+ * @public
+ */
 export interface EntityAncestryResponseItemsInner {
   parentEntityRefs: Array<string>;
   entity: Entity;
diff --git a/packages/catalog-client/src/generated/models/EntityFacet.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/EntityFacet.model.ts
similarity index 97%
rename from packages/catalog-client/src/generated/models/EntityFacet.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/EntityFacet.model.ts
index aa637501f4..f0f89f6eae 100644
--- a/packages/catalog-client/src/generated/models/EntityFacet.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/EntityFacet.model.ts
@@ -18,6 +18,9 @@
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 
+/**
+ * @public
+ */
 export interface EntityFacet {
   value: string;
   count: number;
diff --git a/packages/catalog-client/src/generated/models/EntityFacetsResponse.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/EntityFacetsResponse.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/EntityFacetsResponse.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/EntityFacetsResponse.model.ts
index 33aa505a64..e013f0b5a8 100644
--- a/packages/catalog-client/src/generated/models/EntityFacetsResponse.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/EntityFacetsResponse.model.ts
@@ -19,6 +19,9 @@
 // ******************************************************************
 import { EntityFacet } from '../models/EntityFacet.model';
 
+/**
+ * @public
+ */
 export interface EntityFacetsResponse {
   facets: { [key: string]: Array<EntityFacet> };
 }
diff --git a/packages/catalog-client/src/generated/models/EntityLink.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/EntityLink.model.ts
similarity index 99%
rename from packages/catalog-client/src/generated/models/EntityLink.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/EntityLink.model.ts
index 9de21c1b10..53d7d1f9ff 100644
--- a/packages/catalog-client/src/generated/models/EntityLink.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/EntityLink.model.ts
@@ -20,6 +20,7 @@
 
 /**
  * A link to external information that is related to the entity.
+ * @public
  */
 export interface EntityLink {
   /**
diff --git a/packages/catalog-client/src/generated/models/EntityMeta.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/EntityMeta.model.ts
similarity index 99%
rename from packages/catalog-client/src/generated/models/EntityMeta.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/EntityMeta.model.ts
index 10cda7f226..cc8dd555a6 100644
--- a/packages/catalog-client/src/generated/models/EntityMeta.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/EntityMeta.model.ts
@@ -21,6 +21,7 @@ import { EntityLink } from '../models/EntityLink.model';
 
 /**
  * Metadata fields common to all versions/kinds of entity.
+ * @public
  */
 export interface EntityMeta {
   [key: string]: any;
diff --git a/packages/catalog-client/src/generated/models/EntityRelation.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/EntityRelation.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/EntityRelation.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/EntityRelation.model.ts
index 14f7d0fab3..fe98a84481 100644
--- a/packages/catalog-client/src/generated/models/EntityRelation.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/EntityRelation.model.ts
@@ -20,6 +20,7 @@
 
 /**
  * A relation of a specific type to another entity in the catalog.
+ * @public
  */
 export interface EntityRelation {
   /**
diff --git a/packages/catalog-client/src/generated/models/ErrorError.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/ErrorError.model.ts
similarity index 97%
rename from packages/catalog-client/src/generated/models/ErrorError.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/ErrorError.model.ts
index a9d3b11fdd..fe5811628d 100644
--- a/packages/catalog-client/src/generated/models/ErrorError.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/ErrorError.model.ts
@@ -18,6 +18,9 @@
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 
+/**
+ * @public
+ */
 export interface ErrorError {
   name: string;
   message: string;
diff --git a/packages/catalog-client/src/generated/models/ErrorRequest.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/ErrorRequest.model.ts
similarity index 97%
rename from packages/catalog-client/src/generated/models/ErrorRequest.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/ErrorRequest.model.ts
index be62627814..d44dcb66d9 100644
--- a/packages/catalog-client/src/generated/models/ErrorRequest.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/ErrorRequest.model.ts
@@ -18,6 +18,9 @@
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 
+/**
+ * @public
+ */
 export interface ErrorRequest {
   method: string;
   url: string;
diff --git a/packages/catalog-client/src/generated/models/ErrorResponse.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/ErrorResponse.model.ts
similarity index 97%
rename from packages/catalog-client/src/generated/models/ErrorResponse.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/ErrorResponse.model.ts
index 008f8b7348..91c120483d 100644
--- a/packages/catalog-client/src/generated/models/ErrorResponse.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/ErrorResponse.model.ts
@@ -18,6 +18,9 @@
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 
+/**
+ * @public
+ */
 export interface ErrorResponse {
   statusCode: number;
 }
diff --git a/packages/catalog-client/src/generated/models/GetEntitiesByRefsRequest.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/GetEntitiesByRefsRequest.model.ts
similarity index 97%
rename from packages/catalog-client/src/generated/models/GetEntitiesByRefsRequest.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/GetEntitiesByRefsRequest.model.ts
index 07c6500c9f..9160f0823b 100644
--- a/packages/catalog-client/src/generated/models/GetEntitiesByRefsRequest.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/GetEntitiesByRefsRequest.model.ts
@@ -18,6 +18,9 @@
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 
+/**
+ * @public
+ */
 export interface GetEntitiesByRefsRequest {
   entityRefs: Array<string>;
   fields?: Array<string>;
diff --git a/packages/catalog-client/src/generated/models/GetLocations200ResponseInner.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/GetLocations200ResponseInner.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/GetLocations200ResponseInner.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/GetLocations200ResponseInner.model.ts
index 94c40d2233..a9f1af1c53 100644
--- a/packages/catalog-client/src/generated/models/GetLocations200ResponseInner.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/GetLocations200ResponseInner.model.ts
@@ -19,6 +19,9 @@
 // ******************************************************************
 import { Location } from '../models/Location.model';
 
+/**
+ * @public
+ */
 export interface GetLocations200ResponseInner {
   data: Location;
 }
diff --git a/packages/catalog-client/src/generated/models/Location.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/Location.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/Location.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/Location.model.ts
index 456b76ec7b..d7e4a22de4 100644
--- a/packages/catalog-client/src/generated/models/Location.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/Location.model.ts
@@ -20,6 +20,7 @@
 
 /**
  * Entity location for a specific entity.
+ * @public
  */
 export interface Location {
   target: string;
diff --git a/packages/catalog-client/src/generated/models/LocationInput.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/LocationInput.model.ts
similarity index 97%
rename from packages/catalog-client/src/generated/models/LocationInput.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/LocationInput.model.ts
index 41537aaded..9cdc4c2c13 100644
--- a/packages/catalog-client/src/generated/models/LocationInput.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/LocationInput.model.ts
@@ -18,6 +18,9 @@
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 
+/**
+ * @public
+ */
 export interface LocationInput {
   type: string;
   target: string;
diff --git a/packages/catalog-client/src/generated/models/LocationSpec.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/LocationSpec.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/LocationSpec.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/LocationSpec.model.ts
index cd9eb284f7..1d56d8f3b0 100644
--- a/packages/catalog-client/src/generated/models/LocationSpec.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/LocationSpec.model.ts
@@ -20,6 +20,7 @@
 
 /**
  * Holds the entity location information.
+ * @public
  */
 export interface LocationSpec {
   target: string;
diff --git a/packages/catalog-client/src/generated/models/ModelError.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/ModelError.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/ModelError.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/ModelError.model.ts
index 7bfa165493..5526d703e6 100644
--- a/packages/catalog-client/src/generated/models/ModelError.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/ModelError.model.ts
@@ -21,6 +21,9 @@ import { ErrorError } from '../models/ErrorError.model';
 import { ErrorRequest } from '../models/ErrorRequest.model';
 import { ErrorResponse } from '../models/ErrorResponse.model';
 
+/**
+ * @public
+ */
 export interface ModelError {
   [key: string]: any;
 
diff --git a/packages/catalog-client/src/schema/openapi/generated/models/NullableEntity.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/NullableEntity.model.ts
new file mode 100644
index 0000000000..aa6135ded4
--- /dev/null
+++ b/packages/catalog-client/src/schema/openapi/generated/models/NullableEntity.model.ts
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { EntityMeta } from '../models/EntityMeta.model';
+import { EntityRelation } from '../models/EntityRelation.model';
+
+/**
+ * The parts of the format that's common to all versions/kinds of entity.
+ * @public
+ */
+export type NullableEntity = {
+  /**
+   * The relations that this entity has with other entities.
+   */
+  relations?: Array<EntityRelation>;
+  /**
+   * A type representing all allowed JSON object values.
+   */
+  spec?: { [key: string]: any };
+  metadata: EntityMeta;
+  /**
+   * The high level entity type being described.
+   */
+  kind: string;
+  /**
+   * The version of specification format for this particular entity that this is written against.
+   */
+  apiVersion: string;
+} | null;
diff --git a/packages/catalog-client/src/generated/models/RecursivePartialEntity.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/RecursivePartialEntity.model.ts
similarity index 99%
rename from packages/catalog-client/src/generated/models/RecursivePartialEntity.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/RecursivePartialEntity.model.ts
index db5ac31de3..b3913ccd85 100644
--- a/packages/catalog-client/src/generated/models/RecursivePartialEntity.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/RecursivePartialEntity.model.ts
@@ -22,6 +22,7 @@ import { RecursivePartialEntityRelation } from '../models/RecursivePartialEntity
 
 /**
  * Makes all keys of an entire hierarchy optional.
+ * @public
  */
 export interface RecursivePartialEntity {
   /**
diff --git a/packages/catalog-client/src/generated/models/RecursivePartialEntityMeta.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/RecursivePartialEntityMeta.model.ts
similarity index 99%
rename from packages/catalog-client/src/generated/models/RecursivePartialEntityMeta.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/RecursivePartialEntityMeta.model.ts
index 93e849ac99..df5ce3811b 100644
--- a/packages/catalog-client/src/generated/models/RecursivePartialEntityMeta.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/RecursivePartialEntityMeta.model.ts
@@ -19,6 +19,9 @@
 // ******************************************************************
 import { EntityLink } from '../models/EntityLink.model';
 
+/**
+ * @public
+ */
 export interface RecursivePartialEntityMeta {
   /**
    * A list of external hyperlinks related to the entity.
diff --git a/packages/catalog-client/src/generated/models/RecursivePartialEntityMetaAllOf.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/RecursivePartialEntityMetaAllOf.model.ts
similarity index 99%
rename from packages/catalog-client/src/generated/models/RecursivePartialEntityMetaAllOf.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/RecursivePartialEntityMetaAllOf.model.ts
index 7e06368102..6598f8df96 100644
--- a/packages/catalog-client/src/generated/models/RecursivePartialEntityMetaAllOf.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/RecursivePartialEntityMetaAllOf.model.ts
@@ -21,6 +21,7 @@ import { EntityLink } from '../models/EntityLink.model';
 
 /**
  * Metadata fields common to all versions/kinds of entity.
+ * @public
  */
 export interface RecursivePartialEntityMetaAllOf {
   /**
diff --git a/packages/catalog-client/src/generated/models/RecursivePartialEntityRelation.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/RecursivePartialEntityRelation.model.ts
similarity index 99%
rename from packages/catalog-client/src/generated/models/RecursivePartialEntityRelation.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/RecursivePartialEntityRelation.model.ts
index 9179add222..9c7dafb534 100644
--- a/packages/catalog-client/src/generated/models/RecursivePartialEntityRelation.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/RecursivePartialEntityRelation.model.ts
@@ -20,6 +20,7 @@
 
 /**
  * A relation of a specific type to another entity in the catalog.
+ * @public
  */
 export interface RecursivePartialEntityRelation {
   /**
diff --git a/packages/catalog-client/src/generated/models/RefreshEntityRequest.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/RefreshEntityRequest.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/RefreshEntityRequest.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/RefreshEntityRequest.model.ts
index c5ab4c38eb..617f35288b 100644
--- a/packages/catalog-client/src/generated/models/RefreshEntityRequest.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/RefreshEntityRequest.model.ts
@@ -20,6 +20,7 @@
 
 /**
  * Options for requesting a refresh of entities in the catalog.
+ * @public
  */
 export interface RefreshEntityRequest {
   authorizationToken?: string;
diff --git a/packages/catalog-client/src/generated/models/ValidateEntity400Response.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/ValidateEntity400Response.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/ValidateEntity400Response.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/ValidateEntity400Response.model.ts
index 7cd5044782..fac9525afa 100644
--- a/packages/catalog-client/src/generated/models/ValidateEntity400Response.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/ValidateEntity400Response.model.ts
@@ -19,6 +19,9 @@
 // ******************************************************************
 import { ValidateEntity400ResponseErrorsInner } from '../models/ValidateEntity400ResponseErrorsInner.model';
 
+/**
+ * @public
+ */
 export interface ValidateEntity400Response {
   errors: Array<ValidateEntity400ResponseErrorsInner>;
 }
diff --git a/packages/catalog-client/src/generated/models/ValidateEntity400ResponseErrorsInner.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/ValidateEntity400ResponseErrorsInner.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/ValidateEntity400ResponseErrorsInner.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/ValidateEntity400ResponseErrorsInner.model.ts
index 5617ee00bb..8718d7938d 100644
--- a/packages/catalog-client/src/generated/models/ValidateEntity400ResponseErrorsInner.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/ValidateEntity400ResponseErrorsInner.model.ts
@@ -18,6 +18,9 @@
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 
+/**
+ * @public
+ */
 export interface ValidateEntity400ResponseErrorsInner {
   [key: string]: any;
 
diff --git a/packages/catalog-client/src/generated/models/ValidateEntityRequest.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/ValidateEntityRequest.model.ts
similarity index 97%
rename from packages/catalog-client/src/generated/models/ValidateEntityRequest.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/ValidateEntityRequest.model.ts
index 152f28cf85..c3be04818d 100644
--- a/packages/catalog-client/src/generated/models/ValidateEntityRequest.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/ValidateEntityRequest.model.ts
@@ -18,6 +18,9 @@
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 
+/**
+ * @public
+ */
 export interface ValidateEntityRequest {
   location: string;
   entity: { [key: string]: any };
diff --git a/packages/catalog-client/src/generated/models/index.ts b/packages/catalog-client/src/schema/openapi/generated/models/index.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/index.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/index.ts
diff --git a/packages/catalog-client/src/generated/pluginId.ts b/packages/catalog-client/src/schema/openapi/generated/pluginId.ts
similarity index 100%
rename from packages/catalog-client/src/generated/pluginId.ts
rename to packages/catalog-client/src/schema/openapi/generated/pluginId.ts
diff --git a/packages/catalog-client/src/generated/types/discovery.ts b/packages/catalog-client/src/schema/openapi/generated/types/discovery.ts
similarity index 100%
rename from packages/catalog-client/src/generated/types/discovery.ts
rename to packages/catalog-client/src/schema/openapi/generated/types/discovery.ts
diff --git a/packages/catalog-client/src/generated/types/fetch.ts b/packages/catalog-client/src/schema/openapi/generated/types/fetch.ts
similarity index 100%
rename from packages/catalog-client/src/generated/types/fetch.ts
rename to packages/catalog-client/src/schema/openapi/generated/types/fetch.ts
diff --git a/packages/catalog-client/src/schema/openapi/index.ts b/packages/catalog-client/src/schema/openapi/index.ts
new file mode 100644
index 0000000000..db98243cbf
--- /dev/null
+++ b/packages/catalog-client/src/schema/openapi/index.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/cli/config/eslint-factory.js b/packages/cli/config/eslint-factory.js
index 856068eef9..3ae455c4b8 100644
--- a/packages/cli/config/eslint-factory.js
+++ b/packages/cli/config/eslint-factory.js
@@ -167,7 +167,7 @@ function createConfig(dir, extraConfig = {}) {
         },
       },
       {
-        files: ['**/src/generated/**/*.ts'],
+        files: ['**/src/**/generated/**/*.ts'],
         rules: {
           ...tsRules,
           'no-unused-vars': 'off',
diff --git a/packages/repo-tools/src/commands/package/schema/openapi/generate/client.ts b/packages/repo-tools/src/commands/package/schema/openapi/generate/client.ts
index 742f303f51..bd8ff8530e 100644
--- a/packages/repo-tools/src/commands/package/schema/openapi/generate/client.ts
+++ b/packages/repo-tools/src/commands/package/schema/openapi/generate/client.ts
@@ -63,7 +63,7 @@ async function generate(
       '-c',
       resolvePackagePath(
         '@backstage/repo-tools',
-        'templates/typescript-backstage.yaml',
+        'templates/typescript-backstage-client.yaml',
       ),
       '--generator-key',
       'v3.0',
@@ -79,15 +79,21 @@ async function generate(
     },
   );
 
-  await exec(
-    `yarn backstage-cli package lint --fix ${resolvedOutputDirectory}`,
-    [],
-    { signal: abortSignal?.signal },
+  const parentDirectory = resolve(resolvedOutputDirectory, '..');
+
+  await fs.writeFile(
+    resolve(parentDirectory, 'index.ts'),
+    `// 
+    export * from './generated';`,
   );
 
+  await exec(`yarn backstage-cli package lint --fix ${parentDirectory}`, [], {
+    signal: abortSignal?.signal,
+  });
+
   const prettier = cliPaths.resolveTargetRoot('node_modules/.bin/prettier');
   if (prettier) {
-    await exec(`${prettier} --write ${resolvedOutputDirectory}`, [], {
+    await exec(`${prettier} --write ${parentDirectory}`, [], {
       signal: abortSignal?.signal,
     });
   }
diff --git a/packages/repo-tools/src/commands/package/schema/openapi/generate/server.ts b/packages/repo-tools/src/commands/package/schema/openapi/generate/server.ts
index 1ef6fd10d2..1fbc42c175 100644
--- a/packages/repo-tools/src/commands/package/schema/openapi/generate/server.ts
+++ b/packages/repo-tools/src/commands/package/schema/openapi/generate/server.ts
@@ -14,23 +14,39 @@
  * limitations under the License.
  */
 
-import fs from 'fs-extra';
-import YAML from 'js-yaml';
 import chalk from 'chalk';
+import { resolve, dirname, join } from 'path';
+import YAML from 'js-yaml';
+import {
+  OLD_SCHEMA_PATH,
+  OPENAPI_IGNORE_FILES,
+  OUTPUT_PATH,
+  TS_SCHEMA_PATH,
+} from '../../../../../lib/openapi/constants';
 import { paths as cliPaths } from '../../../../../lib/paths';
-import { TS_SCHEMA_PATH } from '../../../../../lib/openapi/constants';
-import { promisify } from 'util';
-import { exec as execCb } from 'child_process';
-import { getPathToCurrentOpenApiSpec } from '../../../../../lib/openapi/helpers';
+import fs from 'fs-extra';
+import { exec } from '../../../../../lib/exec';
+import { resolvePackagePath } from '@backstage/backend-plugin-api';
+import {
+  getPathToCurrentOpenApiSpec,
+  getRelativePathToFile,
+} from '../../../../../lib/openapi/helpers';
 
-const exec = promisify(execCb);
-
-async function generate(abortSignal?: AbortController) {
+async function generateSpecFile() {
   const openapiPath = await getPathToCurrentOpenApiSpec();
   const yaml = YAML.load(await fs.readFile(openapiPath, 'utf8'));
 
   const tsPath = cliPaths.resolveTarget(TS_SCHEMA_PATH);
 
+  const schemaDir = dirname(tsPath);
+  await fs.mkdirp(schemaDir);
+
+  const oldTsPath = cliPaths.resolveTarget(OLD_SCHEMA_PATH);
+  if (fs.existsSync(oldTsPath)) {
+    console.warn(`Removing old schema file at ${oldTsPath}`);
+    fs.removeSync(oldTsPath);
+  }
+
   // The first set of comment slashes allow for the eslint notice plugin to run
   // with onNonMatchingHeader: 'replace', as is the case in the open source
   // Backstage repo. Otherwise the auto-generated comment will be removed by the
@@ -42,23 +58,93 @@ async function generate(abortSignal?: AbortController) {
 // ******************************************************************
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
-import {createValidatedOpenApiRouter} from '@backstage/backend-openapi-utils';
+import {createValidatedOpenApiRouterFromGeneratedEndpointMap} from '@backstage/backend-openapi-utils';
+import {EndpointMap} from './';
 export const spec = ${JSON.stringify(yaml, null, 2)} as const;
 export const createOpenApiRouter = async (
-  options?: Parameters<typeof createValidatedOpenApiRouter>['1'],
-) => createValidatedOpenApiRouter<typeof spec>(spec, options);
+  options?: Parameters<typeof createValidatedOpenApiRouterFromGeneratedEndpointMap>['1'],
+) => createValidatedOpenApiRouterFromGeneratedEndpointMap<EndpointMap>(spec, options);
 `,
   );
 
-  await exec(`yarn backstage-cli package lint --fix ${tsPath}`, {
-    signal: abortSignal?.signal,
-  });
+  const indexFile = join(schemaDir, '..', 'index.ts');
+  await fs.writeFile(
+    indexFile,
+    `// 
+    export * from './generated';`,
+  );
+
+  await exec(`yarn backstage-cli package lint`, ['--fix', tsPath, indexFile]);
   if (await cliPaths.resolveTargetRoot('node_modules/.bin/prettier')) {
-    await exec(`yarn prettier --write ${tsPath}`, {
+    await exec(`yarn prettier`, ['--write', tsPath, indexFile], {
       cwd: cliPaths.targetRoot,
+    });
+  }
+}
+
+async function generate(abortSignal?: AbortController) {
+  const resolvedOpenapiPath = await getPathToCurrentOpenApiSpec();
+  const resolvedOutputDirectory = await getRelativePathToFile(OUTPUT_PATH);
+
+  await fs.mkdirp(resolvedOutputDirectory);
+
+  await fs.writeFile(
+    resolve(resolvedOutputDirectory, '.openapi-generator-ignore'),
+    OPENAPI_IGNORE_FILES.join('\n'),
+  );
+
+  await exec(
+    'node',
+    [
+      resolvePackagePath('@openapitools/openapi-generator-cli', 'main.js'),
+      'generate',
+      '-i',
+      resolvedOpenapiPath,
+      '-o',
+      resolvedOutputDirectory,
+      '-g',
+      'typescript',
+      '-c',
+      resolvePackagePath(
+        '@backstage/repo-tools',
+        'templates/typescript-backstage-server.yaml',
+      ),
+      '--generator-key',
+      'v3.0',
+    ],
+    {
+      maxBuffer: Number.MAX_VALUE,
+      cwd: resolvePackagePath('@backstage/repo-tools'),
+      env: {
+        ...process.env,
+      },
+      signal: abortSignal?.signal,
+    },
+  );
+
+  await exec(
+    `yarn backstage-cli package lint --fix ${resolvedOutputDirectory}`,
+    [],
+    {
+      signal: abortSignal?.signal,
+    },
+  );
+
+  const prettier = cliPaths.resolveTargetRoot('node_modules/.bin/prettier');
+  if (prettier) {
+    await exec(`${prettier} --write ${resolvedOutputDirectory}`, [], {
       signal: abortSignal?.signal,
     });
   }
+
+  fs.removeSync(resolve(resolvedOutputDirectory, '.openapi-generator-ignore'));
+
+  fs.rmSync(resolve(resolvedOutputDirectory, '.openapi-generator'), {
+    recursive: true,
+    force: true,
+  });
+
+  await generateSpecFile();
 }
 
 export async function command({
diff --git a/packages/repo-tools/src/commands/repo/schema/openapi/verify.ts b/packages/repo-tools/src/commands/repo/schema/openapi/verify.ts
index 35dd3e1702..61aadc5d0c 100644
--- a/packages/repo-tools/src/commands/repo/schema/openapi/verify.ts
+++ b/packages/repo-tools/src/commands/repo/schema/openapi/verify.ts
@@ -22,7 +22,7 @@ import { relative as relativePath, resolve as resolvePath } from 'path';
 import { runner } from '../../../../lib/runner';
 import { paths as cliPaths } from '../../../../lib/paths';
 import {
-  TS_MODULE,
+  OLD_SCHEMA_PATH,
   TS_SCHEMA_PATH,
   YAML_SCHEMA_PATH,
 } from '../../../../lib/openapi/constants';
@@ -41,12 +41,20 @@ async function verify(directoryPath: string) {
   }
   const yaml = await loadAndValidateOpenApiYaml(openapiPath);
 
-  const schemaPath = join(directoryPath, TS_SCHEMA_PATH);
-  if (!(await fs.pathExists(schemaPath))) {
+  let schemaPath = join(directoryPath, TS_SCHEMA_PATH);
+  if (
+    !(await fs.pathExists(schemaPath)) &&
+    !(await fs.pathExists(join(directoryPath, OLD_SCHEMA_PATH)))
+  ) {
     throw new Error(`No \`${TS_SCHEMA_PATH}\` file found.`);
+  } else if (await fs.pathExists(join(directoryPath, OLD_SCHEMA_PATH))) {
+    console.warn(
+      `\`${OLD_SCHEMA_PATH}\` is deprecated. Please re-run \`yarn backstage-repo-tools package schema openapi generate\` to update it.`,
+    );
+    schemaPath = join(directoryPath, OLD_SCHEMA_PATH);
   }
 
-  const schema = await import(resolvePath(join(directoryPath, TS_MODULE)));
+  const schema = await import(resolvePath(schemaPath));
 
   if (!schema.spec) {
     throw new Error(`\`${TS_SCHEMA_PATH}\` needs to have a 'spec' export.`);
diff --git a/packages/repo-tools/src/lib/openapi/constants.ts b/packages/repo-tools/src/lib/openapi/constants.ts
index 4936a5aee7..22f52e75a9 100644
--- a/packages/repo-tools/src/lib/openapi/constants.ts
+++ b/packages/repo-tools/src/lib/openapi/constants.ts
@@ -16,7 +16,11 @@
 
 export const YAML_SCHEMA_PATH = 'src/schema/openapi.yaml';
 
-export const TS_MODULE = 'src/schema/openapi.generated';
+export const OUTPUT_PATH = 'src/schema/openapi/generated';
+
+export const TS_MODULE = `${OUTPUT_PATH}/router`;
+
+export const OLD_SCHEMA_PATH = `src/schema/openapi.generated.ts`;
 
 export const TS_SCHEMA_PATH = `${TS_MODULE}.ts`;
 
@@ -24,8 +28,6 @@ export const GENERATOR_VERSION = `1.0.0`;
 export const GENERATOR_NAME = 'typescript-backstage';
 export const GENERATOR_FILE = `packages/template-openapi-plugin-client/generator/target/${GENERATOR_NAME}-openapi-generator-${GENERATOR_VERSION}.jar`;
 
-export const OUTPUT_PATH = 'src/generated';
-
 export const OPENAPI_IGNORE_FILES = [
   // Get rid of the default files.
   '*.md',
@@ -45,6 +47,7 @@ export const OPENAPI_IGNORE_FILES = [
   // Override the created version.
   'apis/*.ts',
   '!apis/*.client.ts',
+  '!apis/*.server.ts',
   'models/*.ts',
   '!models/*.model.ts',
 
diff --git a/packages/repo-tools/templates/typescript-backstage-client.yaml b/packages/repo-tools/templates/typescript-backstage-client.yaml
new file mode 100644
index 0000000000..785ffde881
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-client.yaml
@@ -0,0 +1,40 @@
+templateDir: templates/typescript-backstage-client
+
+files:
+  api.mustache:
+    templateType: API
+    # For some reason, they check for destinationFilename differences. We have to change the ending to override the file.
+    destinationFilename: .client.ts
+  model.mustache:
+    templateType: Model
+    destinationFilename: .model.ts
+  modelGeneric.mustache:
+    templateType: SupportingFiles
+  modelOneOf.mustache:
+    templateType: SupportingFiles
+  modelGenericAdditionalProperties.mustache:
+    templateType: SupportingFiles
+  modelGenericEnums.mustache:
+    templateType: SupportingFiles
+  modelAlias.mustache:
+    templateType: SupportingFiles
+  modelEnum.mustache:
+    templateType: SupportingFiles
+  modelTaggedUnion.mustache:
+    templateType: SupportingFiles
+  models/models_all.mustache:
+    templateType: SupportingFiles
+    destinationFilename: models/index.ts
+  types/fetch.ts:
+    destinationFilename: types/fetch.ts
+  types/discovery.ts:
+    destinationFilename: types/discovery.ts
+  apis/index.mustache:
+    templateType: SupportingFiles
+    destinationFilename: apis/index.ts
+  pluginId.mustache:
+    templateType: SupportingFiles
+    destinationFilename: pluginId.ts
+  index.mustache:
+    templateType: SupportingFiles
+    destinationFilename: index.ts
diff --git a/packages/repo-tools/templates/typescript-backstage/api.mustache b/packages/repo-tools/templates/typescript-backstage-client/api.mustache
similarity index 72%
rename from packages/repo-tools/templates/typescript-backstage/api.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/api.mustache
index 8043d6e2f4..ee8ea4d17e 100644
--- a/packages/repo-tools/templates/typescript-backstage/api.mustache
+++ b/packages/repo-tools/templates/typescript-backstage-client/api.mustache
@@ -29,8 +29,43 @@ export interface RequestOptions {
   token?: string;
 }
 
+{{#operation}}
+/**
+  * @public
+  */
+export type {{#lambda.pascalcase}}{{nickname}}{{/lambda.pascalcase}} = {
+    {{#hasPathParams}}
+    path: {
+        {{#pathParams}}
+            {{paramName}}{{^required}}?{{/required}}: {{{dataType}}},
+        {{/pathParams}}
+    },
+    {{/hasPathParams}}
+    {{#hasBodyParam}}
+        {{#bodyParam}}
+        body: {{{dataType}}},
+        {{/bodyParam}}
+    {{/hasBodyParam}}
+    {{#hasQueryParams}}
+    query: {
+        {{#queryParams}}
+        {{paramName}}{{^required}}?{{/required}}: {{{dataType}}},
+        {{/queryParams}}
+    },
+    {{/hasQueryParams}}
+    {{#hasHeaderParams}}
+    header: {
+        {{#headerParams}}
+        {{paramName}}{{^required}}?{{/required}}: {{{dataType}}},
+        {{/headerParams}}
+    },
+    {{/hasHeaderParams}}
+}
+{{/operation}}
+
 /**
  * {{{description}}}{{^description}}no description{{/description}}
+ * @public
  */
 export class {{classname}}Client {
     private readonly discoveryApi: DiscoveryApi;
@@ -53,39 +88,12 @@ export class {{classname}}Client {
      * {{&summary}}
      {{/summary}}
      {{#allParams}}
-     * @param {{paramName}} {{description}}
+     * @param {{paramName}} - {{description}}
      {{/allParams}}
      */
     public async {{nickname}}(
         // @ts-ignore
-        request: {
-            {{#hasPathParams}}
-            path: {
-                {{#pathParams}}
-                    {{paramName}}{{^required}}?{{/required}}: {{{dataType}}},
-                {{/pathParams}}
-            },
-            {{/hasPathParams}}
-            {{#hasBodyParam}}
-                {{#bodyParam}}
-                body: {{{dataType}}},
-                {{/bodyParam}}
-            {{/hasBodyParam}}
-            {{#hasQueryParams}}
-            query: {
-                {{#queryParams}}
-                {{paramName}}{{^required}}?{{/required}}: {{{dataType}}},
-                {{/queryParams}}
-            },
-            {{/hasQueryParams}}
-            {{#hasHeaderParams}}
-            header: {
-                {{#headerParams}}
-                {{paramName}}{{^required}}?{{/required}}: {{{dataType}}},
-                {{/headerParams}}
-            },
-            {{/hasHeaderParams}}
-        },
+        request: {{#lambda.pascalcase}}{{nickname}}{{/lambda.pascalcase}},
         options?: RequestOptions
     ): Promise<TypedResponse<{{{returnType}}} {{^returnType}}void{{/returnType}}>> {
         const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
diff --git a/packages/repo-tools/templates/typescript-backstage/apis/index.mustache b/packages/repo-tools/templates/typescript-backstage-client/apis/index.mustache
similarity index 100%
rename from packages/repo-tools/templates/typescript-backstage/apis/index.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/apis/index.mustache
diff --git a/packages/repo-tools/templates/typescript-backstage/index.mustache b/packages/repo-tools/templates/typescript-backstage-client/index.mustache
similarity index 100%
rename from packages/repo-tools/templates/typescript-backstage/index.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/index.mustache
diff --git a/packages/repo-tools/templates/typescript-backstage/licenseInfo.mustache b/packages/repo-tools/templates/typescript-backstage-client/licenseInfo.mustache
similarity index 100%
rename from packages/repo-tools/templates/typescript-backstage/licenseInfo.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/licenseInfo.mustache
diff --git a/packages/repo-tools/templates/typescript-backstage/model.mustache b/packages/repo-tools/templates/typescript-backstage-client/model.mustache
similarity index 100%
rename from packages/repo-tools/templates/typescript-backstage/model.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/model.mustache
diff --git a/packages/repo-tools/templates/typescript-backstage/modelAlias.mustache b/packages/repo-tools/templates/typescript-backstage-client/modelAlias.mustache
similarity index 92%
rename from packages/repo-tools/templates/typescript-backstage/modelAlias.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/modelAlias.mustache
index 351dc37c78..8358be805f 100644
--- a/packages/repo-tools/templates/typescript-backstage/modelAlias.mustache
+++ b/packages/repo-tools/templates/typescript-backstage-client/modelAlias.mustache
@@ -1,3 +1,6 @@
 {{! Sourced from https://github.com/OpenAPITools/openapi-generator/blob/7347daec61b2cb8d3d28e1ed06fe8b5e682090f8/modules/openapi-generator/src/main/resources/typescript-angular/modelAlias.mustache }}
 
+/**
+  * @public
+  */
 export type {{classname}} = {{dataType}};
\ No newline at end of file
diff --git a/packages/repo-tools/templates/typescript-backstage/modelEnum.mustache b/packages/repo-tools/templates/typescript-backstage-client/modelEnum.mustache
similarity index 91%
rename from packages/repo-tools/templates/typescript-backstage/modelEnum.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/modelEnum.mustache
index 0deab70f02..3a1b5ce86d 100644
--- a/packages/repo-tools/templates/typescript-backstage/modelEnum.mustache
+++ b/packages/repo-tools/templates/typescript-backstage-client/modelEnum.mustache
@@ -1,6 +1,9 @@
 {{! Sourced from https://github.com/OpenAPITools/openapi-generator/blob/7347daec61b2cb8d3d28e1ed06fe8b5e682090f8/modules/openapi-generator/src/main/resources/typescript-angular/modelEnum.mustache }}
 
 {{#stringEnums}}
+/**
+  * @public
+  */
 export enum {{classname}} {
 {{#allowableValues}}
 {{#enumVars}}
@@ -10,8 +13,14 @@ export enum {{classname}} {
 }
 {{/stringEnums}}
 {{^stringEnums}}
+/**
+  * @public
+  */
 export type {{classname}} = {{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}} | {{/-last}}{{/enumVars}}{{/allowableValues}};
 
+/**
+  * @public
+  */
 export const {{classname}} = {
 {{#allowableValues}}
 {{#enumVars}}
diff --git a/packages/repo-tools/templates/typescript-backstage/modelGeneric.mustache b/packages/repo-tools/templates/typescript-backstage-client/modelGeneric.mustache
similarity index 81%
rename from packages/repo-tools/templates/typescript-backstage/modelGeneric.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/modelGeneric.mustache
index d51eeaed80..d01ea29260 100644
--- a/packages/repo-tools/templates/typescript-backstage/modelGeneric.mustache
+++ b/packages/repo-tools/templates/typescript-backstage-client/modelGeneric.mustache
@@ -3,13 +3,14 @@
 {{#models}}
 {{#model}}
 
-{{#description}}
 /**
+{{#description}}
 * {{{.}}}
-*/
 {{/description}}
+* @public
+*/
 {{^isEnum}}
-export interface {{classname}} {
+export {{#isNullable}}type{{/isNullable}}{{^isNullable}}interface{{/isNullable}} {{classname}} {{#isNullable}}={{/isNullable}} {
 {{>modelGenericAdditionalProperties}}
 {{#vars}}
 {{#description}}
@@ -19,12 +20,15 @@ export interface {{classname}} {
 {{/description}}
     '{{name}}'{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isNullable}} | null{{/isNullable}};
 {{/vars}}
-}
+}{{#isNullable}} | null{{/isNullable}}
 
 {{#hasEnums}}
 
 {{#vars}}
 {{#isEnum}}
+/**
+  * @public
+  */
 export type {{classname}}{{enumName}} ={{#allowableValues}}{{#values}} "{{.}}" {{^-last}}|{{/-last}}{{/values}}{{/allowableValues}};
 {{/isEnum}}
 {{/vars}}
@@ -32,6 +36,9 @@ export type {{classname}}{{enumName}} ={{#allowableValues}}{{#values}} "{{.}}" {
 {{/hasEnums}}
 {{/isEnum}}
 {{#isEnum}}
+/**
+  * @public
+  */
 export type {{classname}} ={{#allowableValues}}{{#values}} "{{.}}" {{^-last}}|{{/-last}}{{/values}}{{/allowableValues}};
 {{/isEnum}}
 {{/model}}
diff --git a/packages/repo-tools/templates/typescript-backstage/modelGenericAdditionalProperties.mustache b/packages/repo-tools/templates/typescript-backstage-client/modelGenericAdditionalProperties.mustache
similarity index 100%
rename from packages/repo-tools/templates/typescript-backstage/modelGenericAdditionalProperties.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/modelGenericAdditionalProperties.mustache
diff --git a/packages/repo-tools/templates/typescript-backstage/modelGenericEnums.mustache b/packages/repo-tools/templates/typescript-backstage-client/modelGenericEnums.mustache
similarity index 90%
rename from packages/repo-tools/templates/typescript-backstage/modelGenericEnums.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/modelGenericEnums.mustache
index 8d7b49c9c3..acfcc23959 100644
--- a/packages/repo-tools/templates/typescript-backstage/modelGenericEnums.mustache
+++ b/packages/repo-tools/templates/typescript-backstage-client/modelGenericEnums.mustache
@@ -3,11 +3,17 @@
 {{#hasEnums}}
 
 {{^stringEnums}}
+/**
+  * @public
+  */
 export namespace {{classname}} {
 {{/stringEnums}}
 {{#vars}}
     {{#isEnum}}
 {{#stringEnums}}
+/**
+  * @public
+  */
 export enum {{classname}}{{enumName}} {
 {{#allowableValues}}
 {{#enumVars}}
@@ -17,7 +23,14 @@ export enum {{classname}}{{enumName}} {
 };
 {{/stringEnums}}
 {{^stringEnums}}
+    /**
+    * @public
+    */
     export type {{enumName}} = {{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}} | {{/-last}}{{/enumVars}}{{/allowableValues}};
+
+    /**
+    * @public
+    */
     export const {{enumName}} = {
     {{#allowableValues}}
     {{#enumVars}}
diff --git a/packages/repo-tools/templates/typescript-backstage/modelOneOf.mustache b/packages/repo-tools/templates/typescript-backstage-client/modelOneOf.mustache
similarity index 96%
rename from packages/repo-tools/templates/typescript-backstage/modelOneOf.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/modelOneOf.mustache
index b261789c3d..038025b651 100644
--- a/packages/repo-tools/templates/typescript-backstage/modelOneOf.mustache
+++ b/packages/repo-tools/templates/typescript-backstage-client/modelOneOf.mustache
@@ -8,9 +8,10 @@ import {
 } from './';
 
 {{/hasImports}}
-{{#description}}
     /**
+{{#description}}
     * {{{.}}}
-    */
 {{/description}}
+    * @public
+    */
 export type {{classname}} = {{#oneOf}}{{{.}}}{{^-last}} | {{/-last}}{{/oneOf}};
diff --git a/packages/repo-tools/templates/typescript-backstage/modelTaggedUnion.mustache b/packages/repo-tools/templates/typescript-backstage-client/modelTaggedUnion.mustache
similarity index 100%
rename from packages/repo-tools/templates/typescript-backstage/modelTaggedUnion.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/modelTaggedUnion.mustache
diff --git a/packages/repo-tools/templates/typescript-backstage/models/models_all.mustache b/packages/repo-tools/templates/typescript-backstage-client/models/models_all.mustache
similarity index 100%
rename from packages/repo-tools/templates/typescript-backstage/models/models_all.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/models/models_all.mustache
diff --git a/packages/repo-tools/templates/typescript-backstage/pluginId.mustache b/packages/repo-tools/templates/typescript-backstage-client/pluginId.mustache
similarity index 100%
rename from packages/repo-tools/templates/typescript-backstage/pluginId.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/pluginId.mustache
diff --git a/packages/repo-tools/templates/typescript-backstage/types/discovery.ts b/packages/repo-tools/templates/typescript-backstage-client/types/discovery.ts
similarity index 100%
rename from packages/repo-tools/templates/typescript-backstage/types/discovery.ts
rename to packages/repo-tools/templates/typescript-backstage-client/types/discovery.ts
diff --git a/packages/repo-tools/templates/typescript-backstage/types/fetch.ts b/packages/repo-tools/templates/typescript-backstage-client/types/fetch.ts
similarity index 100%
rename from packages/repo-tools/templates/typescript-backstage/types/fetch.ts
rename to packages/repo-tools/templates/typescript-backstage-client/types/fetch.ts
diff --git a/packages/repo-tools/templates/typescript-backstage.yaml b/packages/repo-tools/templates/typescript-backstage-server.yaml
similarity index 79%
rename from packages/repo-tools/templates/typescript-backstage.yaml
rename to packages/repo-tools/templates/typescript-backstage-server.yaml
index a2cb61c121..e9140d0bc6 100644
--- a/packages/repo-tools/templates/typescript-backstage.yaml
+++ b/packages/repo-tools/templates/typescript-backstage-server.yaml
@@ -1,10 +1,16 @@
-templateDir: templates/typescript-backstage
+templateDir: templates/typescript-backstage-server
 
 files:
   api.mustache:
     templateType: API
     # For some reason, they check for destinationFilename differences. We have to change the ending to override the file.
-    destinationFilename: .client.ts
+    destinationFilename: .server.ts
+  apis/index.mustache:
+    templateType: SupportingFiles
+    destinationFilename: apis/index.ts
+  index.mustache:
+    templateType: SupportingFiles
+    destinationFilename: index.ts
   model.mustache:
     templateType: Model
     destinationFilename: .model.ts
@@ -24,12 +30,4 @@ files:
     templateType: SupportingFiles
   models/models_all.mustache:
     templateType: SupportingFiles
-    destinationFilename: models/index.ts
-  types/fetch.ts: {}
-  types/discovery.ts: {}
-  apis/index.mustache:
-    templateType: SupportingFiles
-    destinationFilename: apis/index.ts
-  pluginId.mustache:
-    templateType: SupportingFiles
-    destinationFilename: pluginId.ts
+    destinationFilename: models/index.ts
\ No newline at end of file
diff --git a/packages/repo-tools/templates/typescript-backstage-server/api.mustache b/packages/repo-tools/templates/typescript-backstage-server/api.mustache
new file mode 100644
index 0000000000..fd27bb94fa
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server/api.mustache
@@ -0,0 +1,54 @@
+{{>licenseInfo}}
+{{#imports}}
+import { {{classname}} } from '{{filename}}.model{{importFileExtension}}';
+{{/imports}}
+
+{{#operations}}
+
+{{#operation}}
+/**
+  * @public
+  */
+export type {{#lambda.pascalcase}}{{nickname}}{{/lambda.pascalcase}} = {
+    {{#hasPathParams}}
+    path: {
+        {{#pathParams}}
+            {{paramName}}{{^required}}?{{/required}}: {{{dataType}}},
+        {{/pathParams}}
+    },
+    {{/hasPathParams}}
+    {{#hasBodyParam}}
+        {{#bodyParam}}
+        body: {{{dataType}}},
+        {{/bodyParam}}
+    {{/hasBodyParam}}
+    {{#hasQueryParams}}
+    query: {
+        {{#queryParams}}
+        {{paramName}}{{^required}}?{{/required}}: {{{dataType}}},
+        {{/queryParams}}
+    },
+    {{/hasQueryParams}}
+    {{#hasHeaderParams}}
+    header: {
+        {{#headerParams}}
+        {{paramName}}{{^required}}?{{/required}}: {{{dataType}}},
+        {{/headerParams}}
+    },
+    {{/hasHeaderParams}}
+    response: {{#responses}} {{{dataType}}}{{^dataType}}void{{/dataType}} {{^-last}} | {{/-last}} {{/responses}}
+}
+{{/operation}}
+
+/**
+ * {{{description}}}{{^description}}no description{{/description}}
+ */
+
+export type EndpointMap = {
+    {{#operation}}
+    
+    '#{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}|{{path}}': {{#lambda.pascalcase}}{{nickname}}{{/lambda.pascalcase}},
+    
+    {{/operation}}
+}
+{{/operations}}
diff --git a/packages/repo-tools/templates/typescript-backstage-server/apis/index.mustache b/packages/repo-tools/templates/typescript-backstage-server/apis/index.mustache
new file mode 100644
index 0000000000..d0638a7538
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server/apis/index.mustache
@@ -0,0 +1,3 @@
+//
+
+export * from './DefaultApi.server';
diff --git a/packages/repo-tools/templates/typescript-backstage-server/index.mustache b/packages/repo-tools/templates/typescript-backstage-server/index.mustache
new file mode 100644
index 0000000000..3e7a88faa4
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server/index.mustache
@@ -0,0 +1,4 @@
+// 
+
+export * from './apis';
+export * from './router';
diff --git a/packages/repo-tools/templates/typescript-backstage-server/licenseInfo.mustache b/packages/repo-tools/templates/typescript-backstage-server/licenseInfo.mustache
new file mode 100644
index 0000000000..7a1b10e780
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server/licenseInfo.mustache
@@ -0,0 +1,5 @@
+//
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
\ No newline at end of file
diff --git a/packages/repo-tools/templates/typescript-backstage-server/model.mustache b/packages/repo-tools/templates/typescript-backstage-server/model.mustache
new file mode 100644
index 0000000000..565eecb4e8
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server/model.mustache
@@ -0,0 +1,11 @@
+{{! Sourced from https://github.com/OpenAPITools/openapi-generator/blob/7347daec61b2cb8d3d28e1ed06fe8b5e682090f8/modules/openapi-generator/src/main/resources/typescript-angular/model.mustache#L17. }}
+{{>licenseInfo}}
+{{#models}}
+{{#model}}
+{{#tsImports}}
+import { {{classname}} } from '{{filename}}.model';
+{{/tsImports}}
+
+{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{#isAlias}}{{>modelAlias}}{{/isAlias}}{{^isAlias}}{{#taggedUnions}}{{>modelTaggedUnion}}{{/taggedUnions}}{{^taggedUnions}}{{#oneOf}}{{#-first}}{{>modelOneOf}}{{/-first}}{{/oneOf}}{{^oneOf}}{{>modelGeneric}}{{/oneOf}}{{/taggedUnions}}{{/isAlias}}{{/isEnum}}
+{{/model}}
+{{/models}}
diff --git a/packages/repo-tools/templates/typescript-backstage-server/modelAlias.mustache b/packages/repo-tools/templates/typescript-backstage-server/modelAlias.mustache
new file mode 100644
index 0000000000..8358be805f
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server/modelAlias.mustache
@@ -0,0 +1,6 @@
+{{! Sourced from https://github.com/OpenAPITools/openapi-generator/blob/7347daec61b2cb8d3d28e1ed06fe8b5e682090f8/modules/openapi-generator/src/main/resources/typescript-angular/modelAlias.mustache }}
+
+/**
+  * @public
+  */
+export type {{classname}} = {{dataType}};
\ No newline at end of file
diff --git a/packages/repo-tools/templates/typescript-backstage-server/modelEnum.mustache b/packages/repo-tools/templates/typescript-backstage-server/modelEnum.mustache
new file mode 100644
index 0000000000..3a1b5ce86d
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server/modelEnum.mustache
@@ -0,0 +1,31 @@
+{{! Sourced from https://github.com/OpenAPITools/openapi-generator/blob/7347daec61b2cb8d3d28e1ed06fe8b5e682090f8/modules/openapi-generator/src/main/resources/typescript-angular/modelEnum.mustache }}
+
+{{#stringEnums}}
+/**
+  * @public
+  */
+export enum {{classname}} {
+{{#allowableValues}}
+{{#enumVars}}
+    {{name}} = {{{value}}}{{^-last}},{{/-last}}
+{{/enumVars}}
+{{/allowableValues}}
+}
+{{/stringEnums}}
+{{^stringEnums}}
+/**
+  * @public
+  */
+export type {{classname}} = {{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}} | {{/-last}}{{/enumVars}}{{/allowableValues}};
+
+/**
+  * @public
+  */
+export const {{classname}} = {
+{{#allowableValues}}
+{{#enumVars}}
+    {{name}}: {{{value}}} as {{classname}}{{^-last}},{{/-last}}
+{{/enumVars}}
+{{/allowableValues}}
+};
+{{/stringEnums}}
diff --git a/packages/repo-tools/templates/typescript-backstage-server/modelGeneric.mustache b/packages/repo-tools/templates/typescript-backstage-server/modelGeneric.mustache
new file mode 100644
index 0000000000..d01ea29260
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server/modelGeneric.mustache
@@ -0,0 +1,45 @@
+{{! Sourced from https://github.com/OpenAPITools/openapi-generator/blob/7347daec61b2cb8d3d28e1ed06fe8b5e682090f8/modules/openapi-generator/src/main/resources/typescript-angular/modelGeneric.mustache }}
+
+{{#models}}
+{{#model}}
+
+/**
+{{#description}}
+* {{{.}}}
+{{/description}}
+* @public
+*/
+{{^isEnum}}
+export {{#isNullable}}type{{/isNullable}}{{^isNullable}}interface{{/isNullable}} {{classname}} {{#isNullable}}={{/isNullable}} {
+{{>modelGenericAdditionalProperties}}
+{{#vars}}
+{{#description}}
+    /**
+    * {{{.}}}
+    */
+{{/description}}
+    '{{name}}'{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isNullable}} | null{{/isNullable}};
+{{/vars}}
+}{{#isNullable}} | null{{/isNullable}}
+
+{{#hasEnums}}
+
+{{#vars}}
+{{#isEnum}}
+/**
+  * @public
+  */
+export type {{classname}}{{enumName}} ={{#allowableValues}}{{#values}} "{{.}}" {{^-last}}|{{/-last}}{{/values}}{{/allowableValues}};
+{{/isEnum}}
+{{/vars}}
+
+{{/hasEnums}}
+{{/isEnum}}
+{{#isEnum}}
+/**
+  * @public
+  */
+export type {{classname}} ={{#allowableValues}}{{#values}} "{{.}}" {{^-last}}|{{/-last}}{{/values}}{{/allowableValues}};
+{{/isEnum}}
+{{/model}}
+{{/models}}
\ No newline at end of file
diff --git a/packages/repo-tools/templates/typescript-backstage-server/modelGenericAdditionalProperties.mustache b/packages/repo-tools/templates/typescript-backstage-server/modelGenericAdditionalProperties.mustache
new file mode 100644
index 0000000000..e1e94cea80
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server/modelGenericAdditionalProperties.mustache
@@ -0,0 +1,5 @@
+{{! Sourced from https://github.com/OpenAPITools/openapi-generator/blob/7347daec61b2cb8d3d28e1ed06fe8b5e682090f8/modules/openapi-generator/src/main/resources/typescript-angular/modelGenericAdditionalProperties.mustache }}
+
+{{#additionalPropertiesType}}
+  [key: string]: {{{additionalPropertiesType}}};
+{{/additionalPropertiesType}}
\ No newline at end of file
diff --git a/packages/repo-tools/templates/typescript-backstage-server/modelGenericEnums.mustache b/packages/repo-tools/templates/typescript-backstage-server/modelGenericEnums.mustache
new file mode 100644
index 0000000000..acfcc23959
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server/modelGenericEnums.mustache
@@ -0,0 +1,45 @@
+{{! Sourced from https://github.com/OpenAPITools/openapi-generator/blob/7347daec61b2cb8d3d28e1ed06fe8b5e682090f8/modules/openapi-generator/src/main/resources/typescript-angular/modelGenericEnums.mustache }}
+
+{{#hasEnums}}
+
+{{^stringEnums}}
+/**
+  * @public
+  */
+export namespace {{classname}} {
+{{/stringEnums}}
+{{#vars}}
+    {{#isEnum}}
+{{#stringEnums}}
+/**
+  * @public
+  */
+export enum {{classname}}{{enumName}} {
+{{#allowableValues}}
+{{#enumVars}}
+    {{name}} = {{{value}}}{{^-last}},{{/-last}}
+{{/enumVars}}
+{{/allowableValues}}
+};
+{{/stringEnums}}
+{{^stringEnums}}
+    /**
+    * @public
+    */
+    export type {{enumName}} = {{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}} | {{/-last}}{{/enumVars}}{{/allowableValues}};
+
+    /**
+    * @public
+    */
+    export const {{enumName}} = {
+    {{#allowableValues}}
+    {{#enumVars}}
+        {{name}}: {{{value}}} as {{enumName}}{{^-last}},{{/-last}}
+    {{/enumVars}}
+    {{/allowableValues}}
+    };
+{{/stringEnums}}
+    {{/isEnum}}
+{{/vars}}
+{{^stringEnums}}}{{/stringEnums}}
+{{/hasEnums}}
\ No newline at end of file
diff --git a/packages/repo-tools/templates/typescript-backstage-server/modelOneOf.mustache b/packages/repo-tools/templates/typescript-backstage-server/modelOneOf.mustache
new file mode 100644
index 0000000000..038025b651
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server/modelOneOf.mustache
@@ -0,0 +1,17 @@
+{{! Sourced from https://github.com/OpenAPITools/openapi-generator/blob/7347daec61b2cb8d3d28e1ed06fe8b5e682090f8/modules/openapi-generator/src/main/resources/typescript-angular/modelOneOf.mustache }}
+
+{{#hasImports}}
+import {
+    {{#imports}}
+    {{{.}}},
+    {{/imports}}
+} from './';
+
+{{/hasImports}}
+    /**
+{{#description}}
+    * {{{.}}}
+{{/description}}
+    * @public
+    */
+export type {{classname}} = {{#oneOf}}{{{.}}}{{^-last}} | {{/-last}}{{/oneOf}};
diff --git a/packages/repo-tools/templates/typescript-backstage-server/modelTaggedUnion.mustache b/packages/repo-tools/templates/typescript-backstage-server/modelTaggedUnion.mustache
new file mode 100644
index 0000000000..a3f5e00904
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server/modelTaggedUnion.mustache
@@ -0,0 +1,23 @@
+{{! Sourced from https://github.com/OpenAPITools/openapi-generator/blob/7347daec61b2cb8d3d28e1ed06fe8b5e682090f8/modules/openapi-generator/src/main/resources/typescript-angular/modelTaggedUnion.mustache }}
+
+{{#discriminator}}
+export type {{classname}} = {{#children}}{{^-first}} | {{/-first}}{{classname}}{{/children}};
+{{/discriminator}}
+{{^discriminator}}
+{{#parent}}
+export interface {{classname}} { {{>modelGenericAdditionalProperties}}
+{{#allVars}}
+    {{#description}}
+    /**
+    * {{{.}}}
+    */
+    {{/description}}
+    {{name}}{{^required}}?{{/required}}: {{#discriminatorValue}}'{{.}}'{{/discriminatorValue}}{{^discriminatorValue}}{{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{/discriminatorValue}}{{#isNullable}} | null{{/isNullable}};
+{{/allVars}}
+}
+{{>modelGenericEnums}}
+{{/parent}}
+{{^parent}}
+{{>modelGeneric}}
+{{/parent}}
+{{/discriminator}}
\ No newline at end of file
diff --git a/packages/repo-tools/templates/typescript-backstage-server/models/models_all.mustache b/packages/repo-tools/templates/typescript-backstage-server/models/models_all.mustache
new file mode 100644
index 0000000000..d076cfb3ff
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server/models/models_all.mustache
@@ -0,0 +1,7 @@
+//
+
+{{#models}}
+{{#model}}
+export * from '{{{ importPath }}}.model{{importFileExtension}}'
+{{/model}}
+{{/models}}
\ No newline at end of file
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/apis/DefaultApi.server.ts b/plugins/catalog-backend/src/schema/openapi/generated/apis/DefaultApi.server.ts
new file mode 100644
index 0000000000..8789eee1f6
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/apis/DefaultApi.server.ts
@@ -0,0 +1,229 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { AnalyzeLocationRequest } from '../models/AnalyzeLocationRequest.model';
+import { AnalyzeLocationResponse } from '../models/AnalyzeLocationResponse.model';
+import { CreateLocation201Response } from '../models/CreateLocation201Response.model';
+import { CreateLocationRequest } from '../models/CreateLocationRequest.model';
+import { EntitiesBatchResponse } from '../models/EntitiesBatchResponse.model';
+import { EntitiesQueryResponse } from '../models/EntitiesQueryResponse.model';
+import { Entity } from '../models/Entity.model';
+import { EntityAncestryResponse } from '../models/EntityAncestryResponse.model';
+import { EntityFacetsResponse } from '../models/EntityFacetsResponse.model';
+import { GetEntitiesByRefsRequest } from '../models/GetEntitiesByRefsRequest.model';
+import { GetLocations200ResponseInner } from '../models/GetLocations200ResponseInner.model';
+import { Location } from '../models/Location.model';
+import { RefreshEntityRequest } from '../models/RefreshEntityRequest.model';
+import { ValidateEntity400Response } from '../models/ValidateEntity400Response.model';
+import { ValidateEntityRequest } from '../models/ValidateEntityRequest.model';
+
+/**
+ * @public
+ */
+export type AnalyzeLocation = {
+  body: AnalyzeLocationRequest;
+  response: AnalyzeLocationResponse | Error | Error;
+};
+/**
+ * @public
+ */
+export type CreateLocation = {
+  body: CreateLocationRequest;
+  query: {
+    dryRun?: string;
+  };
+  response: CreateLocation201Response | Error | Error;
+};
+/**
+ * @public
+ */
+export type DeleteEntityByUid = {
+  path: {
+    uid: string;
+  };
+  response: void | Error | Error;
+};
+/**
+ * @public
+ */
+export type DeleteLocation = {
+  path: {
+    id: string;
+  };
+  response: void | Error | Error;
+};
+/**
+ * @public
+ */
+export type GetEntities = {
+  query: {
+    fields?: Array<string>;
+    limit?: number;
+    filter?: Array<string>;
+    offset?: number;
+    after?: string;
+    order?: Array<string>;
+  };
+  response: Array<Entity> | Error | Error;
+};
+/**
+ * @public
+ */
+export type GetEntitiesByQuery = {
+  query: {
+    fields?: Array<string>;
+    limit?: number;
+    offset?: number;
+    orderField?: Array<string>;
+    cursor?: string;
+    filter?: Array<string>;
+    fullTextFilterTerm?: string;
+    fullTextFilterFields?: Array<string>;
+  };
+  response: EntitiesQueryResponse | Error | Error;
+};
+/**
+ * @public
+ */
+export type GetEntitiesByRefs = {
+  body: GetEntitiesByRefsRequest;
+  query: {
+    filter?: Array<string>;
+  };
+  response: EntitiesBatchResponse | Error | Error;
+};
+/**
+ * @public
+ */
+export type GetEntityAncestryByName = {
+  path: {
+    kind: string;
+    namespace: string;
+    name: string;
+  };
+  response: EntityAncestryResponse | Error | Error;
+};
+/**
+ * @public
+ */
+export type GetEntityByName = {
+  path: {
+    kind: string;
+    namespace: string;
+    name: string;
+  };
+  response: Entity | Error | Error;
+};
+/**
+ * @public
+ */
+export type GetEntityByUid = {
+  path: {
+    uid: string;
+  };
+  response: Entity | Error | Error;
+};
+/**
+ * @public
+ */
+export type GetEntityFacets = {
+  query: {
+    facet: Array<string>;
+    filter?: Array<string>;
+  };
+  response: EntityFacetsResponse | Error | Error;
+};
+/**
+ * @public
+ */
+export type GetLocation = {
+  path: {
+    id: string;
+  };
+  response: Location | Error;
+};
+/**
+ * @public
+ */
+export type GetLocationByEntity = {
+  path: {
+    kind: string;
+    namespace: string;
+    name: string;
+  };
+  response: Location | Error;
+};
+/**
+ * @public
+ */
+export type GetLocations = {
+  response: Array<GetLocations200ResponseInner> | Error;
+};
+/**
+ * @public
+ */
+export type RefreshEntity = {
+  body: RefreshEntityRequest;
+  response: void | Error | Error;
+};
+/**
+ * @public
+ */
+export type ValidateEntity = {
+  body: ValidateEntityRequest;
+  response: void | ValidateEntity400Response;
+};
+
+/**
+ * no description
+ */
+
+export type EndpointMap = {
+  '#post|/analyze-location': AnalyzeLocation;
+
+  '#post|/locations': CreateLocation;
+
+  '#_delete|/entities/by-uid/{uid}': DeleteEntityByUid;
+
+  '#_delete|/locations/{id}': DeleteLocation;
+
+  '#get|/entities': GetEntities;
+
+  '#get|/entities/by-query': GetEntitiesByQuery;
+
+  '#post|/entities/by-refs': GetEntitiesByRefs;
+
+  '#get|/entities/by-name/{kind}/{namespace}/{name}/ancestry': GetEntityAncestryByName;
+
+  '#get|/entities/by-name/{kind}/{namespace}/{name}': GetEntityByName;
+
+  '#get|/entities/by-uid/{uid}': GetEntityByUid;
+
+  '#get|/entity-facets': GetEntityFacets;
+
+  '#get|/locations/{id}': GetLocation;
+
+  '#get|/locations/by-entity/{kind}/{namespace}/{name}': GetLocationByEntity;
+
+  '#get|/locations': GetLocations;
+
+  '#post|/refresh': RefreshEntity;
+
+  '#post|/validate-entity': ValidateEntity;
+};
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/apis/index.ts b/plugins/catalog-backend/src/schema/openapi/generated/apis/index.ts
new file mode 100644
index 0000000000..79855a6fc8
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/apis/index.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 './DefaultApi.server';
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/index.ts b/plugins/catalog-backend/src/schema/openapi/generated/index.ts
new file mode 100644
index 0000000000..69c39313c6
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/index.ts
@@ -0,0 +1,18 @@
+/*
+ * 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 './apis';
+export * from './router';
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationEntityField.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationEntityField.model.ts
new file mode 100644
index 0000000000..ad2b5aecd1
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationEntityField.model.ts
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface AnalyzeLocationEntityField {
+  /**
+   * A text to show to the user to inform about the choices made. Like, it could say \"Found a CODEOWNERS file that covers this target, so we suggest leaving this field empty; which would currently make it owned by X\" where X is taken from the codeowners file.
+   */
+  description: string;
+  value: string | null;
+  /**
+   * The outcome of the analysis for this particular field
+   */
+  state: AnalyzeLocationEntityFieldStateEnum;
+  /**
+   * e.g. \"spec.owner\"? The frontend needs to know how to \"inject\" the field into the entity again if the user wants to change it
+   */
+  field: string;
+}
+
+/**
+ * @public
+ */
+export type AnalyzeLocationEntityFieldStateEnum =
+  | 'analysisSuggestedValue'
+  | 'analysisSuggestedNoValue'
+  | 'needsUserInput';
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationExistingEntity.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationExistingEntity.model.ts
new file mode 100644
index 0000000000..fb01ae8e8e
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationExistingEntity.model.ts
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { Entity } from '../models/Entity.model';
+import { LocationSpec } from '../models/LocationSpec.model';
+
+/**
+ * If the folder pointed to already contained catalog info yaml files, they are read and emitted like this so that the frontend can inform the user that it located them and can make sure to register them as well if they weren't already
+ * @public
+ */
+export interface AnalyzeLocationExistingEntity {
+  entity: Entity;
+  isRegistered: boolean;
+  location: LocationSpec;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationGenerateEntity.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationGenerateEntity.model.ts
new file mode 100644
index 0000000000..e760d9cf94
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationGenerateEntity.model.ts
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { AnalyzeLocationEntityField } from '../models/AnalyzeLocationEntityField.model';
+import { RecursivePartialEntity } from '../models/RecursivePartialEntity.model';
+
+/**
+ * This is some form of representation of what the analyzer could deduce. We should probably have a chat about how this can best be conveyed to the frontend. It'll probably contain a (possibly incomplete) entity, plus enough info for the frontend to know what form data to show to the user for overriding/completing the info.
+ * @public
+ */
+export interface AnalyzeLocationGenerateEntity {
+  fields: Array<AnalyzeLocationEntityField>;
+  entity: RecursivePartialEntity;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationRequest.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationRequest.model.ts
new file mode 100644
index 0000000000..c1085a2a7b
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationRequest.model.ts
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { LocationInput } from '../models/LocationInput.model';
+
+/**
+ * @public
+ */
+export interface AnalyzeLocationRequest {
+  catalogFileName?: string;
+  location: LocationInput;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationResponse.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationResponse.model.ts
new file mode 100644
index 0000000000..66fc46bc0f
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationResponse.model.ts
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { AnalyzeLocationExistingEntity } from '../models/AnalyzeLocationExistingEntity.model';
+import { AnalyzeLocationGenerateEntity } from '../models/AnalyzeLocationGenerateEntity.model';
+
+/**
+ * @public
+ */
+export interface AnalyzeLocationResponse {
+  generateEntities: Array<AnalyzeLocationGenerateEntity>;
+  existingEntityFiles: Array<AnalyzeLocationExistingEntity>;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/CreateLocation201Response.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/CreateLocation201Response.model.ts
new file mode 100644
index 0000000000..27e557639a
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/CreateLocation201Response.model.ts
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { Entity } from '../models/Entity.model';
+import { Location } from '../models/Location.model';
+
+/**
+ * @public
+ */
+export interface CreateLocation201Response {
+  exists?: boolean;
+  entities: Array<Entity>;
+  location: Location;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/CreateLocationRequest.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/CreateLocationRequest.model.ts
new file mode 100644
index 0000000000..5351ac289b
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/CreateLocationRequest.model.ts
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface CreateLocationRequest {
+  target: string;
+  type: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/EntitiesBatchResponse.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/EntitiesBatchResponse.model.ts
new file mode 100644
index 0000000000..1a962367d1
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/EntitiesBatchResponse.model.ts
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { NullableEntity } from '../models/NullableEntity.model';
+
+/**
+ * @public
+ */
+export interface EntitiesBatchResponse {
+  /**
+   * The list of entities, in the same order as the refs in the request. Entries that are null signify that no entity existed with that ref.
+   */
+  items: Array<NullableEntity>;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/EntitiesQueryResponse.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/EntitiesQueryResponse.model.ts
new file mode 100644
index 0000000000..11c42a6aee
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/EntitiesQueryResponse.model.ts
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { EntitiesQueryResponsePageInfo } from '../models/EntitiesQueryResponsePageInfo.model';
+import { Entity } from '../models/Entity.model';
+
+/**
+ * @public
+ */
+export interface EntitiesQueryResponse {
+  /**
+   * The list of entities paginated by a specific filter.
+   */
+  items: Array<Entity>;
+  totalItems: number;
+  pageInfo: EntitiesQueryResponsePageInfo;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/EntitiesQueryResponsePageInfo.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/EntitiesQueryResponsePageInfo.model.ts
new file mode 100644
index 0000000000..07b4137c77
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/EntitiesQueryResponsePageInfo.model.ts
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface EntitiesQueryResponsePageInfo {
+  /**
+   * The cursor for the next batch of entities.
+   */
+  nextCursor?: string;
+  /**
+   * The cursor for the previous batch of entities.
+   */
+  prevCursor?: string;
+}
diff --git a/packages/catalog-client/src/generated/models/NullableEntity.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/Entity.model.ts
similarity index 97%
rename from packages/catalog-client/src/generated/models/NullableEntity.model.ts
rename to plugins/catalog-backend/src/schema/openapi/generated/models/Entity.model.ts
index b4344a3bfb..f386f3dd17 100644
--- a/packages/catalog-client/src/generated/models/NullableEntity.model.ts
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/Entity.model.ts
@@ -22,8 +22,9 @@ import { EntityRelation } from '../models/EntityRelation.model';
 
 /**
  * The parts of the format that's common to all versions/kinds of entity.
+ * @public
  */
-export interface NullableEntity {
+export interface Entity {
   /**
    * The relations that this entity has with other entities.
    */
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/EntityAncestryResponse.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityAncestryResponse.model.ts
new file mode 100644
index 0000000000..a94f784f05
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityAncestryResponse.model.ts
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { EntityAncestryResponseItemsInner } from '../models/EntityAncestryResponseItemsInner.model';
+
+/**
+ * @public
+ */
+export interface EntityAncestryResponse {
+  items: Array<EntityAncestryResponseItemsInner>;
+  rootEntityRef: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/EntityAncestryResponseItemsInner.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityAncestryResponseItemsInner.model.ts
new file mode 100644
index 0000000000..40594a1515
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityAncestryResponseItemsInner.model.ts
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { Entity } from '../models/Entity.model';
+
+/**
+ * @public
+ */
+export interface EntityAncestryResponseItemsInner {
+  parentEntityRefs: Array<string>;
+  entity: Entity;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/EntityFacet.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityFacet.model.ts
new file mode 100644
index 0000000000..f0f89f6eae
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityFacet.model.ts
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface EntityFacet {
+  value: string;
+  count: number;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/EntityFacetsResponse.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityFacetsResponse.model.ts
new file mode 100644
index 0000000000..e013f0b5a8
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityFacetsResponse.model.ts
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { EntityFacet } from '../models/EntityFacet.model';
+
+/**
+ * @public
+ */
+export interface EntityFacetsResponse {
+  facets: { [key: string]: Array<EntityFacet> };
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/EntityLink.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityLink.model.ts
new file mode 100644
index 0000000000..53d7d1f9ff
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityLink.model.ts
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * A link to external information that is related to the entity.
+ * @public
+ */
+export interface EntityLink {
+  /**
+   * An optional value to categorize links into specific groups
+   */
+  type?: string;
+  /**
+   * An optional semantic key that represents a visual icon.
+   */
+  icon?: string;
+  /**
+   * An optional descriptive title for the link.
+   */
+  title?: string;
+  /**
+   * The url to the external site, document, etc.
+   */
+  url: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/EntityMeta.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityMeta.model.ts
new file mode 100644
index 0000000000..cc8dd555a6
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityMeta.model.ts
@@ -0,0 +1,69 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { EntityLink } from '../models/EntityLink.model';
+
+/**
+ * Metadata fields common to all versions/kinds of entity.
+ * @public
+ */
+export interface EntityMeta {
+  [key: string]: any;
+
+  /**
+   * A list of external hyperlinks related to the entity.
+   */
+  links?: Array<EntityLink>;
+  /**
+   * A list of single-valued strings, to for example classify catalog entities in various ways.
+   */
+  tags?: Array<string>;
+  /**
+   * Construct a type with a set of properties K of type T
+   */
+  annotations?: { [key: string]: string };
+  /**
+   * Construct a type with a set of properties K of type T
+   */
+  labels?: { [key: string]: string };
+  /**
+   * A short (typically relatively few words, on one line) description of the entity.
+   */
+  description?: string;
+  /**
+   * A display name of the entity, to be presented in user interfaces instead of the `name` property above, when available. This field is sometimes useful when the `name` is cumbersome or ends up being perceived as overly technical. The title generally does not have as stringent format requirements on it, so it may contain special characters and be more explanatory. Do keep it very short though, and avoid situations where a title can be confused with the name of another entity, or where two entities share a title. Note that this is only for display purposes, and may be ignored by some parts of the code. Entity references still always make use of the `name` property, not the title.
+   */
+  title?: string;
+  /**
+   * The namespace that the entity belongs to.
+   */
+  namespace?: string;
+  /**
+   * The name of the entity. Must be unique within the catalog at any given point in time, for any given namespace + kind pair. This value is part of the technical identifier of the entity, and as such it will appear in URLs, database tables, entity references, and similar. It is subject to restrictions regarding what characters are allowed. If you want to use a different, more human readable string with fewer restrictions on it in user interfaces, see the `title` field below.
+   */
+  name: string;
+  /**
+   * An opaque string that changes for each update operation to any part of the entity, including metadata. This field can not be set by the user at creation time, and the server will reject an attempt to do so. The field will be populated in read operations. The field can (optionally) be specified when performing update or delete operations, and the server will then reject the operation if it does not match the current stored value.
+   */
+  etag?: string;
+  /**
+   * A globally unique ID for the entity. This field can not be set by the user at creation time, and the server will reject an attempt to do so. The field will be populated in read operations. The field can (optionally) be specified when performing update or delete operations, but the server is free to reject requests that do so in such a way that it breaks semantics.
+   */
+  uid?: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/EntityRelation.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityRelation.model.ts
new file mode 100644
index 0000000000..fe98a84481
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityRelation.model.ts
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * A relation of a specific type to another entity in the catalog.
+ * @public
+ */
+export interface EntityRelation {
+  /**
+   * The entity ref of the target of this relation.
+   */
+  targetRef: string;
+  /**
+   * The type of the relation.
+   */
+  type: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/ErrorError.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/ErrorError.model.ts
new file mode 100644
index 0000000000..fe5811628d
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/ErrorError.model.ts
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface ErrorError {
+  name: string;
+  message: string;
+  stack?: string;
+  code?: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/ErrorRequest.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/ErrorRequest.model.ts
new file mode 100644
index 0000000000..d44dcb66d9
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/ErrorRequest.model.ts
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface ErrorRequest {
+  method: string;
+  url: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/ErrorResponse.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/ErrorResponse.model.ts
new file mode 100644
index 0000000000..91c120483d
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/ErrorResponse.model.ts
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface ErrorResponse {
+  statusCode: number;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/GetEntitiesByRefsRequest.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/GetEntitiesByRefsRequest.model.ts
new file mode 100644
index 0000000000..9160f0823b
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/GetEntitiesByRefsRequest.model.ts
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface GetEntitiesByRefsRequest {
+  entityRefs: Array<string>;
+  fields?: Array<string>;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/GetLocations200ResponseInner.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/GetLocations200ResponseInner.model.ts
new file mode 100644
index 0000000000..a9f1af1c53
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/GetLocations200ResponseInner.model.ts
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { Location } from '../models/Location.model';
+
+/**
+ * @public
+ */
+export interface GetLocations200ResponseInner {
+  data: Location;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/Location.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/Location.model.ts
new file mode 100644
index 0000000000..d7e4a22de4
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/Location.model.ts
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * Entity location for a specific entity.
+ * @public
+ */
+export interface Location {
+  target: string;
+  type: string;
+  id: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/LocationInput.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/LocationInput.model.ts
new file mode 100644
index 0000000000..9cdc4c2c13
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/LocationInput.model.ts
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface LocationInput {
+  type: string;
+  target: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/LocationSpec.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/LocationSpec.model.ts
new file mode 100644
index 0000000000..1d56d8f3b0
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/LocationSpec.model.ts
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * Holds the entity location information.
+ * @public
+ */
+export interface LocationSpec {
+  target: string;
+  type: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/ModelError.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/ModelError.model.ts
new file mode 100644
index 0000000000..5526d703e6
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/ModelError.model.ts
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { ErrorError } from '../models/ErrorError.model';
+import { ErrorRequest } from '../models/ErrorRequest.model';
+import { ErrorResponse } from '../models/ErrorResponse.model';
+
+/**
+ * @public
+ */
+export interface ModelError {
+  [key: string]: any;
+
+  error: ErrorError;
+  request?: ErrorRequest;
+  response: ErrorResponse;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/NullableEntity.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/NullableEntity.model.ts
new file mode 100644
index 0000000000..aa6135ded4
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/NullableEntity.model.ts
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { EntityMeta } from '../models/EntityMeta.model';
+import { EntityRelation } from '../models/EntityRelation.model';
+
+/**
+ * The parts of the format that's common to all versions/kinds of entity.
+ * @public
+ */
+export type NullableEntity = {
+  /**
+   * The relations that this entity has with other entities.
+   */
+  relations?: Array<EntityRelation>;
+  /**
+   * A type representing all allowed JSON object values.
+   */
+  spec?: { [key: string]: any };
+  metadata: EntityMeta;
+  /**
+   * The high level entity type being described.
+   */
+  kind: string;
+  /**
+   * The version of specification format for this particular entity that this is written against.
+   */
+  apiVersion: string;
+} | null;
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/RecursivePartialEntity.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/RecursivePartialEntity.model.ts
new file mode 100644
index 0000000000..b3913ccd85
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/RecursivePartialEntity.model.ts
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { RecursivePartialEntityMeta } from '../models/RecursivePartialEntityMeta.model';
+import { RecursivePartialEntityRelation } from '../models/RecursivePartialEntityRelation.model';
+
+/**
+ * Makes all keys of an entire hierarchy optional.
+ * @public
+ */
+export interface RecursivePartialEntity {
+  /**
+   * The version of specification format for this particular entity that this is written against.
+   */
+  apiVersion?: string;
+  /**
+   * The high level entity type being described.
+   */
+  kind?: string;
+  metadata?: RecursivePartialEntityMeta;
+  /**
+   * A type representing all allowed JSON object values.
+   */
+  spec?: { [key: string]: any };
+  /**
+   * The relations that this entity has with other entities.
+   */
+  relations?: Array<RecursivePartialEntityRelation>;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/RecursivePartialEntityMeta.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/RecursivePartialEntityMeta.model.ts
new file mode 100644
index 0000000000..df5ce3811b
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/RecursivePartialEntityMeta.model.ts
@@ -0,0 +1,66 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { EntityLink } from '../models/EntityLink.model';
+
+/**
+ * @public
+ */
+export interface RecursivePartialEntityMeta {
+  /**
+   * A list of external hyperlinks related to the entity.
+   */
+  links?: Array<EntityLink>;
+  /**
+   * A list of single-valued strings, to for example classify catalog entities in various ways.
+   */
+  tags?: Array<string>;
+  /**
+   * Construct a type with a set of properties K of type T
+   */
+  annotations?: { [key: string]: string };
+  /**
+   * Construct a type with a set of properties K of type T
+   */
+  labels?: { [key: string]: string };
+  /**
+   * A short (typically relatively few words, on one line) description of the entity.
+   */
+  description?: string;
+  /**
+   * A display name of the entity, to be presented in user interfaces instead of the `name` property above, when available. This field is sometimes useful when the `name` is cumbersome or ends up being perceived as overly technical. The title generally does not have as stringent format requirements on it, so it may contain special characters and be more explanatory. Do keep it very short though, and avoid situations where a title can be confused with the name of another entity, or where two entities share a title. Note that this is only for display purposes, and may be ignored by some parts of the code. Entity references still always make use of the `name` property, not the title.
+   */
+  title?: string;
+  /**
+   * The namespace that the entity belongs to.
+   */
+  namespace?: string;
+  /**
+   * The name of the entity. Must be unique within the catalog at any given point in time, for any given namespace + kind pair. This value is part of the technical identifier of the entity, and as such it will appear in URLs, database tables, entity references, and similar. It is subject to restrictions regarding what characters are allowed. If you want to use a different, more human readable string with fewer restrictions on it in user interfaces, see the `title` field below.
+   */
+  name?: string;
+  /**
+   * An opaque string that changes for each update operation to any part of the entity, including metadata. This field can not be set by the user at creation time, and the server will reject an attempt to do so. The field will be populated in read operations. The field can (optionally) be specified when performing update or delete operations, and the server will then reject the operation if it does not match the current stored value.
+   */
+  etag?: string;
+  /**
+   * A globally unique ID for the entity. This field can not be set by the user at creation time, and the server will reject an attempt to do so. The field will be populated in read operations. The field can (optionally) be specified when performing update or delete operations, but the server is free to reject requests that do so in such a way that it breaks semantics.
+   */
+  uid?: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/RecursivePartialEntityMetaAllOf.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/RecursivePartialEntityMetaAllOf.model.ts
new file mode 100644
index 0000000000..6598f8df96
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/RecursivePartialEntityMetaAllOf.model.ts
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { EntityLink } from '../models/EntityLink.model';
+
+/**
+ * Metadata fields common to all versions/kinds of entity.
+ * @public
+ */
+export interface RecursivePartialEntityMetaAllOf {
+  /**
+   * A list of external hyperlinks related to the entity.
+   */
+  links?: Array<EntityLink>;
+  /**
+   * A list of single-valued strings, to for example classify catalog entities in various ways.
+   */
+  tags?: Array<string>;
+  /**
+   * Construct a type with a set of properties K of type T
+   */
+  annotations?: { [key: string]: string };
+  /**
+   * Construct a type with a set of properties K of type T
+   */
+  labels?: { [key: string]: string };
+  /**
+   * A short (typically relatively few words, on one line) description of the entity.
+   */
+  description?: string;
+  /**
+   * A display name of the entity, to be presented in user interfaces instead of the `name` property above, when available. This field is sometimes useful when the `name` is cumbersome or ends up being perceived as overly technical. The title generally does not have as stringent format requirements on it, so it may contain special characters and be more explanatory. Do keep it very short though, and avoid situations where a title can be confused with the name of another entity, or where two entities share a title. Note that this is only for display purposes, and may be ignored by some parts of the code. Entity references still always make use of the `name` property, not the title.
+   */
+  title?: string;
+  /**
+   * The namespace that the entity belongs to.
+   */
+  namespace?: string;
+  /**
+   * The name of the entity. Must be unique within the catalog at any given point in time, for any given namespace + kind pair. This value is part of the technical identifier of the entity, and as such it will appear in URLs, database tables, entity references, and similar. It is subject to restrictions regarding what characters are allowed. If you want to use a different, more human readable string with fewer restrictions on it in user interfaces, see the `title` field below.
+   */
+  name?: string;
+  /**
+   * An opaque string that changes for each update operation to any part of the entity, including metadata. This field can not be set by the user at creation time, and the server will reject an attempt to do so. The field will be populated in read operations. The field can (optionally) be specified when performing update or delete operations, and the server will then reject the operation if it does not match the current stored value.
+   */
+  etag?: string;
+  /**
+   * A globally unique ID for the entity. This field can not be set by the user at creation time, and the server will reject an attempt to do so. The field will be populated in read operations. The field can (optionally) be specified when performing update or delete operations, but the server is free to reject requests that do so in such a way that it breaks semantics.
+   */
+  uid?: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/RecursivePartialEntityRelation.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/RecursivePartialEntityRelation.model.ts
new file mode 100644
index 0000000000..9c7dafb534
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/RecursivePartialEntityRelation.model.ts
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * A relation of a specific type to another entity in the catalog.
+ * @public
+ */
+export interface RecursivePartialEntityRelation {
+  /**
+   * The entity ref of the target of this relation.
+   */
+  targetRef?: string;
+  /**
+   * The type of the relation.
+   */
+  type?: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/RefreshEntityRequest.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/RefreshEntityRequest.model.ts
new file mode 100644
index 0000000000..617f35288b
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/RefreshEntityRequest.model.ts
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * Options for requesting a refresh of entities in the catalog.
+ * @public
+ */
+export interface RefreshEntityRequest {
+  authorizationToken?: string;
+  /**
+   * The reference to a single entity that should be refreshed
+   */
+  entityRef: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/ValidateEntity400Response.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/ValidateEntity400Response.model.ts
new file mode 100644
index 0000000000..fac9525afa
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/ValidateEntity400Response.model.ts
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { ValidateEntity400ResponseErrorsInner } from '../models/ValidateEntity400ResponseErrorsInner.model';
+
+/**
+ * @public
+ */
+export interface ValidateEntity400Response {
+  errors: Array<ValidateEntity400ResponseErrorsInner>;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/ValidateEntity400ResponseErrorsInner.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/ValidateEntity400ResponseErrorsInner.model.ts
new file mode 100644
index 0000000000..8718d7938d
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/ValidateEntity400ResponseErrorsInner.model.ts
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface ValidateEntity400ResponseErrorsInner {
+  [key: string]: any;
+
+  name: string;
+  message: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/ValidateEntityRequest.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/ValidateEntityRequest.model.ts
new file mode 100644
index 0000000000..c3be04818d
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/ValidateEntityRequest.model.ts
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface ValidateEntityRequest {
+  location: string;
+  entity: { [key: string]: any };
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/index.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/index.ts
new file mode 100644
index 0000000000..d6c81becb5
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/index.ts
@@ -0,0 +1,52 @@
+/*
+ * 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 '../models/AnalyzeLocationEntityField.model';
+export * from '../models/AnalyzeLocationExistingEntity.model';
+export * from '../models/AnalyzeLocationGenerateEntity.model';
+export * from '../models/AnalyzeLocationRequest.model';
+export * from '../models/AnalyzeLocationResponse.model';
+export * from '../models/CreateLocation201Response.model';
+export * from '../models/CreateLocationRequest.model';
+export * from '../models/EntitiesBatchResponse.model';
+export * from '../models/EntitiesQueryResponse.model';
+export * from '../models/EntitiesQueryResponsePageInfo.model';
+export * from '../models/Entity.model';
+export * from '../models/EntityAncestryResponse.model';
+export * from '../models/EntityAncestryResponseItemsInner.model';
+export * from '../models/EntityFacet.model';
+export * from '../models/EntityFacetsResponse.model';
+export * from '../models/EntityLink.model';
+export * from '../models/EntityMeta.model';
+export * from '../models/EntityRelation.model';
+export * from '../models/ErrorError.model';
+export * from '../models/ErrorRequest.model';
+export * from '../models/ErrorResponse.model';
+export * from '../models/GetEntitiesByRefsRequest.model';
+export * from '../models/GetLocations200ResponseInner.model';
+export * from '../models/Location.model';
+export * from '../models/LocationInput.model';
+export * from '../models/LocationSpec.model';
+export * from '../models/ModelError.model';
+export * from '../models/NullableEntity.model';
+export * from '../models/RecursivePartialEntity.model';
+export * from '../models/RecursivePartialEntityMeta.model';
+export * from '../models/RecursivePartialEntityMetaAllOf.model';
+export * from '../models/RecursivePartialEntityRelation.model';
+export * from '../models/RefreshEntityRequest.model';
+export * from '../models/ValidateEntity400Response.model';
+export * from '../models/ValidateEntity400ResponseErrorsInner.model';
+export * from '../models/ValidateEntityRequest.model';
diff --git a/plugins/catalog-backend/src/schema/openapi.generated.ts b/plugins/catalog-backend/src/schema/openapi/generated/router.ts
similarity index 99%
rename from plugins/catalog-backend/src/schema/openapi.generated.ts
rename to plugins/catalog-backend/src/schema/openapi/generated/router.ts
index f3bd46c05c..8712625653 100644
--- a/plugins/catalog-backend/src/schema/openapi.generated.ts
+++ b/plugins/catalog-backend/src/schema/openapi/generated/router.ts
@@ -17,7 +17,8 @@
 // ******************************************************************
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
-import { createValidatedOpenApiRouter } from '@backstage/backend-openapi-utils';
+import { createValidatedOpenApiRouterFromGeneratedEndpointMap } from '@backstage/backend-openapi-utils';
+import { EndpointMap } from './';
 
 export const spec = {
   openapi: '3.0.3',
@@ -1602,5 +1603,11 @@ export const spec = {
   },
 } as const;
 export const createOpenApiRouter = async (
-  options?: Parameters<typeof createValidatedOpenApiRouter>['1'],
-) => createValidatedOpenApiRouter<typeof spec>(spec, options);
+  options?: Parameters<
+    typeof createValidatedOpenApiRouterFromGeneratedEndpointMap
+  >['1'],
+) =>
+  createValidatedOpenApiRouterFromGeneratedEndpointMap<EndpointMap>(
+    spec,
+    options,
+  );
diff --git a/plugins/catalog-backend/src/schema/openapi/index.ts b/plugins/catalog-backend/src/schema/openapi/index.ts
new file mode 100644
index 0000000000..db98243cbf
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/index.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/plugins/catalog-backend/src/service/createRouter.ts b/plugins/catalog-backend/src/service/createRouter.ts
index 4a89cfc6cb..9b62d1318d 100644
--- a/plugins/catalog-backend/src/service/createRouter.ts
+++ b/plugins/catalog-backend/src/service/createRouter.ts
@@ -46,7 +46,7 @@ import {
   locationInput,
   validateRequestBody,
 } from './util';
-import { createOpenApiRouter } from '../schema/openapi.generated';
+import { createOpenApiRouter } from '../schema/openapi';
 import { parseEntityPaginationParams } from './request/parseEntityPaginationParams';
 import {
   AuthService,
diff --git a/plugins/catalog-backend/src/service/request/parseQueryEntitiesParams.ts b/plugins/catalog-backend/src/service/request/parseQueryEntitiesParams.ts
index 919e97a1f7..aef28c0b32 100644
--- a/plugins/catalog-backend/src/service/request/parseQueryEntitiesParams.ts
+++ b/plugins/catalog-backend/src/service/request/parseQueryEntitiesParams.ts
@@ -23,11 +23,10 @@ import { decodeCursor } from '../util';
 import { parseEntityFilterParams } from './parseEntityFilterParams';
 import { parseEntityOrderFieldParams } from './parseEntityOrderFieldParams';
 import { parseEntityTransformParams } from './parseEntityTransformParams';
-import { spec } from '../../schema/openapi.generated';
-import { internal } from '@backstage/backend-openapi-utils';
+import { GetEntitiesByQuery } from '../../schema/openapi';
 
 export function parseQueryEntitiesParams(
-  params: internal.QuerySchema<typeof spec, '/entities/by-query', 'get'>,
+  params: GetEntitiesByQuery['query'],
 ): Omit<QueryEntitiesRequest, 'credentials' | 'limit'> {
   const fields = parseEntityTransformParams(params);
 
diff --git a/plugins/search-backend/src/schema/openapi/generated/apis/DefaultApi.server.ts b/plugins/search-backend/src/schema/openapi/generated/apis/DefaultApi.server.ts
new file mode 100644
index 0000000000..5d228b9f84
--- /dev/null
+++ b/plugins/search-backend/src/schema/openapi/generated/apis/DefaultApi.server.ts
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { Query200Response } from '../models/Query200Response.model';
+
+/**
+ * @public
+ */
+export type Query = {
+  query: {
+    term?: string;
+    filters?: { [key: string]: any };
+    types?: Array<string>;
+    pageCursor?: string;
+    pageLimit?: number;
+  };
+  response: Query200Response | Error;
+};
+
+/**
+ * no description
+ */
+
+export type EndpointMap = {
+  '#get|/query': Query;
+};
diff --git a/plugins/search-backend/src/schema/openapi/generated/apis/index.ts b/plugins/search-backend/src/schema/openapi/generated/apis/index.ts
new file mode 100644
index 0000000000..79855a6fc8
--- /dev/null
+++ b/plugins/search-backend/src/schema/openapi/generated/apis/index.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 './DefaultApi.server';
diff --git a/plugins/search-backend/src/schema/openapi/generated/index.ts b/plugins/search-backend/src/schema/openapi/generated/index.ts
new file mode 100644
index 0000000000..69c39313c6
--- /dev/null
+++ b/plugins/search-backend/src/schema/openapi/generated/index.ts
@@ -0,0 +1,18 @@
+/*
+ * 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 './apis';
+export * from './router';
diff --git a/plugins/search-backend/src/schema/openapi/generated/models/ErrorError.model.ts b/plugins/search-backend/src/schema/openapi/generated/models/ErrorError.model.ts
new file mode 100644
index 0000000000..0a51c67fef
--- /dev/null
+++ b/plugins/search-backend/src/schema/openapi/generated/models/ErrorError.model.ts
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface ErrorError {
+  name: string;
+  message: string;
+}
diff --git a/plugins/search-backend/src/schema/openapi/generated/models/ErrorRequest.model.ts b/plugins/search-backend/src/schema/openapi/generated/models/ErrorRequest.model.ts
new file mode 100644
index 0000000000..d44dcb66d9
--- /dev/null
+++ b/plugins/search-backend/src/schema/openapi/generated/models/ErrorRequest.model.ts
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface ErrorRequest {
+  method: string;
+  url: string;
+}
diff --git a/plugins/search-backend/src/schema/openapi/generated/models/ErrorResponse.model.ts b/plugins/search-backend/src/schema/openapi/generated/models/ErrorResponse.model.ts
new file mode 100644
index 0000000000..91c120483d
--- /dev/null
+++ b/plugins/search-backend/src/schema/openapi/generated/models/ErrorResponse.model.ts
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface ErrorResponse {
+  statusCode: number;
+}
diff --git a/plugins/search-backend/src/schema/openapi/generated/models/ModelError.model.ts b/plugins/search-backend/src/schema/openapi/generated/models/ModelError.model.ts
new file mode 100644
index 0000000000..3e6af947ec
--- /dev/null
+++ b/plugins/search-backend/src/schema/openapi/generated/models/ModelError.model.ts
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { ErrorError } from '../models/ErrorError.model';
+import { ErrorRequest } from '../models/ErrorRequest.model';
+import { ErrorResponse } from '../models/ErrorResponse.model';
+
+/**
+ * @public
+ */
+export interface ModelError {
+  error: ErrorError;
+  request: ErrorRequest;
+  response: ErrorResponse;
+}
diff --git a/plugins/search-backend/src/schema/openapi/generated/models/Query200Response.model.ts b/plugins/search-backend/src/schema/openapi/generated/models/Query200Response.model.ts
new file mode 100644
index 0000000000..8ddb2a0b63
--- /dev/null
+++ b/plugins/search-backend/src/schema/openapi/generated/models/Query200Response.model.ts
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { Query200ResponseResultsInner } from '../models/Query200ResponseResultsInner.model';
+
+/**
+ * @public
+ */
+export interface Query200Response {
+  results: Array<Query200ResponseResultsInner>;
+  nextPageCursor?: string;
+  previousPageCursor?: string;
+  numberOfResults?: number;
+}
diff --git a/plugins/search-backend/src/schema/openapi/generated/models/Query200ResponseResultsInner.model.ts b/plugins/search-backend/src/schema/openapi/generated/models/Query200ResponseResultsInner.model.ts
new file mode 100644
index 0000000000..ec635c8e5b
--- /dev/null
+++ b/plugins/search-backend/src/schema/openapi/generated/models/Query200ResponseResultsInner.model.ts
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { Query200ResponseResultsInnerDocument } from '../models/Query200ResponseResultsInnerDocument.model';
+
+/**
+ * @public
+ */
+export interface Query200ResponseResultsInner {
+  /**
+   * The \"type\" of the given document.
+   */
+  type: string;
+  document: Query200ResponseResultsInnerDocument;
+  /**
+   * Optional result highlight. Useful for improving the search result display/experience.
+   */
+  highlight?: any;
+  /**
+   * Optional result rank, where 1 is the first/top result returned.  Useful for understanding search effectiveness in analytics.
+   */
+  rank?: number;
+}
diff --git a/plugins/search-backend/src/schema/openapi/generated/models/Query200ResponseResultsInnerDocument.model.ts b/plugins/search-backend/src/schema/openapi/generated/models/Query200ResponseResultsInnerDocument.model.ts
new file mode 100644
index 0000000000..9e82274aa7
--- /dev/null
+++ b/plugins/search-backend/src/schema/openapi/generated/models/Query200ResponseResultsInnerDocument.model.ts
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * The raw value of the document, as indexed.
+ * @public
+ */
+export interface Query200ResponseResultsInnerDocument {
+  /**
+   * The primary name of the document (e.g. name, title, identifier, etc).
+   */
+  title?: string;
+  /**
+   * Free-form text of the document (e.g. description, content, etc).
+   */
+  text?: string;
+  /**
+   * The relative or absolute URL of the document (target when a search result is clicked).
+   */
+  location?: string;
+}
diff --git a/plugins/search-backend/src/schema/openapi/generated/models/index.ts b/plugins/search-backend/src/schema/openapi/generated/models/index.ts
new file mode 100644
index 0000000000..d38087bf8c
--- /dev/null
+++ b/plugins/search-backend/src/schema/openapi/generated/models/index.ts
@@ -0,0 +1,23 @@
+/*
+ * 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 '../models/ErrorError.model';
+export * from '../models/ErrorRequest.model';
+export * from '../models/ErrorResponse.model';
+export * from '../models/ModelError.model';
+export * from '../models/Query200Response.model';
+export * from '../models/Query200ResponseResultsInner.model';
+export * from '../models/Query200ResponseResultsInnerDocument.model';
diff --git a/plugins/search-backend/src/schema/openapi.generated.ts b/plugins/search-backend/src/schema/openapi/generated/router.ts
similarity index 95%
rename from plugins/search-backend/src/schema/openapi.generated.ts
rename to plugins/search-backend/src/schema/openapi/generated/router.ts
index 1e6adfb08f..8d55dfeef2 100644
--- a/plugins/search-backend/src/schema/openapi.generated.ts
+++ b/plugins/search-backend/src/schema/openapi/generated/router.ts
@@ -17,7 +17,8 @@
 // ******************************************************************
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
-import { createValidatedOpenApiRouter } from '@backstage/backend-openapi-utils';
+import { createValidatedOpenApiRouterFromGeneratedEndpointMap } from '@backstage/backend-openapi-utils';
+import { EndpointMap } from './';
 
 export const spec = {
   openapi: '3.0.3',
@@ -261,5 +262,11 @@ export const spec = {
   },
 } as const;
 export const createOpenApiRouter = async (
-  options?: Parameters<typeof createValidatedOpenApiRouter>['1'],
-) => createValidatedOpenApiRouter<typeof spec>(spec, options);
+  options?: Parameters<
+    typeof createValidatedOpenApiRouterFromGeneratedEndpointMap
+  >['1'],
+) =>
+  createValidatedOpenApiRouterFromGeneratedEndpointMap<EndpointMap>(
+    spec,
+    options,
+  );
diff --git a/plugins/search-backend/src/schema/openapi/index.ts b/plugins/search-backend/src/schema/openapi/index.ts
new file mode 100644
index 0000000000..db98243cbf
--- /dev/null
+++ b/plugins/search-backend/src/schema/openapi/index.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/plugins/search-backend/src/service/router.ts b/plugins/search-backend/src/service/router.ts
index 9c22290a63..ab2d929ec1 100644
--- a/plugins/search-backend/src/service/router.ts
+++ b/plugins/search-backend/src/service/router.ts
@@ -32,7 +32,7 @@ import {
 } from '@backstage/plugin-search-common';
 import { SearchEngine } from '@backstage/plugin-search-backend-node';
 import { AuthorizedSearchEngine } from './AuthorizedSearchEngine';
-import { createOpenApiRouter } from '../schema/openapi.generated';
+import { createOpenApiRouter } from '../schema/openapi';
 import {
   AuthService,
   DiscoveryService,