diff --git a/build.gradle b/build.gradle
index 1aac05a2db..586d58e789 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'org.ajoberstar.grgit' version '5.2.2'
     id "com.github.ben-manes.versions" version '0.51.0'
     id 'ru.vyarus.mkdocs' version '4.0.1' apply false
-    id "com.github.spotbugs" version "6.0.9"
+    id "com.github.spotbugs" version "6.0.12"
     id 'com.diffplug.spotless' version '6.25.0'
     id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
 }
@@ -47,7 +47,7 @@ dependencies {
     implementation "org.apache.commons:commons-text:${commonTextVersion}"
     api "com.commercetools.sdk:commercetools-sdk-java-api:${commercetoolsJavaSdkV2Version}"
     api 'commons-io:commons-io:2.16.1'
-    api 'commons-codec:commons-codec:1.16.1'
+    api 'commons-codec:commons-codec:1.17.0'
     api 'com.google.code.findbugs:annotations:3.0.1'
     api 'com.neovisionaries:nv-i18n:1.29'
     testImplementation "org.mockito:mockito-junit-jupiter:${mockitoJunitJupiterVersion}"
diff --git a/src/main/java/com/commercetools/sync/customers/utils/CustomerCustomActionBuilder.java b/src/main/java/com/commercetools/sync/customers/utils/CustomerCustomActionBuilder.java
index 47456fd465..437cd744d1 100644
--- a/src/main/java/com/commercetools/sync/customers/utils/CustomerCustomActionBuilder.java
+++ b/src/main/java/com/commercetools/sync/customers/utils/CustomerCustomActionBuilder.java
@@ -4,6 +4,7 @@
 import com.commercetools.api.models.customer.CustomerSetCustomTypeActionBuilder;
 import com.commercetools.api.models.customer.CustomerUpdateAction;
 import com.commercetools.sync.commons.helpers.GenericCustomActionBuilder;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Map;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -18,6 +19,7 @@ private CustomerCustomActionBuilder() {
   }
 
   @Nonnull
+  @SuppressFBWarnings
   public static CustomerCustomActionBuilder of() {
     return builder;
   }
diff --git a/src/main/java/com/commercetools/sync/products/SyncFilter.java b/src/main/java/com/commercetools/sync/products/SyncFilter.java
index b783b0eca5..628d450fc2 100644
--- a/src/main/java/com/commercetools/sync/products/SyncFilter.java
+++ b/src/main/java/com/commercetools/sync/products/SyncFilter.java
@@ -57,7 +57,7 @@ public static SyncFilter ofBlackList(@Nonnull final ActionGroup... actionGroups)
   }
 
   @Nonnull
-  public static SyncFilter of() {
+  public static synchronized SyncFilter of() {
     defaultSyncFilter = ofNullable(defaultSyncFilter).orElseGet(SyncFilter::new);
     return defaultSyncFilter;
   }
diff --git a/src/main/java/com/commercetools/sync/shoppinglists/utils/ShoppingListCustomActionBuilder.java b/src/main/java/com/commercetools/sync/shoppinglists/utils/ShoppingListCustomActionBuilder.java
index 81e4037570..4901140259 100644
--- a/src/main/java/com/commercetools/sync/shoppinglists/utils/ShoppingListCustomActionBuilder.java
+++ b/src/main/java/com/commercetools/sync/shoppinglists/utils/ShoppingListCustomActionBuilder.java
@@ -4,6 +4,7 @@
 import com.commercetools.api.models.shopping_list.ShoppingListSetCustomTypeActionBuilder;
 import com.commercetools.api.models.shopping_list.ShoppingListUpdateAction;
 import com.commercetools.sync.commons.helpers.GenericCustomActionBuilder;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Map;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -19,6 +20,7 @@ private ShoppingListCustomActionBuilder() {
   }
 
   @Nonnull
+  @SuppressFBWarnings
   public static ShoppingListCustomActionBuilder of() {
     return builder;
   }