diff --git a/vector/lint.xml b/vector/lint.xml
index 76dd50cfe9..3515097379 100644
--- a/vector/lint.xml
+++ b/vector/lint.xml
@@ -15,7 +15,7 @@
     <issue id="LocaleFolder" severity="error" />
 
     <!-- String resource has to be used, for the rest we can ignore for now
-    TODO: stop ignoring warning at all those location -->
+    TODO: stop ignoring warning at all those locations -->
     <issue id="UnusedResources" severity="error">
         <ignore path="**/build.gradle" />
         <ignore path="**/anim/**" />
@@ -32,6 +32,19 @@
         <ignore path="**/values/strings_login_v2.xml" />
         <ignore path="**/library/ui-styles/src/main/res/values/**" />
         <ignore path="**/xml/**" />
+
+        <!-- Following resources are for F-Droid variant only, so ignore for GPlay -->
+        <ignore regexp="settings_troubleshoot_test_service_boot_*" />
+        <ignore regexp="settings_troubleshoot_test_bg_restricted_*" />
+        <ignore regexp="settings_troubleshoot_test_battery_*" />
+
+        <!-- Following resources are for GPlay variant only, so ignore for F-Droid -->
+        <ignore regexp="settings_troubleshoot_test_play_services_" />
+        <ignore regexp="settings_troubleshoot_test_push_loop_" />
+        <ignore regexp="settings_troubleshoot_test_token_registration_" />
+        <ignore regexp="settings_troubleshoot_test_fcm_" />
+        <ignore regexp="no_valid_google_play_services_apk" />
+        <ignore regexp="sas_error_unknown" />
     </issue>
 
     <!-- UX -->