diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
index 01adbf4f2..e29b13851 100644
--- a/app/src/debug/AndroidManifest.xml
+++ b/app/src/debug/AndroidManifest.xml
@@ -9,17 +9,6 @@
       android:exported="true"
       android:name="com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity"/>
 
-    <activity
-      android:name="net.openid.appauth.RedirectUriReceiverActivity"
-      tools:node="replace">
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW"/>
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
-        <data android:scheme="com.googleusercontent.apps.1006257750459-vf4mvft1b3rfda8b4c4bl4k4418abqlf" />
-      </intent-filter>
-    </activity>
-
   </application>
 
 </manifest>
diff --git a/app/src/debug/res/values/keys.xml b/app/src/debug/res/values/keys.xml
index b37c29b4d..a2ec86f79 100644
--- a/app/src/debug/res/values/keys.xml
+++ b/app/src/debug/res/values/keys.xml
@@ -15,4 +15,5 @@
   <string name="debug_crash_app">Crash app now</string>
   <string name="debug_main_queries">Crash on violation</string>
   <string name="debug_force_restart">Restart app</string>
+  <string name="google_oauth_scheme">com.googleusercontent.apps.1006257750459-vf4mvft1b3rfda8b4c4bl4k4418abqlf</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/genericRelease/AndroidManifest.xml b/app/src/genericRelease/AndroidManifest.xml
deleted file mode 100644
index 3998cd398..000000000
--- a/app/src/genericRelease/AndroidManifest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools">
-
-  <application tools:ignore="GoogleAppIndexingWarning">
-
-    <activity
-      android:name="net.openid.appauth.RedirectUriReceiverActivity"
-      tools:node="replace">
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW"/>
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
-        <data android:scheme="com.googleusercontent.apps.363426363175-rg39b1q2302l6mlkup40l4d6ids4osiv" />
-      </intent-filter>
-    </activity>
-
-  </application>
-
-</manifest>
diff --git a/app/src/genericRelease/res/values/keys.xml b/app/src/genericRelease/res/values/keys.xml
new file mode 100644
index 000000000..1777b2515
--- /dev/null
+++ b/app/src/genericRelease/res/values/keys.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="google_oauth_scheme">com.googleusercontent.apps.363426363175-rg39b1q2302l6mlkup40l4d6ids4osiv</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/googleplayRelease/AndroidManifest.xml b/app/src/googleplayRelease/AndroidManifest.xml
deleted file mode 100644
index 934fb466d..000000000
--- a/app/src/googleplayRelease/AndroidManifest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools">
-
-  <application tools:ignore="GoogleAppIndexingWarning">
-
-    <activity
-      android:name="net.openid.appauth.RedirectUriReceiverActivity"
-      tools:node="replace">
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW"/>
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
-        <data android:scheme="com.googleusercontent.apps.363426363175-jdrijf7hql9030klgjcjlpi6k5spviif" />
-      </intent-filter>
-    </activity>
-
-  </application>
-
-</manifest>
diff --git a/app/src/googleplayRelease/res/values/keys.xml b/app/src/googleplayRelease/res/values/keys.xml
new file mode 100644
index 000000000..ee090a016
--- /dev/null
+++ b/app/src/googleplayRelease/res/values/keys.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="google_oauth_scheme">com.googleusercontent.apps.363426363175-jdrijf7hql9030klgjcjlpi6k5spviif</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1d33e5bff..8392ae140 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -164,6 +164,17 @@
     android:preserveLegacyExternalStorage="true"
     android:hasFragileUserData="true">
 
+    <activity
+      android:name="net.openid.appauth.RedirectUriReceiverActivity"
+      tools:node="replace">
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+        <data android:scheme="@string/google_oauth_scheme" />
+      </intent-filter>
+    </activity>
+
     <activity
       android:name=".auth.SignInActivity"
       android:theme="@style/TranslucentDialog"