diff --git a/WebRTCControlled/app/build.gradle b/WebRTCControlled/app/build.gradle
index d4840a5..187c170 100644
--- a/WebRTCControlled/app/build.gradle
+++ b/WebRTCControlled/app/build.gradle
@@ -33,6 +33,13 @@ android {
         aidl true
     }
 
+    sourceSets {
+        zhanRuiDebug.manifest.srcFile 'src/system/AndroidManifest.xml'
+        zhanRuiRelease.manifest.srcFile 'src/system/AndroidManifest.xml'
+        CrosshatchDebug.manifest.srcFile 'src/system/AndroidManifest.xml'
+        CrosshatchRelease.manifest.srcFile 'src/system/AndroidManifest.xml'
+    }
+
     signingConfigs {
         keypub {
             storeFile file(rootProject.ext.signingConfigs.keypub.storeFile)
diff --git a/WebRTCControlled/app/src/main/AndroidManifest.xml b/WebRTCControlled/app/src/main/AndroidManifest.xml
index 976316e..2988b38 100644
--- a/WebRTCControlled/app/src/main/AndroidManifest.xml
+++ b/WebRTCControlled/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    android:sharedUserId="android.uid.system">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/WebRTCControlled/app/src/system/AndroidManifest.xml b/WebRTCControlled/app/src/system/AndroidManifest.xml
new file mode 100644
index 0000000..11b6160
--- /dev/null
+++ b/WebRTCControlled/app/src/system/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    android:sharedUserId="android.uid.system">
+</manifest>