diff --git a/cli/build.gradle b/cli/build.gradle
index 22c252dae..db0d662d6 100644
--- a/cli/build.gradle
+++ b/cli/build.gradle
@@ -3,7 +3,7 @@ import de.undercouch.gradle.tasks.download.Download
 buildscript {
 	dependencies {
 		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "5.3.0"
-		classpath group: "de.undercouch", name: "gradle-download-task", version: "5.1.0"
+		classpath group: "de.undercouch", name: "gradle-download-task", version: "5.4.0"
 	}
 
 	repositories {
@@ -110,10 +110,10 @@ dependencies {
 	api name: "org.objectweb.asm.tree-6.0.0"
 	api name: "org.objectweb.asm.util-6.0.0"
 
-	bladeExtensions group: "com.liferay.blade", name: "com.liferay.blade.extensions.maven.profile", version: "1.0.36-SNAPSHOT"
-	bladeExtensions group: "com.liferay.blade", name: "com.liferay.project.templates.client.extension", version: "1.0.3-SNAPSHOT"
-	bladeExtensions group: "com.liferay.blade", name: "com.liferay.project.templates.js.theme", version: "1.0.19-SNAPSHOT"
-	bladeExtensions group: "com.liferay.blade", name: "com.liferay.project.templates.js.widget", version: "1.0.20-SNAPSHOT"
+	bladeExtensions group: "com.liferay.blade", name: "com.liferay.blade.extensions.maven.profile", version: "1.0.35-SNAPSHOT"
+	bladeExtensions group: "com.liferay.blade", name: "com.liferay.project.templates.client.extension", version: "1.0.2-SNAPSHOT"
+	bladeExtensions group: "com.liferay.blade", name: "com.liferay.project.templates.js.theme", version: "1.0.18-SNAPSHOT"
+	bladeExtensions group: "com.liferay.blade", name: "com.liferay.project.templates.js.widget", version: "1.0.19-SNAPSHOT"
 
 	compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
 	compileOnly project(":gradle-tooling")
diff --git a/extensions/bad-command/build.gradle b/extensions/bad-command/build.gradle
index 844758086..2a67136f7 100644
--- a/extensions/bad-command/build.gradle
+++ b/extensions/bad-command/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
 	dependencies {
-		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "4.3.0"
-		classpath group: "de.undercouch", name: "gradle-download-task", version: "3.3.0"
+		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "5.3.0"
+		classpath group: "de.undercouch", name: "gradle-download-task", version: "5.4.0"
 	}
 
 	repositories {
@@ -24,6 +24,16 @@ dependencies {
 	compileOnly project(":cli")
 }
 
+compileJava{
+	dependsOn(":cli:unzipPortal")
+	dependsOn(":cli:unzipManifest")
+}
+
+jar{
+	dependsOn(":cli:unzipPortal")
+	dependsOn(":cli:unzipManifest")
+}
+
 test {
 	dependsOn jar
 
diff --git a/extensions/maven-profile/build.gradle b/extensions/maven-profile/build.gradle
index 47925b584..f376ceb88 100644
--- a/extensions/maven-profile/build.gradle
+++ b/extensions/maven-profile/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	dependencies {
-		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "4.3.0"
+		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "5.3.0"
 	}
 
 	repositories {
@@ -44,4 +44,4 @@ publishing {
 	}
 }
 
-version = "1.0.36-SNAPSHOT"
\ No newline at end of file
+version = "1.0.35-SNAPSHOT"
\ No newline at end of file
diff --git a/extensions/project-templates-activator/build.gradle b/extensions/project-templates-activator/build.gradle
index c08da59a0..c9c6d5b7e 100644
--- a/extensions/project-templates-activator/build.gradle
+++ b/extensions/project-templates-activator/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	dependencies {
-		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "4.3.0"
+		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "5.3.0"
 	}
 
 	repositories {
diff --git a/extensions/project-templates-client-extension/build.gradle b/extensions/project-templates-client-extension/build.gradle
index b1f7a93c6..145b75d7d 100644
--- a/extensions/project-templates-client-extension/build.gradle
+++ b/extensions/project-templates-client-extension/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	dependencies {
-		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "4.3.0"
+		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "5.3.0"
 	}
 
 	repositories {
@@ -59,4 +59,4 @@ test {
 	}
 }
 
-version = "1.0.3-SNAPSHOT"
\ No newline at end of file
+version = "1.0.2-SNAPSHOT"
\ No newline at end of file
diff --git a/extensions/project-templates-content-targeting-report/build.gradle b/extensions/project-templates-content-targeting-report/build.gradle
index 85d001d60..b00471a63 100644
--- a/extensions/project-templates-content-targeting-report/build.gradle
+++ b/extensions/project-templates-content-targeting-report/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	dependencies {
-		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "4.3.0"
+		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "5.3.0"
 	}
 
 	repositories {
diff --git a/extensions/project-templates-content-targeting-rule/build.gradle b/extensions/project-templates-content-targeting-rule/build.gradle
index 832d621e3..914ac4517 100644
--- a/extensions/project-templates-content-targeting-rule/build.gradle
+++ b/extensions/project-templates-content-targeting-rule/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	dependencies {
-		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "4.3.0"
+		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "5.3.0"
 	}
 
 	repositories {
diff --git a/extensions/project-templates-content-targeting-tracking-action/build.gradle b/extensions/project-templates-content-targeting-tracking-action/build.gradle
index 3eb14216f..9f45ce4a9 100644
--- a/extensions/project-templates-content-targeting-tracking-action/build.gradle
+++ b/extensions/project-templates-content-targeting-tracking-action/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	dependencies {
-		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "4.3.0"
+		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "5.3.0"
 	}
 
 	repositories {
diff --git a/extensions/project-templates-freemarker-portlet/build.gradle b/extensions/project-templates-freemarker-portlet/build.gradle
index 47df87544..c38c5f9b2 100644
--- a/extensions/project-templates-freemarker-portlet/build.gradle
+++ b/extensions/project-templates-freemarker-portlet/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	dependencies {
-		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "4.3.0"
+		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "5.3.0"
 	}
 
 	repositories {
diff --git a/extensions/project-templates-js-theme/build.gradle b/extensions/project-templates-js-theme/build.gradle
index f33bb3adc..975d860d6 100644
--- a/extensions/project-templates-js-theme/build.gradle
+++ b/extensions/project-templates-js-theme/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	dependencies {
-		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "4.3.0"
+		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "5.3.0"
 	}
 
 	repositories {
@@ -59,4 +59,4 @@ test {
 	}
 }
 
-version = "1.0.19-SNAPSHOT"
\ No newline at end of file
+version = "1.0.18-SNAPSHOT"
\ No newline at end of file
diff --git a/extensions/project-templates-js-widget/build.gradle b/extensions/project-templates-js-widget/build.gradle
index 53f4123ba..749b05867 100644
--- a/extensions/project-templates-js-widget/build.gradle
+++ b/extensions/project-templates-js-widget/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	dependencies {
-		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "4.3.0"
+		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "5.3.0"
 	}
 
 	repositories {
@@ -57,4 +57,4 @@ test {
 	}
 }
 
-version = "1.0.20-SNAPSHOT"
\ No newline at end of file
+version = "1.0.19-SNAPSHOT"
\ No newline at end of file
diff --git a/extensions/project-templates-social-bookmark/build.gradle b/extensions/project-templates-social-bookmark/build.gradle
index 716faafb9..1881a606e 100644
--- a/extensions/project-templates-social-bookmark/build.gradle
+++ b/extensions/project-templates-social-bookmark/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	dependencies {
-		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "4.3.0"
+		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "5.3.0"
 	}
 
 	repositories {
diff --git a/extensions/remote-deploy-command/build.gradle b/extensions/remote-deploy-command/build.gradle
index da24155fe..a0313cd09 100644
--- a/extensions/remote-deploy-command/build.gradle
+++ b/extensions/remote-deploy-command/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	dependencies {
-		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "4.3.0"
+		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "5.3.0"
 	}
 
 	repositories {
@@ -21,10 +21,11 @@ apply plugin: "maven-publish"
 
 dependencies {
 	api group: "biz.aQute.bnd", name: "biz.aQute.bndlib", version: "5.3.0"
-	api group: "com.liferay.blade", name: "com.liferay.blade.cli", version: "latest.integration"
 
 	compileOnly group: "com.beust", name: "jcommander", version: "1.72"
 	compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
+	compileOnly project(":cli")
+	compileOnly project(path: ":gradle-tooling")
 }
 
 publishing {
diff --git a/extensions/sample-command/build.gradle b/extensions/sample-command/build.gradle
index cb0d693db..d12e6410d 100644
--- a/extensions/sample-command/build.gradle
+++ b/extensions/sample-command/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	dependencies {
-		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "4.3.0"
+		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "5.3.0"
 		classpath group: "de.undercouch", name: "gradle-download-task", version: "3.3.0"
 	}
 
diff --git a/extensions/sample-profile/build.gradle b/extensions/sample-profile/build.gradle
index e6d7c4d13..64e59d17c 100644
--- a/extensions/sample-profile/build.gradle
+++ b/extensions/sample-profile/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	dependencies {
-		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "4.3.0"
+		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "5.3.0"
 		classpath group: "de.undercouch", name: "gradle-download-task", version: "3.3.0"
 	}
 
diff --git a/extensions/sample-template/build.gradle b/extensions/sample-template/build.gradle
index 23f28f4d7..8cf23524d 100644
--- a/extensions/sample-template/build.gradle
+++ b/extensions/sample-template/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	dependencies {
-		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "4.3.0"
+		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "5.3.0"
 	}
 
 	repositories {
diff --git a/extensions/sample-workspace-template/build.gradle b/extensions/sample-workspace-template/build.gradle
index 968ba61fe..a92606c7f 100644
--- a/extensions/sample-workspace-template/build.gradle
+++ b/extensions/sample-workspace-template/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	dependencies {
-		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "4.3.0"
+		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd.gradle", version: "5.3.0"
 	}
 
 	repositories {
diff --git a/publish.sh b/publish.sh
index be70aa4dc..014864584 100755
--- a/publish.sh
+++ b/publish.sh
@@ -55,11 +55,11 @@ mkdir -p $tmpDir
 
 if [ -z "$repoHost" ]; then
 	if [ "$nexusOpt" = "-PlocalNexus" ]; then
-		repoHost="https://localhost:8081"
+		repoHost="http://localhost:8081"
 	else
-		repoHost="https://repository.liferay.com"
+		repoHost="http://repository.liferay.com"
 	fi
-elif [ "$repoHost" = "https://localhost:8081" ]; then
+elif [ "$repoHost" = "http://localhost:8081" ]; then
 	nexusOpt="-PlocalNexus"
 fi