diff --git a/src/Android/Autofill/Parser.cs b/src/Android/Autofill/Parser.cs
index fffcbecd2..2e2af1987 100644
--- a/src/Android/Autofill/Parser.cs
+++ b/src/Android/Autofill/Parser.cs
@@ -15,7 +15,8 @@ namespace Bit.Android.Autofill
             "com.google.android.apps.chrome","com.google.android.apps.chrome_dev","com.yandex.browser",
             "com.sec.android.app.sbrowser","com.sec.android.app.sbrowser.beta","org.codeaurora.swe.browser",
             "com.amazon.cloud9","org.mozilla.klar","com.duckduckgo.mobile.android","mark.via.gp","org.bromite.bromite",
-            "org.chromium.chrome", "com.kiwibrowser.browser", "com.ecosia.android"
+            "org.chromium.chrome", "com.kiwibrowser.browser", "com.ecosia.android", "com.opera.mini.native.beta",
+            "org.mozilla.fennec_aurora"
         };
 
         public static HashSet<string> ExcludedPackageIds = new HashSet<string>
diff --git a/src/Android/Resources/xml/autofillservice.xml b/src/Android/Resources/xml/autofillservice.xml
index 7414508b1..a4fdd1268 100644
--- a/src/Android/Resources/xml/autofillservice.xml
+++ b/src/Android/Resources/xml/autofillservice.xml
@@ -1,6 +1,45 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<autofill-service
-    xmlns:android="http://schemas.android.com/apk/res/android">
-  <compatibility-package android:name="com.android.chrome" android:maxLongVersionCode="1000000000"/>
-  <compatibility-package android:name="com.opera.browser" android:maxLongVersionCode="1000000000"/>
-</autofill-service>
\ No newline at end of file
+<autofill-service xmlns:android="http://schemas.android.com/apk/res/android">
+  <compatibility-package
+    android:name="com.android.chrome"
+    android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.chrome.beta"
+    android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.chrome.dev"
+    android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.chrome.canary"
+    android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.microsoft.emmx"
+    android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.opera.browser"
+    android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.opera.browser.beta"
+    android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.opera.mini.native"
+    android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.opera.mini.native.beta"
+    android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.sec.android.app.sbrowser"
+    android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.sec.android.app.sbrowser.beta"
+    android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="org.mozilla.fennec_aurora"
+    android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="org.mozilla.firefox"
+    android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="org.mozilla.firefox_beta"
+    android:maxLongVersionCode="10000000000"/>
+</autofill-service>