diff --git a/presentation/src/apkstore/AndroidManifest.xml b/presentation/src/apkstore/AndroidManifest.xml
index f0b9b94c..2bf4fbf5 100644
--- a/presentation/src/apkstore/AndroidManifest.xml
+++ b/presentation/src/apkstore/AndroidManifest.xml
@@ -5,4 +5,39 @@
 	<!-- Required to self update Cryptomator in the apkstore variant -->
 	<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
+	<!-- Keep in sync with apkstore, playstore and fdroid -->
+	<application>
+		<activity
+			android:name="com.dropbox.core.android.AuthActivity"
+			android:configChanges="orientation|keyboard"
+			android:exported="true"
+			android:launchMode="singleTask">
+			<intent-filter>
+				<data android:scheme="db-${DROPBOX_API_KEY}" />
+
+				<action android:name="android.intent.action.VIEW" />
+
+				<category android:name="android.intent.category.BROWSABLE" />
+				<category android:name="android.intent.category.DEFAULT" />
+			</intent-filter>
+		</activity>
+
+		<activity
+			android:name="com.microsoft.identity.client.BrowserTabActivity"
+			android:exported="true">
+			<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:host="org.cryptomator"
+					android:path="/${ONEDRIVE_API_KEY_DECODED}"
+					android:scheme="msauth" />
+			</intent-filter>
+		</activity>
+
+	</application>
+
 </manifest>
diff --git a/presentation/src/fdroid/AndroidManifest.xml b/presentation/src/fdroid/AndroidManifest.xml
new file mode 100644
index 00000000..2bf4fbf5
--- /dev/null
+++ b/presentation/src/fdroid/AndroidManifest.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	package="org.cryptomator.presentation">
+
+	<!-- Required to self update Cryptomator in the apkstore variant -->
+	<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+
+	<!-- Keep in sync with apkstore, playstore and fdroid -->
+	<application>
+		<activity
+			android:name="com.dropbox.core.android.AuthActivity"
+			android:configChanges="orientation|keyboard"
+			android:exported="true"
+			android:launchMode="singleTask">
+			<intent-filter>
+				<data android:scheme="db-${DROPBOX_API_KEY}" />
+
+				<action android:name="android.intent.action.VIEW" />
+
+				<category android:name="android.intent.category.BROWSABLE" />
+				<category android:name="android.intent.category.DEFAULT" />
+			</intent-filter>
+		</activity>
+
+		<activity
+			android:name="com.microsoft.identity.client.BrowserTabActivity"
+			android:exported="true">
+			<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:host="org.cryptomator"
+					android:path="/${ONEDRIVE_API_KEY_DECODED}"
+					android:scheme="msauth" />
+			</intent-filter>
+		</activity>
+
+	</application>
+
+</manifest>
diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
index cfc8fe26..bb00e7d5 100644
--- a/presentation/src/main/AndroidManifest.xml
+++ b/presentation/src/main/AndroidManifest.xml
@@ -87,23 +87,6 @@
 			android:exported="false"
 			android:theme="@style/TransparentPopUp" />
 
-		<!-- Cloud Services -->
-		<!-- TODO move out into custom manifest-->
-		<activity
-			android:name="com.dropbox.core.android.AuthActivity"
-			android:configChanges="orientation|keyboard"
-			android:exported="true"
-			android:launchMode="singleTask">
-			<intent-filter>
-				<data android:scheme="db-${DROPBOX_API_KEY}" />
-
-				<action android:name="android.intent.action.VIEW" />
-
-				<category android:name="android.intent.category.BROWSABLE" />
-				<category android:name="android.intent.category.DEFAULT" />
-			</intent-filter>
-		</activity>
-
 		<!-- Settings -->
 		<activity
 			android:name=".ui.activity.AutoUploadChooseVaultActivity"
@@ -189,23 +172,6 @@
 			</intent-filter>
 		</activity>
 
-		<!-- TODO move out into custom manifest-->
-		<activity
-			android:name="com.microsoft.identity.client.BrowserTabActivity"
-			android:exported="true">
-			<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:host="org.cryptomator"
-					android:path="/${ONEDRIVE_API_KEY_DECODED}"
-					android:scheme="msauth" />
-			</intent-filter>
-		</activity>
-
 		<provider
 			android:name="androidx.core.content.FileProvider"
 			android:authorities="${applicationId}.fileprovider"
diff --git a/presentation/src/playstore/AndroidManifest.xml b/presentation/src/playstore/AndroidManifest.xml
new file mode 100644
index 00000000..14045e4d
--- /dev/null
+++ b/presentation/src/playstore/AndroidManifest.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	package="org.cryptomator.presentation">
+
+	<!-- Keep in sync with apkstore, playstore and fdroid -->
+	<application>
+		<activity
+			android:name="com.dropbox.core.android.AuthActivity"
+			android:configChanges="orientation|keyboard"
+			android:exported="true"
+			android:launchMode="singleTask">
+			<intent-filter>
+				<data android:scheme="db-${DROPBOX_API_KEY}" />
+
+				<action android:name="android.intent.action.VIEW" />
+
+				<category android:name="android.intent.category.BROWSABLE" />
+				<category android:name="android.intent.category.DEFAULT" />
+			</intent-filter>
+		</activity>
+
+		<activity
+			android:name="com.microsoft.identity.client.BrowserTabActivity"
+			android:exported="true">
+			<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:host="org.cryptomator"
+					android:path="/${ONEDRIVE_API_KEY_DECODED}"
+					android:scheme="msauth" />
+			</intent-filter>
+		</activity>
+
+	</application>
+
+</manifest>