diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaSoftwareModuleManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaSoftwareModuleManagement.java
index 5be12498c..708ff51da 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaSoftwareModuleManagement.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaSoftwareModuleManagement.java
@@ -80,6 +80,7 @@ import org.springframework.validation.annotation.Validated;
 @Validated
 public class JpaSoftwareModuleManagement implements SoftwareModuleManagement {
 
+    protected static final String SOFTWARE_MODULE_METADATA = "SoftwareModuleMetadata";
     private final EntityManager entityManager;
     private final DistributionSetRepository distributionSetRepository;
     private final SoftwareModuleRepository softwareModuleRepository;
@@ -298,7 +299,7 @@ public class JpaSoftwareModuleManagement implements SoftwareModuleManagement {
     public SoftwareModuleMetadata getMetadata(final long id, final String key) {
         assertSoftwareModuleExists(id);
 
-        return findMetadata(id, key).orElseThrow(() -> new EntityNotFoundException("SoftwareModuleMetadata", id + ":" + key));
+        return findMetadata(id, key).orElseThrow(() -> new EntityNotFoundException(SOFTWARE_MODULE_METADATA, id + ":" + key));
     }
 
     @Override
@@ -337,7 +338,7 @@ public class JpaSoftwareModuleManagement implements SoftwareModuleManagement {
         // check if exists otherwise throw entity not found exception
         final JpaSoftwareModuleMetadata metadata = (JpaSoftwareModuleMetadata) findMetadata(
                 update.getSoftwareModuleId(), update.getKey())
-                .orElseThrow(() -> new EntityNotFoundException("SoftwareModuleMetadata", update.getSoftwareModuleId() + ":" + update.getKey()));
+                .orElseThrow(() -> new EntityNotFoundException(SOFTWARE_MODULE_METADATA, update.getSoftwareModuleId() + ":" + update.getKey()));
 
         update.getValue().ifPresent(metadata::setValue);
         update.isTargetVisible().ifPresent(metadata::setTargetVisible);
@@ -352,7 +353,7 @@ public class JpaSoftwareModuleManagement implements SoftwareModuleManagement {
             backoff = @Backoff(delay = Constants.TX_RT_DELAY))
     public void deleteMetadata(final long id, final String key) {
         final JpaSoftwareModuleMetadata metadata = (JpaSoftwareModuleMetadata) findMetadata(id, key)
-                .orElseThrow(() -> new EntityNotFoundException("SoftwareModuleMetadata", id + ":" + key));
+                .orElseThrow(() -> new EntityNotFoundException(SOFTWARE_MODULE_METADATA, id + ":" + key));
 
         JpaManagementHelper.touch(entityManager, softwareModuleRepository, metadata.getSoftwareModule());
         softwareModuleMetadataRepository.deleteById(metadata.getId());
diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/QuotaHelper.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/QuotaHelper.java
index 4785e5bde..3c711e70c 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/QuotaHelper.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/QuotaHelper.java
@@ -13,6 +13,7 @@ import java.util.function.ToLongFunction;
 
 import jakarta.validation.constraints.NotNull;
 
+import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.hawkbit.repository.exception.AssignmentQuotaExceededException;
@@ -20,7 +21,7 @@ import org.eclipse.hawkbit.repository.exception.AssignmentQuotaExceededException
 /**
  * Helper class to check quotas.
  */
-@NoArgsConstructor
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 @Slf4j
 public final class QuotaHelper {