diff --git a/.github/actions/cache/action.yml b/.github/actions/cache/action.yml
index 1c7409823af..b215f51ab60 100644
--- a/.github/actions/cache/action.yml
+++ b/.github/actions/cache/action.yml
@@ -136,6 +136,6 @@ runs:
       run: curl -L "https://github.com/google/google-java-format/releases/download/v1.13.0/google-java-format-1.13.0-all-deps.jar" > /tmp/java-formatter.jar
 
     - name: Download openapi generator jar for java (TO REMOVE)
-      if: ${{ inputs.language == 'java' }}
+      if: ${{ inputs.language == 'java' || inputs.job == 'cts' }}
       shell: bash
-      run: curl -L "https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.4.0/openapi-generator-cli-5.3.0.jar" > /tmp/openapi-generator-cli.jar
+      run: curl -L "https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.4.0/openapi-generator-cli-5.4.0.jar" > /tmp/openapi-generator-cli.jar
diff --git a/scripts/common.ts b/scripts/common.ts
index 41dcf7643d9..04cc19c0b44 100644
--- a/scripts/common.ts
+++ b/scripts/common.ts
@@ -15,7 +15,14 @@ export const ROOT_DIR = path.resolve(process.cwd(), '..');
 
 export const GENERATORS = Object.fromEntries(
   Object.entries(openapitools['generator-cli'].generators).map(([key, gen]) => {
-    return [key, { ...gen, ...splitGeneratorKey(key) }];
+    return [
+      key,
+      {
+        ...gen,
+        output: gen.output.replace('#{cwd}/', ''),
+        ...splitGeneratorKey(key),
+      },
+    ];
   })
 );
 
diff --git a/scripts/generate.ts b/scripts/generate.ts
index 35b836e5eed..8a326f5b6ba 100644
--- a/scripts/generate.ts
+++ b/scripts/generate.ts
@@ -10,8 +10,7 @@ async function preGen(
   { language, client, key, output }: Generator,
   verbose?: boolean
 ): Promise<void> {
-  const folder = output.replace('#{cwd}/', '');
-  await runIfExists(`./scripts/pre-gen/${language}.sh`, `${folder} ${key}`, {
+  await runIfExists(`./scripts/pre-gen/${language}.sh`, `${output} ${key}`, {
     verbose,
   });
 
@@ -40,8 +39,7 @@ async function postGen(
   { language, key, output }: Generator,
   verbose?: boolean
 ): Promise<void> {
-  const folder = output.replace('#{cwd}/', '');
-  await runIfExists(`./scripts/post-gen/${language}.sh`, `${folder} ${key}`, {
+  await runIfExists(`./scripts/post-gen/${language}.sh`, `${output} ${key}`, {
     verbose,
   });
 }
@@ -65,7 +63,7 @@ export async function generate(
     spinner.text = `post-gen ${gen.key}`;
     await postGen(gen, verbose);
 
-    if (gen.language === 'javascript' && CI) {
+    if (CI && gen.language === 'javascript') {
       // because the CI is parallelized, run the formatter for each client
       await formatter(gen.language, gen.output, verbose);
     }
@@ -75,9 +73,11 @@ export async function generate(
 
   const langs = [...new Set(generators.map((gen) => gen.language))];
   for (const lang of langs) {
-    if (!CI || lang !== 'javascript') {
+    if (!(CI && lang === 'javascript')) {
       await formatter(lang, getLanguageFolder(lang), verbose);
     }
+
+    // build common packages
     if (lang === 'javascript') {
       const spinner = createSpinner(
         'cleaning JavaScript client utils',