diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 47170106..88487481 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -90,6 +90,7 @@ android {
             }
         }
     }
+    namespace = "org.lsposed.manager"
 }
 
 autoResConfig {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 666ec875..94af9220 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,8 +20,7 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="org.lsposed.manager">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
diff --git a/daemon/build.gradle.kts b/daemon/build.gradle.kts
index cf879bab..58e7623f 100644
--- a/daemon/build.gradle.kts
+++ b/daemon/build.gradle.kts
@@ -82,6 +82,7 @@ android {
             }
         }
     }
+    namespace = "org.lsposed.daemon"
 }
 
 fun afterEval() = android.applicationVariants.forEach { variant ->
diff --git a/daemon/src/main/AndroidManifest.xml b/daemon/src/main/AndroidManifest.xml
index 4f9a1da9..8072ee00 100644
--- a/daemon/src/main/AndroidManifest.xml
+++ b/daemon/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.lsposed.daemon" />
+<manifest />
diff --git a/gradle.properties b/gradle.properties
index 7c7e9cda..e5540122 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,5 +18,5 @@ android.nonTransitiveRClass=true
 android.enableR8.fullMode=true
 android.useAndroidX=true
 
-agpVersion=7.1.3
+agpVersion=7.2.0
 navVersion=2.5.0-alpha04
diff --git a/hiddenapi/stubs/src/main/AndroidManifest.xml b/hiddenapi/stubs/src/main/AndroidManifest.xml
deleted file mode 100644
index 13e9e4c6..00000000
--- a/hiddenapi/stubs/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ This file is part of LSPosed.
-  ~
-  ~ LSPosed is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ LSPosed is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with LSPosed.  If not, see <https://www.gnu.org/licenses/>.
-  ~
-  ~ Copyright (C) 2021 LSPosed Contributors
-  -->
-
-<manifest package="org.lsposed.lspd.hiddenapistubs" />
diff --git a/magisk-loader/build.gradle.kts b/magisk-loader/build.gradle.kts
index ed176824..fee65138 100644
--- a/magisk-loader/build.gradle.kts
+++ b/magisk-loader/build.gradle.kts
@@ -108,6 +108,7 @@ android {
             }
         }
     }
+    namespace = "org.lsposed.lspd"
 }
 
 dependencies {
@@ -123,9 +124,6 @@ val zipAll = task("zipAll") {
 
 }
 
-val apkDir: String
-    get() = if (rootProject.extra.properties["android.injected.invoked.from.ide"] == "true") "intermediates" else "outputs"
-
 fun afterEval() = android.applicationVariants.forEach { variant ->
     val variantCapped = variant.name.capitalize(Locale.ROOT)
     val variantLowered = variant.name.toLowerCase(Locale.ROOT)
@@ -269,7 +267,7 @@ val killLspd = task<Exec>("killLspd") {
 }
 val pushDaemon = task<Exec>("pushDaemon") {
     dependsOn(":daemon:assembleDebug")
-    workingDir("${project(":daemon").buildDir}/$apkDir/apk/debug")
+    workingDir("${project(":daemon").buildDir}/outputs/apk/debug")
     commandLine(adb, "push", "daemon-debug.apk", "/data/local/tmp/daemon.apk")
 }
 val pushDaemonNative = task<Exec>("pushDaemonNative") {
@@ -302,7 +300,7 @@ val reRunDaemon = task<Exec>("reRunDaemon") {
 val tmpApk = "/data/local/tmp/lsp.apk"
 val pushApk = task<Exec>("pushApk") {
     dependsOn(":app:assembleDebug")
-    workingDir("${project(":app").buildDir}/$apkDir/apk/debug")
+    workingDir("${project(":app").buildDir}/outputs/apk/debug")
     commandLine(adb, "push", "app-debug.apk", tmpApk)
 }
 val openApp = task<Exec>("openApp") {
diff --git a/magisk-loader/src/main/AndroidManifest.xml b/magisk-loader/src/main/AndroidManifest.xml
index c04c0dc9..adcc8f42 100644
--- a/magisk-loader/src/main/AndroidManifest.xml
+++ b/magisk-loader/src/main/AndroidManifest.xml
@@ -17,4 +17,4 @@
   ~ Copyright (C) 2022 LSPosed Contributors
   -->
 
-<manifest package="org.lsposed.lspd" />
+<manifest />
diff --git a/services/daemon-service/build.gradle.kts b/services/daemon-service/build.gradle.kts
index f20f792f..bda349c6 100644
--- a/services/daemon-service/build.gradle.kts
+++ b/services/daemon-service/build.gradle.kts
@@ -34,6 +34,7 @@ android {
 
     aidlPackagedList += "org/lsposed/lspd/models/Module.aidl"
     aidlPackagedList += "org/lsposed/lspd/models/PreloadedApk.aidl"
+    namespace = "org.lsposed.lspd.daemonservice"
 }
 
 dependencies {
diff --git a/services/daemon-service/src/main/AndroidManifest.xml b/services/daemon-service/src/main/AndroidManifest.xml
index 20b79d4b..8072ee00 100644
--- a/services/daemon-service/src/main/AndroidManifest.xml
+++ b/services/daemon-service/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.lsposed.lspd.daemonservice" />
\ No newline at end of file
+<manifest />
diff --git a/services/manager-service/build.gradle.kts b/services/manager-service/build.gradle.kts
index 2812e548..f0a641e1 100644
--- a/services/manager-service/build.gradle.kts
+++ b/services/manager-service/build.gradle.kts
@@ -31,6 +31,7 @@ android {
             isMinifyEnabled = false
         }
     }
+    namespace = "org.lsposed.lspd.managerservice"
 }
 
 dependencies {
diff --git a/services/manager-service/src/main/AndroidManifest.xml b/services/manager-service/src/main/AndroidManifest.xml
index 85f3b62b..b3a8e6f4 100644
--- a/services/manager-service/src/main/AndroidManifest.xml
+++ b/services/manager-service/src/main/AndroidManifest.xml
@@ -18,4 +18,4 @@
   ~ Copyright (C) 2021 LSPosed Contributors
   -->
 
-<manifest package="org.lsposed.lspd.managerservice" />
+<manifest />