diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6fc94dcdc..242b380fd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -186,7 +186,7 @@ jobs:
       - name: Install Dependencies
         run: cd .repo && yarn install --check-files --frozen-lockfile
       - name: Extract build artifact
-        run: tar --strip-components=1 -xzvf dist/js/*.tgz -C .repo
+        run: tar --strip-components=1 -xzvf dist/js/*.tgz -C .repo/packages/@aws-cdk/cloud-assembly-schema
       - name: Move build artifact out of the way
         run: mv dist dist.old
       - name: Create js artifact
@@ -230,7 +230,7 @@ jobs:
       - name: Install Dependencies
         run: cd .repo && yarn install --check-files --frozen-lockfile
       - name: Extract build artifact
-        run: tar --strip-components=1 -xzvf dist/js/*.tgz -C .repo
+        run: tar --strip-components=1 -xzvf dist/js/*.tgz -C .repo/packages/@aws-cdk/cloud-assembly-schema
       - name: Move build artifact out of the way
         run: mv dist dist.old
       - name: Create java artifact
@@ -275,7 +275,7 @@ jobs:
       - name: Install Dependencies
         run: cd .repo && yarn install --check-files --frozen-lockfile
       - name: Extract build artifact
-        run: tar --strip-components=1 -xzvf dist/js/*.tgz -C .repo
+        run: tar --strip-components=1 -xzvf dist/js/*.tgz -C .repo/packages/@aws-cdk/cloud-assembly-schema
       - name: Move build artifact out of the way
         run: mv dist dist.old
       - name: Create python artifact
@@ -316,7 +316,7 @@ jobs:
       - name: Install Dependencies
         run: cd .repo && yarn install --check-files --frozen-lockfile
       - name: Extract build artifact
-        run: tar --strip-components=1 -xzvf dist/js/*.tgz -C .repo
+        run: tar --strip-components=1 -xzvf dist/js/*.tgz -C .repo/packages/@aws-cdk/cloud-assembly-schema
       - name: Move build artifact out of the way
         run: mv dist dist.old
       - name: Create dotnet artifact
@@ -356,7 +356,7 @@ jobs:
       - name: Install Dependencies
         run: cd .repo && yarn install --check-files --frozen-lockfile
       - name: Extract build artifact
-        run: tar --strip-components=1 -xzvf dist/js/*.tgz -C .repo
+        run: tar --strip-components=1 -xzvf dist/js/*.tgz -C .repo/packages/@aws-cdk/cloud-assembly-schema
       - name: Move build artifact out of the way
         run: mv dist dist.old
       - name: Create go artifact
@@ -583,7 +583,7 @@ jobs:
       - name: Install Dependencies
         run: cd .repo && yarn install --check-files --frozen-lockfile
       - name: Extract build artifact
-        run: tar --strip-components=1 -xzvf dist/js/*.tgz -C .repo
+        run: tar --strip-components=1 -xzvf dist/js/*.tgz -C .repo/packages/@aws-cdk/cli-lib-alpha
       - name: Move build artifact out of the way
         run: mv dist dist.old
       - name: Create js artifact
@@ -627,7 +627,7 @@ jobs:
       - name: Install Dependencies
         run: cd .repo && yarn install --check-files --frozen-lockfile
       - name: Extract build artifact
-        run: tar --strip-components=1 -xzvf dist/js/*.tgz -C .repo
+        run: tar --strip-components=1 -xzvf dist/js/*.tgz -C .repo/packages/@aws-cdk/cli-lib-alpha
       - name: Move build artifact out of the way
         run: mv dist dist.old
       - name: Create java artifact
@@ -671,7 +671,7 @@ jobs:
       - name: Install Dependencies
         run: cd .repo && yarn install --check-files --frozen-lockfile
       - name: Extract build artifact
-        run: tar --strip-components=1 -xzvf dist/js/*.tgz -C .repo
+        run: tar --strip-components=1 -xzvf dist/js/*.tgz -C .repo/packages/@aws-cdk/cli-lib-alpha
       - name: Move build artifact out of the way
         run: mv dist dist.old
       - name: Create python artifact
@@ -712,7 +712,7 @@ jobs:
       - name: Install Dependencies
         run: cd .repo && yarn install --check-files --frozen-lockfile
       - name: Extract build artifact
-        run: tar --strip-components=1 -xzvf dist/js/*.tgz -C .repo
+        run: tar --strip-components=1 -xzvf dist/js/*.tgz -C .repo/packages/@aws-cdk/cli-lib-alpha
       - name: Move build artifact out of the way
         run: mv dist dist.old
       - name: Create dotnet artifact
@@ -752,7 +752,7 @@ jobs:
       - name: Install Dependencies
         run: cd .repo && yarn install --check-files --frozen-lockfile
       - name: Extract build artifact
-        run: tar --strip-components=1 -xzvf dist/js/*.tgz -C .repo
+        run: tar --strip-components=1 -xzvf dist/js/*.tgz -C .repo/packages/@aws-cdk/cli-lib-alpha
       - name: Move build artifact out of the way
         run: mv dist dist.old
       - name: Create go artifact
diff --git a/projenrc/jsii.ts b/projenrc/jsii.ts
index bcd80d9dc..589c2ff3b 100644
--- a/projenrc/jsii.ts
+++ b/projenrc/jsii.ts
@@ -243,12 +243,12 @@ export class JsiiBuild extends pj.Component {
 
     // FIXME: Not support "runsOn" and the workflow container image for now
     const extraJobOptions: Partial<Job> = {
-    /*
-      ...this.getJobRunsOnConfig(options),
-      ...(options.workflowContainerImage
-        ? { container: { image: options.workflowContainerImage } }
-        : {}),
-    */
+      /*
+        ...this.getJobRunsOnConfig(options),
+        ...(options.workflowContainerImage
+          ? { container: { image: options.workflowContainerImage } }
+          : {}),
+      */
     };
 
     const npmjs: NpmPublishOptions = {
@@ -466,10 +466,10 @@ export class JsiiBuild extends pj.Component {
     target: JsiiPacmakTarget,
     packTask: pj.Task,
   ): {
-      publishTools: Tools;
-      bootstrapSteps: Array<Step>;
-      packagingSteps: Array<Step>;
-    } {
+    publishTools: Tools;
+    bootstrapSteps: Array<Step>;
+    packagingSteps: Array<Step>;
+  } {
     const bootstrapSteps: Array<Step> = [];
     const packagingSteps: Array<Step> = [];
 
@@ -496,7 +496,7 @@ export class JsiiBuild extends pj.Component {
       },
       {
         name: 'Extract build artifact',
-        run: `tar --strip-components=1 -xzvf ${this.tsProject.artifactsDirectory}/js/*.tgz -C ${REPO_TEMP_DIRECTORY}`,
+        run: `tar --strip-components=1 -xzvf ${this.tsProject.artifactsDirectory}/js/*.tgz -C ${REPO_TEMP_DIRECTORY}/${this.monoProject.workspaceDirectory}`,
       },
       {
         name: 'Move build artifact out of the way',