diff --git a/app/aem/common.gradle.kts b/app/aem/common.gradle.kts
index 414883009..a7455e44e 100644
--- a/app/aem/common.gradle.kts
+++ b/app/aem/common.gradle.kts
@@ -38,5 +38,5 @@ plugins.withId("com.cognifide.aem.bundle") {
         "implementation"("javax.annotation:javax.annotation-api:1.3.2")
         "implementation"("javax.inject:javax.inject:1")
         "implementation"("javax.servlet:javax.servlet-api:3.1.0")
-     }
-}
\ No newline at end of file
+    }
+}
diff --git a/app/aem/core/build.gradle.kts b/app/aem/core/build.gradle.kts
index f25155977..b0856eee2 100644
--- a/app/aem/core/build.gradle.kts
+++ b/app/aem/core/build.gradle.kts
@@ -20,15 +20,7 @@ aem {
         jar {
             bundle {
                 importPackage("javax.annotation;version=0.0.0", "!android.os")
-                attribute("Sling-Model-Packages",
-                        listOf(
-                                "com.cognifide.apm.core.crypto",
-                                "com.cognifide.apm.core.endpoints",
-                                "com.cognifide.apm.core.ui.models",
-                                "com.cognifide.apm.core.scripts",
-                                "com.cognifide.apm.core.services",
-                                "com.cognifide.apm.core.history"
-                        ).joinToString(","))
+                attribute("Sling-Model-Packages", "com.cognifide.apm.core")
                 excludePackage("org.antlr.stringtemplate", "org.antlr.v4.gui")
                 embedPackage("org.antlr:antlr4-runtime:4.7.2", "org.antlr.v4.runtime.*")
             }
diff --git a/app/aem/ui.apps.cloud/build.gradle.kts b/app/aem/ui.apps.cloud/build.gradle.kts
index 4b85d0057..30c5ebc12 100644
--- a/app/aem/ui.apps.cloud/build.gradle.kts
+++ b/app/aem/ui.apps.cloud/build.gradle.kts
@@ -20,7 +20,7 @@ apply(from = rootProject.file("app/aem/common.gradle.kts"))
 aem {
     tasks {
         packageCompose {
-            mergePackageProject(":app:aem:ui.apps.base")
+            from(project(":app:aem:ui.apps.base").layout.projectDirectory.dir("src/main/content"))
             installBundleProject(":app:aem:api")
             installBundleProject(":app:aem:runmodes.cloud")
             installBundleProject(":app:aem:core")
diff --git a/app/aem/ui.apps/build.gradle.kts b/app/aem/ui.apps/build.gradle.kts
index bab702dc0..822442efc 100644
--- a/app/aem/ui.apps/build.gradle.kts
+++ b/app/aem/ui.apps/build.gradle.kts
@@ -20,7 +20,7 @@ apply(from = rootProject.file("app/aem/common.gradle.kts"))
 aem {
     tasks {
         packageCompose {
-            mergePackageProject(":app:aem:ui.apps.base")
+            from(project(":app:aem:ui.apps.base").layout.projectDirectory.dir("src/main/content"))
             installBundleProject(":app:aem:api")
             installBundleProject(":app:aem:runmodes")
             installBundleProject(":app:aem:core")
diff --git a/build.gradle.kts b/build.gradle.kts
index 886cc1b70..cf13e2b14 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -84,4 +84,4 @@ tasks {
 apply(from = "gradle/common.gradle.kts")
 
 fun formatVersion(version: String, position: ScmPosition) =
-        version + "-" + position.branch.replace("/", "").replace(".", "")
\ No newline at end of file
+    version + "-" + position.branch.replace("/", "").replace(".", "")
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 442d9132e..00e33edef 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists