diff --git a/packages/repo-tools/package.json b/packages/repo-tools/package.json
index 991dcbd7af..7a7e56d68c 100644
--- a/packages/repo-tools/package.json
+++ b/packages/repo-tools/package.json
@@ -87,7 +87,8 @@
   "files": [
     "bin",
     "dist/**/*.js",
-    "templates"
+    "templates",
+    "openapitools.json"
   ],
   "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 8d85e9cd67..f827f1005f 100644
--- a/packages/repo-tools/src/commands/openapi/client/generate.ts
+++ b/packages/repo-tools/src/commands/openapi/client/generate.ts
@@ -51,16 +51,12 @@ async function generate(spec: string, outputDirectory: string) {
         '@backstage/repo-tools',
         'templates/typescript-backstage.yaml',
       ),
-      '-t',
-      resolvePackagePath(
-        '@backstage/repo-tools',
-        'templates/typescript-backstage',
-      ),
       '--generator-key',
       'v3.0',
     ],
     {
       maxBuffer: Number.MAX_VALUE,
+      cwd: resolvePackagePath('@backstage/repo-tools'),
       env: {
         ...process.env,
       },
diff --git a/packages/repo-tools/templates/typescript-backstage.yaml b/packages/repo-tools/templates/typescript-backstage.yaml
index 310a21e75a..cda9a48a76 100644
--- a/packages/repo-tools/templates/typescript-backstage.yaml
+++ b/packages/repo-tools/templates/typescript-backstage.yaml
@@ -1,3 +1,5 @@
+templateDir: templates/typescript-backstage
+
 files:
   api.mustache:
     templateType: API