diff --git a/app/build.gradle b/app/build.gradle
index d95617132d..f13b1fe5c6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -73,6 +73,11 @@ android {
     // install this NDK version and Cmake to produce smaller APKs. Build will still work if not installed
     ndkVersion "${ndkEnv.get("NDK_VERSION")}"
 
+
+    namespace 'com.owncloud.android'
+    testNamespace "${namespace}.test"
+
+
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 30
diff --git a/app/src/androidTest/AndroidManifest.xml b/app/src/androidTest/AndroidManifest.xml
index 6fd72cdb19..449453a43d 100644
--- a/app/src/androidTest/AndroidManifest.xml
+++ b/app/src/androidTest/AndroidManifest.xml
@@ -26,7 +26,6 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="${applicationId}.test"
     android:sharedUserId="${applicationId}.uid">
 
 </manifest>
diff --git a/app/src/gplay/AndroidManifest.xml b/app/src/gplay/AndroidManifest.xml
index a16b6be576..fc1db47e1b 100644
--- a/app/src/gplay/AndroidManifest.xml
+++ b/app/src/gplay/AndroidManifest.xml
@@ -17,8 +17,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="com.owncloud.android">
+          xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:name=".MainApp"
diff --git a/app/src/huawei/AndroidManifest.xml b/app/src/huawei/AndroidManifest.xml
index 23773856ba..b87e19cf95 100644
--- a/app/src/huawei/AndroidManifest.xml
+++ b/app/src/huawei/AndroidManifest.xml
@@ -19,8 +19,7 @@
   along with this program. If not, see <https://www.gnu.org/licenses/>.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.owncloud.android">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:name=".MainApp"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c51bda0174..6657689c1b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,8 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.owncloud.android">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />