diff --git a/app/aem/all/build.gradle.kts b/app/aem/all/build.gradle.kts
index d6490fae2..59ef07665 100644
--- a/app/aem/all/build.gradle.kts
+++ b/app/aem/all/build.gradle.kts
@@ -1,13 +1,17 @@
 plugins {
     id("com.cognifide.aem.package")
-    id("maven-publish")
+    `maven-publish`
+    signing
 }
 
+description = "APM (AEM Permission Management) - AEM All-In-One Package"
+
+evaluationDependsOn(":app:aem:ui.apps")
+evaluationDependsOn(":app:aem:ui.content")
+
 apply(from = rootProject.file("app/common.gradle.kts"))
 apply(from = rootProject.file("app/aem/common.gradle.kts"))
 
-description = "APM (AEM Permission Management) - AEM All-In-One Package"
-
 aem {
     tasks {
         packageCompose {
@@ -17,20 +21,19 @@ aem {
     }
 }
 
-//publishing {
-//    publications {
-//        register<MavenPublication>("apmCrx") {
-//            groupId = project.group.toString() + ".crx"
-//            artifact(common.publicationArtifact("packageCompose"))
-//            afterEvaluate {
-//                artifactId = "apm-" + project.name
-//                version = rootProject.version
-//            }
-//            pom {
-//                name.set("APM - " + project.name)
-//                description.set(project.description)
-//            }
-//        }
-//    }
-//}
-
+publishing {
+    publications {
+        register<MavenPublication>("apmCrx") {
+            groupId = project.group.toString() + ".crx"
+            artifact(common.publicationArtifact("packageCompose"))
+            afterEvaluate {
+                artifactId = "apm-" + project.name
+                version = rootProject.version
+            }
+            pom {
+                name.set("APM - " + project.name)
+                description.set(project.description)
+            }
+        }
+    }
+}
diff --git a/app/aem/ui.apps/build.gradle.kts b/app/aem/ui.apps/build.gradle.kts
index 29b63e18c..61bac66d4 100644
--- a/app/aem/ui.apps/build.gradle.kts
+++ b/app/aem/ui.apps/build.gradle.kts
@@ -7,6 +7,10 @@ plugins {
 
 description = "APM (AEM Permission Management) is an AEM based tool focused on streamlining the permission configuration. It provides a rich UX console tailored for administrators. They can write human readable scripts that handle user/group creation/deletion and permissions application, both in bulk. Through it's flexible grammar, exposed API, and high extensibility it vastly improves permission-based implementations."
 
+evaluationDependsOn(":app:aem:api")
+evaluationDependsOn(":app:aem:core")
+evaluationDependsOn(":app:aem:actions.main")
+
 apply(from = rootProject.file("app/common.gradle.kts"))
 apply(from = rootProject.file("app/aem/common.gradle.kts"))
 
diff --git a/gradle/common.gradle.kts b/gradle/common.gradle.kts
index abed89c4b..316a5ade3 100644
--- a/gradle/common.gradle.kts
+++ b/gradle/common.gradle.kts
@@ -118,9 +118,14 @@ allprojects {
         extensions.findByType(SigningExtension::class)?.apply {
             val signingKey: String? by project
             val signingPassword: String? by project
-            useInMemoryPgpKeys(signingKey, signingPassword)
+            if (signingKey != null && signingPassword != null) {
+                useInMemoryPgpKeys(signingKey, signingPassword)
+            } else {
+                useGpgCmd()
+            }
             extensions.findByType(PublishingExtension::class)?.publications?.configureEach {
-                sign(this)
+                val publication = this
+                sign(publication)
             }
         }
     }