diff --git a/app/build.gradle b/app/build.gradle
index d5a6eb523..a17ba724d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,6 +4,7 @@ apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlin-kapt'
 
 android {
+    namespace 'com.kunzisoft.keepass'
     compileSdkVersion 32
     buildToolsVersion "32.0.0"
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f7ab6482b..e4d558043 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.kunzisoft.keepass"
     android:installLocation="auto">
     <supports-screens
       android:smallScreens="true"
diff --git a/build.gradle b/build.gradle
index 4129a11cf..daa60fce8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/crypto/build.gradle b/crypto/build.gradle
index 66361fb53..424fb77e4 100644
--- a/crypto/build.gradle
+++ b/crypto/build.gradle
@@ -4,6 +4,7 @@ plugins {
 }
 
 android {
+    namespace 'com.kunzisoft.encrypt'
     compileSdkVersion 32
     buildToolsVersion "32.0.0"
     ndkVersion "21.4.7075529"
diff --git a/crypto/src/main/AndroidManifest.xml b/crypto/src/main/AndroidManifest.xml
index 019804ab2..8072ee00d 100644
--- a/crypto/src/main/AndroidManifest.xml
+++ b/crypto/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.kunzisoft.encrypt" />
+<manifest />
diff --git a/database/build.gradle b/database/build.gradle
index 4c12bb819..fa8c3b4ec 100644
--- a/database/build.gradle
+++ b/database/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
+    namespace 'com.kunzisoft.keepass.database'
     compileSdkVersion 32
     buildToolsVersion "32.0.0"
 
diff --git a/database/src/main/AndroidManifest.xml b/database/src/main/AndroidManifest.xml
index 2155129cd..8072ee00d 100644
--- a/database/src/main/AndroidManifest.xml
+++ b/database/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.kunzisoft.keepass.database" />
+<manifest />
diff --git a/icon-pack/build.gradle b/icon-pack/build.gradle
index 46eeec067..ddd6b255a 100644
--- a/icon-pack/build.gradle
+++ b/icon-pack/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
+    namespace 'com.kunzisoft.keepass.icon'
     compileSdkVersion 32
     buildToolsVersion '32.0.0'
 
diff --git a/icon-pack/classic/build.gradle b/icon-pack/classic/build.gradle
index f5dbd2954..ad9871d95 100644
--- a/icon-pack/classic/build.gradle
+++ b/icon-pack/classic/build.gradle
@@ -1,6 +1,7 @@
 apply plugin: 'com.android.library'
 
 android {
+    namespace 'com.kunzisoft.keepass.icon.classic'
     compileSdkVersion 32
     buildToolsVersion '32.0.0'
 
diff --git a/icon-pack/classic/src/main/AndroidManifest.xml b/icon-pack/classic/src/main/AndroidManifest.xml
index dc27805a5..cc947c567 100644
--- a/icon-pack/classic/src/main/AndroidManifest.xml
+++ b/icon-pack/classic/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="com.kunzisoft.keepass.icon.classic" />
+<manifest />
diff --git a/icon-pack/material/build.gradle b/icon-pack/material/build.gradle
index 1a5598e13..2fa4b74f1 100644
--- a/icon-pack/material/build.gradle
+++ b/icon-pack/material/build.gradle
@@ -1,6 +1,7 @@
 apply plugin: 'com.android.library'
 
 android {
+    namespace 'com.kunzisoft.keepass.icon.material'
     compileSdkVersion 32
     buildToolsVersion '32.0.0'
 
diff --git a/icon-pack/material/src/main/AndroidManifest.xml b/icon-pack/material/src/main/AndroidManifest.xml
index 4f3bfdbf1..cc947c567 100644
--- a/icon-pack/material/src/main/AndroidManifest.xml
+++ b/icon-pack/material/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="com.kunzisoft.keepass.icon.material" />
+<manifest />
diff --git a/icon-pack/src/main/AndroidManifest.xml b/icon-pack/src/main/AndroidManifest.xml
index 2aa72cc92..cc947c567 100644
--- a/icon-pack/src/main/AndroidManifest.xml
+++ b/icon-pack/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="com.kunzisoft.keepass.icon" />
+<manifest />