diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8203bba7d..548febfda 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -151,6 +151,9 @@ jobs:
             echo -e "android.useAndroidX=true" >> ./gradle.properties
             echo -e "android.enableJetifier=true" >> ./gradle.properties
             echo -e "FLIPPER_VERSION=0.51.0" >> ./gradle.properties
+            echo -e "APPLICATION_ID=chat.rocket.reactnative" >> ./gradle.properties
+            echo -e "VERSIONCODE=$CIRCLE_BUILD_NUM" >> ./gradle.properties
+            echo -e "BugsnagAPIKey=$BUGSNAG_KEY" >> ./gradle.properties
 
             if [[ $KEYSTORE ]]; then
               echo $KEYSTORE_BASE64 | base64 --decode > ./app/$KEYSTORE
@@ -159,9 +162,6 @@ jobs:
               echo -e "KEY_ALIAS=$KEY_ALIAS" >> ./gradle.properties
               echo -e "KEY_PASSWORD=$KEYSTORE_PASSWORD" >> ./gradle.properties
             fi
-
-            echo -e "VERSIONCODE=$CIRCLE_BUILD_NUM" >> ./gradle.properties
-            echo -e "BugsnagAPIKey=$BUGSNAG_KEY" >> ./gradle.properties
           working_directory: android
 
       - run:
@@ -246,6 +246,7 @@ jobs:
             echo -e "android.enableJetifier=true" >> ./gradle.properties
             echo -e "FLIPPER_VERSION=0.51.0" >> ./gradle.properties
             echo -e "VERSIONCODE=$CIRCLE_BUILD_NUM" >> ./gradle.properties
