diff --git a/app/build.gradle b/app/build.gradle
index f78b0fd711..f17af4b498 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -171,7 +171,6 @@ android {
         }
         beta {
             java.srcDirs = ['src/migration/java']
-            manifest.srcFile "src/migration/AndroidManifest.xml"
         }
         release {
             java.srcDirs = ['src/migration/java']
diff --git a/app/src/beta/AndroidManifest.xml b/app/src/beta/AndroidManifest.xml
new file mode 100644
index 0000000000..ca3571f569
--- /dev/null
+++ b/app/src/beta/AndroidManifest.xml
@@ -0,0 +1,44 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="org.mozilla.fenix"
+    android:sharedUserId="${sharedUserId}">
+    <application
+        android:name="org.mozilla.fenix.MigratingFenixApplication"
+        tools:replace="android:name">
+
+        <activity android:name=".autofill.AutofillUnlockActivity"
+            android:exported="false"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+
+        <activity android:name=".autofill.AutofillConfirmActivity"
+            android:exported="false"
+            android:theme="@style/Theme.AppCompat.Translucent" />
+
+        <activity android:name=".autofill.AutofillSearchActivity"
+            android:exported="false"
+            android:theme="@style/DialogActivityTheme" />
+
+        <service
+            android:name=".autofill.AutofillService"
+            android:label="@string/app_name"
+            android:permission="android.permission.BIND_AUTOFILL_SERVICE">
+            <intent-filter>
+                <action android:name="android.service.autofill.AutofillService"/>
+            </intent-filter>
+        </service>
+
+        <!-- Overriding the alias of the main manifest to route app launches through our
+             MigrationDecisionActivity which will show the migration screen before launching
+             into the app if needed. -->
+        <activity-alias
+            android:name="${applicationId}.App"
+            android:targetActivity="org.mozilla.fenix.MigrationDecisionActivity"
+            tools:replace="android:targetActivity" />
+
+        <activity
+            android:name="org.mozilla.fenix.MigrationDecisionActivity"
+            android:exported="false" />
+
+        <service android:name="org.mozilla.fenix.MigrationService" />
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index e395a71641..b38c82b577 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -65,5 +65,5 @@ object FeatureFlags {
      * In addition to toggling this flag, matching entries in the Android Manifest of the build
      * type need to present.
      */
-    val androidAutofill = Config.channel.isNightlyOrDebug
+    val androidAutofill = Config.channel.isNightlyOrDebug || Config.channel.isBeta
 }