diff --git a/.changeset/four-foxes-juggle.md b/.changeset/four-foxes-juggle.md
new file mode 100644
index 0000000000..13cd5f0937
--- /dev/null
+++ b/.changeset/four-foxes-juggle.md
@@ -0,0 +1,5 @@
+---
+'@backstage/repo-tools': patch
+---
+
+Includes templates in @backstage/repo-tools package and use them in the CLI
diff --git a/packages/repo-tools/package.json b/packages/repo-tools/package.json
index 02119d46c5..991dcbd7af 100644
--- a/packages/repo-tools/package.json
+++ b/packages/repo-tools/package.json
@@ -32,6 +32,7 @@
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.1.0",
     "@apisyouwonthate/style-guide": "^1.4.0",
+    "@backstage/backend-common": "workspace:^",
     "@backstage/catalog-model": "workspace:^",
     "@backstage/cli-common": "workspace:^",
     "@backstage/cli-node": "workspace:^",
@@ -85,7 +86,8 @@
   },
   "files": [
     "bin",
-    "dist/**/*.js"
+    "dist/**/*.js",
+    "templates"
   ],
   "nodemonConfig": {
     "watch": "./src",
diff --git a/packages/repo-tools/src/commands/openapi/client/generate.ts b/packages/repo-tools/src/commands/openapi/client/generate.ts
index baa7845436..5efd4dadd9 100644
--- a/packages/repo-tools/src/commands/openapi/client/generate.ts
+++ b/packages/repo-tools/src/commands/openapi/client/generate.ts
@@ -21,6 +21,7 @@ import { paths as cliPaths } from '../../../lib/paths';
 import { mkdirpSync } from 'fs-extra';
 import fs from 'fs-extra';
 import { exec } from '../../../lib/exec';
+import { resolvePackagePath } from '@backstage/backend-common';
 
 async function generate(spec: string, outputDirectory: string) {
   const resolvedOpenapiPath = resolve(spec);
@@ -47,7 +48,15 @@ async function generate(spec: string, outputDirectory: string) {
       '-g',
       'typescript',
       '-c',
-      'templates/typescript-backstage.yaml',
+      resolvePackagePath(
+        '@backstage/repo-tools',
+        'templates/typescript-backstage.yaml',
+      ),
+      '-t',
+      resolvePackagePath(
+        '@backstage/repo-tools',
+        'templates/typescript-backstage',
+      ),
       '--generator-key',
       'v3.0',
     ],