diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResourceTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResourceTest.java
index 7959057ba..1e21305cb 100644
--- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResourceTest.java
+++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResourceTest.java
@@ -497,7 +497,6 @@ public class  MgmtTargetFilterQueryResourceTest extends AbstractManagementApiInt
         }
 
         final TargetFilterQuery tfq = createSingleTargetFilterQuery(knownName, knownQuery);
-        // set will be implicitly locked
         final DistributionSet set = testdataFactory.createDistributionSet();
 
         // do not provide something about the confirmation
diff --git a/hawkbit-sdk/hawkbit-sdk-demo/src/main/java/org/eclipse/hawkbit/sdk/demo/SetupHelper.java b/hawkbit-sdk/hawkbit-sdk-demo/src/main/java/org/eclipse/hawkbit/sdk/demo/SetupHelper.java
index 9f12b7283..ec4442589 100644
--- a/hawkbit-sdk/hawkbit-sdk-demo/src/main/java/org/eclipse/hawkbit/sdk/demo/SetupHelper.java
+++ b/hawkbit-sdk/hawkbit-sdk-demo/src/main/java/org/eclipse/hawkbit/sdk/demo/SetupHelper.java
@@ -50,7 +50,8 @@ public class SetupHelper {
     public static void setupTargetAuthentication(final HawkbitClient hawkbitClient, final Tenant tenant) {
         final MgmtTenantManagementRestApi mgmtTenantManagementRestApi =
                 hawkbitClient.mgmtService(MgmtTenantManagementRestApi.class, tenant);
-        if (ObjectUtils.isEmpty(tenant.getGatewayToken())) {
+        final String gatewayToken = tenant.getGatewayToken();
+        if (ObjectUtils.isEmpty(gatewayToken)) {
             if (!((Boolean) Objects.requireNonNull(mgmtTenantManagementRestApi
                     .getTenantConfigurationValue(AUTHENTICATION_MODE_TARGET_SECURITY_TOKEN_ENABLED)
                     .getBody()).getValue())) {
@@ -66,12 +67,12 @@ public class SetupHelper {
                         Map.of(AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_ENABLED, true)
                 );
             }
-            if (!tenant.getGatewayToken().equals(
+            if (!gatewayToken.equals(
                     Objects.requireNonNull(mgmtTenantManagementRestApi
                         .getTenantConfigurationValue(AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_KEY)
                         .getBody()).getValue())) {
                 mgmtTenantManagementRestApi.updateTenantConfiguration(
-                        Map.of(AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_KEY, tenant.getGatewayToken())
+                        Map.of(AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_KEY, gatewayToken)
                 );
             }
         }
diff --git a/hawkbit-sdk/hawkbit-sdk-device/src/main/java/org/eclipse/hawkbit/sdk/device/DdiController.java b/hawkbit-sdk/hawkbit-sdk-device/src/main/java/org/eclipse/hawkbit/sdk/device/DdiController.java
index c7b5a1a90..dec3b0b74 100644
--- a/hawkbit-sdk/hawkbit-sdk-device/src/main/java/org/eclipse/hawkbit/sdk/device/DdiController.java
+++ b/hawkbit-sdk/hawkbit-sdk-device/src/main/java/org/eclipse/hawkbit/sdk/device/DdiController.java
@@ -69,6 +69,7 @@ public class DdiController {
     private long overridePollMillis = -1; // -1 means disabled
 
     // state
+    @SuppressWarnings("java:S3077") // volatile used only for the reference as expected
     private volatile ScheduledExecutorService executorService;
     private volatile Long currentActionId;
 
diff --git a/hawkbit-sdk/hawkbit-sdk-device/src/main/java/org/eclipse/hawkbit/sdk/device/UpdateHandler.java b/hawkbit-sdk/hawkbit-sdk-device/src/main/java/org/eclipse/hawkbit/sdk/device/UpdateHandler.java
index 704a043d4..6298b494b 100644
--- a/hawkbit-sdk/hawkbit-sdk-device/src/main/java/org/eclipse/hawkbit/sdk/device/UpdateHandler.java
+++ b/hawkbit-sdk/hawkbit-sdk-device/src/main/java/org/eclipse/hawkbit/sdk/device/UpdateHandler.java
@@ -68,8 +68,9 @@ public interface UpdateHandler {
         private static final String LOG_PREFIX = "[{}:{}] ";
 
         private static final String DOWNLOAD_LOG_MESSAGE = "Download ";
+        private static final String EXPECTED = "(Expected: ";
         private static final String BUT_GOT_LOG_MESSAGE = " but got: ";
-        private static final int MINIMUM_TOKENLENGTH_FOR_HINT = 6;
+        private static final int MINIMUM_TOKEN_LENGTH_FOR_HINT = 6;
 
         private final DdiController ddiController;
 
@@ -239,7 +240,7 @@ public interface UpdateHandler {
                         }
 
                         if (response.getEntity().getContentLength() != size) {
-                            throw new IllegalArgumentException("Wrong content length " + "(Expected: " + size + BUT_GOT_LOG_MESSAGE + response.getEntity()
+                            throw new IllegalArgumentException("Wrong content length " + EXPECTED + size + BUT_GOT_LOG_MESSAGE + response.getEntity()
                                     .getContentLength() + ")!");
                         }
 
@@ -284,7 +285,7 @@ public interface UpdateHandler {
                 return "<EMPTY!>";
             }
 
-            if (targetToken.length() <= MINIMUM_TOKENLENGTH_FOR_HINT) {
+            if (targetToken.length() <= MINIMUM_TOKEN_LENGTH_FOR_HINT) {
                 return "***";
             }
 
@@ -325,16 +326,14 @@ public interface UpdateHandler {
                 public void read(final byte[] buff, final int len) {
                     read += len;
                     if (read > size) {
-                        throw new SecurityException("Size mismatch: read more " +
-                                "(Expected: " + size + BUT_GOT_LOG_MESSAGE + read + ")!");
+                        throw new SecurityException("Size mismatch: read more " + EXPECTED + size + BUT_GOT_LOG_MESSAGE + read + ")!");
                     }
                 }
 
                 @Override
                 public void validate() {
                     if (read != size) {
-                        throw new SecurityException("Size mismatch " +
-                                "(Expected: " + size + BUT_GOT_LOG_MESSAGE + read + ")!");
+                        throw new SecurityException("Size mismatch " + EXPECTED + size + BUT_GOT_LOG_MESSAGE + read + ")!");
                     }
                 }
             };
@@ -360,8 +359,7 @@ public interface UpdateHandler {
                     final String actual = BaseEncoding.base16().lowerCase().encode(messageDigest.digest());
                     if (!actual.equals(expected)) {
                         throw new SecurityException(
-                                messageDigest.getAlgorithm() + " hash mismatch " +
-                                        "(Expected: " + expected + BUT_GOT_LOG_MESSAGE + actual + ")!");
+                                messageDigest.getAlgorithm() + " hash mismatch " + EXPECTED + expected + BUT_GOT_LOG_MESSAGE + actual + ")!");
                     }
                 }
             }