diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
index 625795d40..3d25c0db6 100644
--- a/app/src/debug/AndroidManifest.xml
+++ b/app/src/debug/AndroidManifest.xml
@@ -18,17 +18,6 @@
 
     <application
             tools:replace="android:name"
-            android:name="org.mozilla.fenix.DebugFenixApplication">
-
-        <service android:name=".customtabs.CustomTabsService">
-            <!-- Trusted Web Activities are currently only supported in nightly. -->
-            <intent-filter tools:node="removeAll" />
-            <intent-filter>
-                <action android:name="android.support.customtabs.action.CustomTabsService" />
-                <category android:name="androidx.browser.trusted.category.TrustedWebActivities" />
-            </intent-filter>
-        </service>
-
-    </application>
+            android:name="org.mozilla.fenix.DebugFenixApplication" />
 
 </manifest>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a07c272eb..005810abe 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -231,6 +231,7 @@
             tools:ignore="ExportedService">
             <intent-filter>
                 <action android:name="android.support.customtabs.action.CustomTabsService" />
+                <category android:name="androidx.browser.trusted.category.TrustedWebActivities" />
             </intent-filter>
         </service>