diff --git a/findbugs-exclude.xml b/findbugs-exclude.xml
index 087125443e..33e2bb8ec2 100644
--- a/findbugs-exclude.xml
+++ b/findbugs-exclude.xml
@@ -36,7 +36,6 @@
         </Or>
     </Match>
     <Match>
-        <!-- These are triggered by getDate()/setDate() on cursors-->
         <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2"/>
     </Match>
     <Match>
@@ -84,4 +83,18 @@
         https://wiki.sei.cmu.edu/confluence/display/java/OBJ11-J.+Be+wary+of+letting+constructors+throw+exceptions -->
         <Bug pattern="CT_CONSTRUCTOR_THROW"/>
     </Match>
+    <Match>
+        <!-- This class is thread confined -->
+        <Class name="ru.curs.celesta.CallContext"/>
+        <Or>
+            <Bug pattern="AT_NONATOMIC_64BIT_PRIMITIVE"/>
+            <Bug pattern="AT_NONATOMIC_OPERATIONS_ON_SHARED_VARIABLE"/>
+            <Bug pattern="AT_STALE_THREAD_WRITE_OF_PRIMITIVE"/>
+        </Or>
+    </Match>
+    <Match>
+        <!-- These classes are not thread-safe and not used in multithreading-->
+        <Package name="ru.curs.celesta.score"/>
+        <Bug pattern="AT_STALE_THREAD_WRITE_OF_PRIMITIVE"/>
+    </Match>
 </FindBugsFilter>
diff --git a/pom.xml b/pom.xml
index dcac9e8622..886ac2caff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
         <testcontainers.firebird.version>1.5.1</testcontainers.firebird.version>
 
         <!--plugin versions -->
-        <spotbugs.maven.plugin.version>4.8.6.6</spotbugs.maven.plugin.version>
+        <spotbugs.maven.plugin.version>4.9.3.0</spotbugs.maven.plugin.version>
         <jacoco.version>0.8.13</jacoco.version>
         <javacc.maven.plugin.version>3.1.1</javacc.maven.plugin.version>
         <maven.assembly.plugin.version>3.7.1</maven.assembly.plugin.version>