diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/OffsetBasedPageRequest.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/OffsetBasedPageRequest.java
index 32dd28061..cd78c6b53 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/OffsetBasedPageRequest.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/OffsetBasedPageRequest.java
@@ -11,7 +11,9 @@ package org.eclipse.hawkbit.repository;
 
 import java.io.Serial;
 
-import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 
@@ -22,7 +24,9 @@ import org.springframework.data.domain.Sort;
  * the REST-API is working with {@code offset} and {@code limit} parameter we
  * need an offset based page request.
  */
-@Data
+@Getter
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 public final class OffsetBasedPageRequest extends PageRequest {
 
     @Serial
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetAssignmentResult.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetAssignmentResult.java
index a6a25e4b1..2731eeccb 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetAssignmentResult.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetAssignmentResult.java
@@ -12,14 +12,17 @@ package org.eclipse.hawkbit.repository.model;
 import java.util.Collections;
 import java.util.List;
 
-import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
 
 /**
- * A bean which holds a complex result of an service operation to combine the
- * information of an assignment and how much of the assignment has been done and
- * how much of the assignments had already been existed.
+ * A bean which holds a complex result of a service operation to combine the information of an assignment and how much of the assignment
+ * has been done and how much of the assignments had already been existed.
  */
-@Data
+@Getter
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 public class DistributionSetAssignmentResult extends AbstractAssignmentResult<Action> {
 
     private final DistributionSet distributionSet;
@@ -28,7 +31,7 @@ public class DistributionSetAssignmentResult extends AbstractAssignmentResult<Ac
      * Constructor.
      *
      * @param distributionSet that has been assigned
-     * @param alreadyAssigned the the count of already assigned targets
+     * @param alreadyAssigned the count of already assigned targets
      * @param assigned the assigned actions
      */
     public DistributionSetAssignmentResult(final DistributionSet distributionSet, final int alreadyAssigned,
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetTagAssignmentResult.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetTagAssignmentResult.java
index 1316ef2fc..7e1713373 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetTagAssignmentResult.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetTagAssignmentResult.java
@@ -11,7 +11,9 @@ package org.eclipse.hawkbit.repository.model;
 
 import java.util.List;
 
-import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
 
 /**
  * Result object for {@link DistributionSetTag} assignments.
@@ -19,7 +21,9 @@ import lombok.Data;
  * @deprecated since 0.6.0 with toggle deprecation
  */
 @Deprecated(forRemoval = true, since = "0.6.0")
-@Data
+@Getter
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 public class DistributionSetTagAssignmentResult extends AbstractAssignmentResult<DistributionSet> {
 
     private final DistributionSetTag distributionSetTag;
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetTagAssignmentResult.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetTagAssignmentResult.java
index 9dd677e32..4bda16c22 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetTagAssignmentResult.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetTagAssignmentResult.java
@@ -11,7 +11,9 @@ package org.eclipse.hawkbit.repository.model;
 
 import java.util.List;
 
-import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
 
 /**
  * Result object for {@link TargetTag} assignments.
@@ -19,7 +21,9 @@ import lombok.Data;
  * @deprecated since 0.6.0 with deprecation of toggle assignments
  */
 @Deprecated(forRemoval = true, since = "0.6.0")
-@Data
+@Getter
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 public class TargetTagAssignmentResult extends AbstractAssignmentResult<Target> {
 
     private final TargetTag targetTag;
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetTypeAssignmentResult.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetTypeAssignmentResult.java
index 62a5aa74e..2ae7ad1e6 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetTypeAssignmentResult.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetTypeAssignmentResult.java
@@ -11,12 +11,16 @@ package org.eclipse.hawkbit.repository.model;
 
 import java.util.List;
 
-import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
 
 /**
  * Result object for {@link TargetType} assignments.
  */
-@Data
+@Getter
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 public class TargetTypeAssignmentResult extends AbstractAssignmentResult<Target> {
 
     private final TargetType targetType;
diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/repository/BaseEntityRepository.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/repository/BaseEntityRepository.java
index 268453e23..fedb9f7d8 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/repository/BaseEntityRepository.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/repository/BaseEntityRepository.java
@@ -78,10 +78,7 @@ public interface BaseEntityRepository<T extends AbstractJpaTenantAwareBaseEntity
     @Override
     List<T> findAllById(final Iterable<Long> ids);
 
-    // TODO When we switch to Spring 3.0 probably we could remove extending methods using
-    // queries and make here a default implementation using JPASpecificationExecutor delete method
     // TODO To be considered if this method is needed at all
-
     /**
      * Deletes all entities of a given tenant from this repository. For safety
      * reasons (this is a "delete everything" query after all) we add the tenant