diff --git a/android-components/samples/browser/src/main/AndroidManifest.xml b/android-components/samples/browser/src/main/AndroidManifest.xml
index e255c7f8d221..2fea0d08b72d 100644
--- a/android-components/samples/browser/src/main/AndroidManifest.xml
+++ b/android-components/samples/browser/src/main/AndroidManifest.xml
@@ -151,8 +151,6 @@
             tools:ignore="ExportedService">
             <intent-filter>
                 <action android:name="android.support.customtabs.action.CustomTabsService" />
-                <category android:name="androidx.browser.trusted.category.TrustedWebActivities" />
-                <category android:name="androidx.browser.trusted.category.NavBarColorCustomization" />
             </intent-filter>
         </service>
 
diff --git a/fenix/app/src/main/AndroidManifest.xml b/fenix/app/src/main/AndroidManifest.xml
index c7c4e15a5bda..a9d41ec47783 100644
--- a/fenix/app/src/main/AndroidManifest.xml
+++ b/fenix/app/src/main/AndroidManifest.xml
@@ -317,7 +317,6 @@
             tools:ignore="ExportedService">
             <intent-filter>
                 <action android:name="android.support.customtabs.action.CustomTabsService" />
-                <category android:name="androidx.browser.trusted.category.TrustedWebActivities" />
             </intent-filter>
         </service>
 
diff --git a/fenix/app/src/nightly/AndroidManifest.xml b/fenix/app/src/nightly/AndroidManifest.xml
index f7b68bd40de5..6dd4bec2e0af 100644
--- a/fenix/app/src/nightly/AndroidManifest.xml
+++ b/fenix/app/src/nightly/AndroidManifest.xml
@@ -10,11 +10,8 @@
         <service
             android:name=".customtabs.CustomTabsService"
             android:exported="true">
-        <!-- 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>