diff --git a/packages/@aws-cdk/cli-lib-alpha/.projen/tasks.json b/packages/@aws-cdk/cli-lib-alpha/.projen/tasks.json
index 2ad251abc..89b7f84ba 100644
--- a/packages/@aws-cdk/cli-lib-alpha/.projen/tasks.json
+++ b/packages/@aws-cdk/cli-lib-alpha/.projen/tasks.json
@@ -157,10 +157,6 @@
         {
           "spawn": "package:js",
           "condition": "node -e \"if (!process.env.CI) process.exit(1)\""
-        },
-        {
-          "spawn": "package-all",
-          "condition": "node -e \"if (process.env.CI) process.exit(1)\""
         }
       ]
     },
diff --git a/packages/@aws-cdk/cloud-assembly-schema/.projen/tasks.json b/packages/@aws-cdk/cloud-assembly-schema/.projen/tasks.json
index 99d5d5580..38def4c17 100644
--- a/packages/@aws-cdk/cloud-assembly-schema/.projen/tasks.json
+++ b/packages/@aws-cdk/cloud-assembly-schema/.projen/tasks.json
@@ -148,10 +148,6 @@
         {
           "spawn": "package:js",
           "condition": "node -e \"if (!process.env.CI) process.exit(1)\""
-        },
-        {
-          "spawn": "package-all",
-          "condition": "node -e \"if (process.env.CI) process.exit(1)\""
         }
       ]
     },
diff --git a/packages/aws-cdk/test/cli/cdk-toolkit.test.ts b/packages/aws-cdk/test/cli/cdk-toolkit.test.ts
index 78eb695f3..2c3e01bd7 100644
--- a/packages/aws-cdk/test/cli/cdk-toolkit.test.ts
+++ b/packages/aws-cdk/test/cli/cdk-toolkit.test.ts
@@ -1765,7 +1765,7 @@ class FakeCloudFormation extends Deployments {
 }
 
 function cliTest(name: string, handler: (dir: string) => void | Promise<any>): void {
-  test(name, () => withTempDir(handler));
+  test(name, () => withTempDir(handler), 120000);
 }
 
 async function withTempDir(cb: (dir: string) => void | Promise<any>) {
diff --git a/projenrc/jsii.ts b/projenrc/jsii.ts
index 589c2ff3b..6b5571540 100644
--- a/projenrc/jsii.ts
+++ b/projenrc/jsii.ts
@@ -215,10 +215,15 @@ export class JsiiBuild extends pj.Component {
       // Only run in CI
       condition: 'node -e "if (!process.env.CI) process.exit(1)"',
     });
+
+    // Do not spawn 'package-all' automatically as part of 'package', the jsii packaging will
+    // be done as part of the release task.
+    /*
     tsProject.packageTask.spawn(this.packageAllTask, {
       // Don't run in CI
       condition: 'node -e "if (process.env.CI) process.exit(1)"',
     });
+    */
 
     const targets: Record<string, any> = {};