diff --git a/spotbugs-filter.xml b/spotbugs-filter.xml
index 05c1457931..1b374ca4fe 100644
--- a/spotbugs-filter.xml
+++ b/spotbugs-filter.xml
@@ -17,7 +17,8 @@
     <Match>
         <Or>
             <Class name="~.*\.Dagger.*" />
-            <Class name="~com.nextcloud.client.di\..*_.*" />
+            <Class name="~com\.nextcloud\.client\.di\..*_.*" />
+			<Class name="~dagger\.android\..*" />
         </Or>
     </Match>
     <!-- Dagger generated code uses internal APIs -->
@@ -30,7 +31,7 @@
     <Match>
         <Or>
             <Class name="~.*BindingImpl"/>
-            <Class name="~.*\.DataBinderMapperImpl"/>
+            <Class name="~.*\.DataBinderMapperImpl"/>	
         </Or>
     </Match>
 
@@ -39,6 +40,10 @@
 	    <Or>
 	        <Package name="~io\.noties\..*" />
 			<Package name="~third_parties\.ezvcard_android\..*" />
+			<Package name="~com\.afollestad\.sectionedrecyclerview\..*" />
+			<Package name="~butterknife\..*" />
+			<Package name="~de\.cotech\..*" />
+			<Package name="~pl\.droidsonroids\..*" />
 		</Or>
 	</Match>
 	 <Match>