diff --git a/findbugs-filter.xml b/spotbugs-filter.xml
similarity index 62%
rename from findbugs-filter.xml
rename to spotbugs-filter.xml
index 514a0e3a5..e9a5d30f4 100644
--- a/findbugs-filter.xml
+++ b/spotbugs-filter.xml
@@ -5,6 +5,8 @@
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
+  ~ @author Andy Scherzinger
+  ~ Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
   ~ Copyright (C) 2017-2019 Mario Danic <mario@lovelyhq.com>
   ~
   ~ This program is free software: you can redistribute it and/or modify
@@ -32,6 +34,19 @@
         <Class name="~.*\$\$Parcelable.*" />
     </Match>
 
+    <!-- Dagger code is autogenerated. Exclude it from Check. -->
+    <Match>
+        <Or>
+            <Class name="~.*\.Dagger.*" />
+			<Class name="~dagger\.android\..*" />
+        </Or>
+    </Match>
+    <!-- Dagger generated code uses internal APIs -->
+    <Match>
+        <Class name="~.*\..*.*Factory" />
+        <Bug pattern="IICU_INCORRECT_INTERNAL_CLASS_USE" />
+    </Match>
+
     <!-- Data bindings autogenerated classes -->
     <Match>
         <Or>
@@ -42,4 +57,10 @@
     </Match>
 
     <Bug pattern="PATH_TRAVERSAL_IN" />
+    <Bug pattern="ANDROID_EXTERNAL_FILE_ACCESS" />
+    <Bug pattern="BAS_BLOATED_ASSIGNMENT_SCOPE" />
+    <Bug pattern="IMC_IMMATURE_CLASS_BAD_SERIALVERSIONUID" />
+
+    <!-- This is unmanageable for now due to large amount of interconnected static state -->
+    <Bug pattern="FCCD_FIND_CLASS_CIRCULAR_DEPENDENCY" />
 </FindBugsFilter>