+            echo -e "APPLICATION_ID=chat.rocket.android" >> ./gradle.properties
 
             if [[ $KEYSTORE ]]; then
               echo $KEYSTORE_BASE64 | base64 --decode > ./app/$KEYSTORE
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 20544ff85..28518d655 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -140,7 +140,7 @@ android {
     }
 
     defaultConfig {
-        applicationId "chat.rocket.reactnative"
+        applicationId APPLICATION_ID
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode VERSIONCODE as Integer
@@ -196,7 +196,7 @@ android {
     flavorDimensions "type"
     productFlavors {
         foss {
-            applicationId "chat.rocket.android"
+            applicationId APPLICATION_ID
             dimension = "type"
             buildConfigField "boolean", "FDROID_BUILD", "true"
         }
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index bc6c63eab..5d83092fd 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,10 +1,9 @@
 <?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="chat.rocket.reactnative">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
-        android:name=".MainDebugApplication"
+        android:name="chat.rocket.reactnative.MainDebugApplication"
         tools:ignore="GoogleAppIndexingWarning"
         tools:replace="android:name"
         tools:targetApi="28"
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index e1a794d03..8c3ab8d18 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,66 +1,78 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-		  xmlns:tools="http://schemas.android.com/tools"
-	package="chat.rocket.reactnative">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="chat.rocket.reactnative">
 
-	<uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
-	<application
-		android:name=".MainApplication"
-		android:label="@string/app_name"
-		android:icon="@mipmap/ic_launcher"
-		android:theme="@style/AppTheme"
-		android:networkSecurityConfig="@xml/network_security_config"
-		android:supportsRtl="true"
-		android:requestLegacyExternalStorage="true"
-		android:allowBackup="false"
-		tools:replace="android:allowBackup"
-	>
-		<activity
-      android:name="com.zoontek.rnbootsplash.RNBootSplashActivity"
-      android:theme="@style/BootTheme">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-    </activity>
-		<activity
-			android:name=".MainActivity"
-			android:label="@string/app_name"
-			android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
-			android:launchMode="singleTask"
-			android:windowSoftInputMode="adjustResize"
-			android:exported="true">
-			<intent-filter>
-				<action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>
-			</intent-filter>
-			<intent-filter android:label="@string/app_name">
-				<action android:name="android.intent.action.VIEW" />
-				<category android:name="android.intent.category.DEFAULT" />
-				<category android:name="android.intent.category.BROWSABLE" />
-				<data android:scheme="https" android:host="go.rocket.chat" />
-				<data android:scheme="https" android:host="jitsi.rocket.chat" />
-				<data android:scheme="rocketchat" android:host="room" />
-				<data android:scheme="rocketchat" android:host="auth" />
-				<data android:scheme="rocketchat" android:host="jitsi.rocket.chat" />
-			</intent-filter>
-		</activity>
-		<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
-		<activity
-				android:noHistory="true"
-				android:name=".share.ShareActivity"
-				android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
-				android:label="@string/share_extension_name"
-				android:screenOrientation="portrait"
-				android:theme="@style/AppTheme" >
-				<intent-filter>
-					<action android:name="android.intent.action.SEND" />
-					<action android:name="android.intent.action.SEND_MULTIPLE" />
-					<category android:name="android.intent.category.DEFAULT" />
-					<data android:mimeType="*/*" />
-				</intent-filter>
-		</activity>
-	</application>
+    <application
+        android:name="chat.rocket.reactnative.MainApplication"
+        android:allowBackup="false"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:requestLegacyExternalStorage="true"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme"
+        tools:replace="android:allowBackup">
+        <activity
+            android:name="com.zoontek.rnbootsplash.RNBootSplashActivity"
+            android:theme="@style/BootTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="chat.rocket.reactnative.MainActivity"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="adjustResize">
+            <intent-filter>
+                <action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
+            </intent-filter>
+            <intent-filter android:label="@string/app_name">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="go.rocket.chat"
+                    android:scheme="https" />
+                <data
+                    android:host="jitsi.rocket.chat"
+                    android:scheme="https" />
+                <data
+                    android:host="room"
+                    android:scheme="rocketchat" />
+                <data
+                    android:host="auth"
+                    android:scheme="rocketchat" />
+                <data
+                    android:host="jitsi.rocket.chat"
+                    android:scheme="rocketchat" />
+            </intent-filter>
+        </activity>
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+        <activity
+            android:name="chat.rocket.reactnative.share.ShareActivity"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+            android:label="@string/share_extension_name"
+            android:noHistory="true"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="*/*" />
+            </intent-filter>
+        </activity>
+    </application>
 
 </manifest>
diff --git a/android/app/src/main/java/chat/rocket/reactnative/MainApplication.java b/android/app/src/main/java/chat/rocket/reactnative/MainApplication.java
index 149f1c7fe..33e246b55 100644
--- a/android/app/src/main/java/chat/rocket/reactnative/MainApplication.java
+++ b/android/app/src/main/java/chat/rocket/reactnative/MainApplication.java
@@ -19,6 +19,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import chat.rocket.reactnative.generated.BasePackageList;
+import chat.rocket.reactnative.networking.SSLPinningPackage;
 
 public class MainApplication extends Application implements ReactApplication {
 
diff --git a/android/app/src/main/java/chat/rocket/reactnative/networking/SSLPinningModule.java b/android/app/src/main/java/chat/rocket/reactnative/networking/SSLPinningModule.java
index 804e52601..6a690a180 100644
--- a/android/app/src/main/java/chat/rocket/reactnative/networking/SSLPinningModule.java
+++ b/android/app/src/main/java/chat/rocket/reactnative/networking/SSLPinningModule.java
@@ -1,4 +1,4 @@
-package chat.rocket.reactnative;
+package chat.rocket.reactnative.networking;
 
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
diff --git a/android/app/src/main/java/chat/rocket/reactnative/networking/SSLPinningPackage.java b/android/app/src/main/java/chat/rocket/reactnative/networking/SSLPinningPackage.java
index f9d46cb35..cc8492434 100644
--- a/android/app/src/main/java/chat/rocket/reactnative/networking/SSLPinningPackage.java
+++ b/android/app/src/main/java/chat/rocket/reactnative/networking/SSLPinningPackage.java
@@ -1,4 +1,4 @@
-package chat.rocket.reactnative;
+package chat.rocket.reactnative.networking;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/android/app/src/play/AndroidManifest.xml b/android/app/src/play/AndroidManifest.xml
index 9bbd460cb..3b9e80a3f 100644
--- a/android/app/src/play/AndroidManifest.xml
+++ b/android/app/src/play/AndroidManifest.xml
@@ -1,10 +1,9 @@
 <?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="chat.rocket.reactnative">
+		  xmlns:tools="http://schemas.android.com/tools">
 
 	<application
-		android:name=".MainPlayApplication"
+		android:name="chat.rocket.reactnative.MainPlayApplication"
 		android:label="@string/app_name"
 		android:icon="@mipmap/ic_launcher"
 		android:theme="@style/AppTheme"
@@ -12,11 +11,11 @@
 		tools:replace="android:name"
 	>
 		<receiver
-			android:name=".ReplyBroadcast"
+			android:name="chat.rocket.reactnative.ReplyBroadcast"
 			android:enabled="true"
 			android:exported="false" />
 		<receiver
-			android:name=".DismissNotification"
+			android:name="chat.rocket.reactnative.DismissNotification"
 			android:enabled="true"
 			android:exported="false" >
 		</receiver>
diff --git a/android/gradle.properties b/android/gradle.properties
index 26d0e8372..53184a938 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -29,6 +29,9 @@ android.enableJetifier=true
 # Version of flipper SDK to use with React Native
 FLIPPER_VERSION=0.51.0
 
+# Application ID
+APPLICATION_ID=chat.rocket.reactnative
+
 # App properties
 VERSIONCODE=999999999
 BugsnagAPIKey=""
\ No newline at end of file
diff --git a/package.json b/package.json
index c32581b2f..c8cafd9b6 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
     "ci": "npm run precommit && codecov",
     "ios": "npx react-native run-ios",
     "android": "npx react-native run-android --variant=playDebug",
+    "android-whitelabel": "npx react-native run-android --main-activity chat.rocket.reactnative.MainActivity --variant=playDebug --appId",
     "log-android": "react-native log-android",
     "snyk-protect": "snyk protect",
     "precommit": "eslint . && jest",