diff --git a/.changeset/dull-wombats-stare.md b/.changeset/dull-wombats-stare.md
new file mode 100644
index 0000000000..36ba412c02
--- /dev/null
+++ b/.changeset/dull-wombats-stare.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-openapi-utils': patch
+---
+
+Adjusted README accordingly after the generated output now has a `.generated.ts` extension
diff --git a/.changeset/fresh-moons-unite.md b/.changeset/fresh-moons-unite.md
new file mode 100644
index 0000000000..3d3af7e698
--- /dev/null
+++ b/.changeset/fresh-moons-unite.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Adjusted the OpenAPI schema file name according to the new structure
diff --git a/.changeset/healthy-ladybugs-chew.md b/.changeset/healthy-ladybugs-chew.md
new file mode 100644
index 0000000000..83f53d5c2c
--- /dev/null
+++ b/.changeset/healthy-ladybugs-chew.md
@@ -0,0 +1,5 @@
+---
+'@backstage/repo-tools': minor
+---
+
+Generated OpenAPI files now have a `.generated.ts` file name and a warning header at the top, to highlight that they should not be edited by hand.
diff --git a/plugins/catalog-backend/src/service/createRouter.ts b/plugins/catalog-backend/src/service/createRouter.ts
index 35a6426ae8..5ac1f2eda7 100644
--- a/plugins/catalog-backend/src/service/createRouter.ts
+++ b/plugins/catalog-backend/src/service/createRouter.ts
@@ -51,7 +51,7 @@ import {
   validateRequestBody,
 } from './util';
 import type { ApiRouter } from '@backstage/backend-openapi-utils';
-import spec from '../schema/openapi';
+import spec from '../schema/openapi.generated';
 import { PluginTaskScheduler } from '@backstage/backend-tasks';
 
 /**