diff --git a/workflow-engine/src/main/java/com/redhat/parodos/workflows/work/WorkContext.java b/workflow-engine/src/main/java/com/redhat/parodos/workflows/work/WorkContext.java
index 4a123cbeb..8790c944e 100644
--- a/workflow-engine/src/main/java/com/redhat/parodos/workflows/work/WorkContext.java
+++ b/workflow-engine/src/main/java/com/redhat/parodos/workflows/work/WorkContext.java
@@ -27,6 +27,8 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import lombok.Data;
+
 /**
  * Work execution context. This can be used to pass initial parameters to the workflow and
  * share data between work units.
@@ -35,6 +37,7 @@
  *
  * @author Mahmoud Ben Hassine (mahmoud.benhassine@icloud.com)
  */
+@Data
 public class WorkContext {
 
 	private final Map<String, Object> context = new ConcurrentHashMap<>();
diff --git a/workflow-service/src/main/java/com/redhat/parodos/project/entity/ProjectUserRole.java b/workflow-service/src/main/java/com/redhat/parodos/project/entity/ProjectUserRole.java
index 66eb7da73..c3ea21a93 100644
--- a/workflow-service/src/main/java/com/redhat/parodos/project/entity/ProjectUserRole.java
+++ b/workflow-service/src/main/java/com/redhat/parodos/project/entity/ProjectUserRole.java
@@ -15,13 +15,11 @@
 import com.redhat.parodos.user.entity.User;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.Getter;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 
 @Entity(name = "prds_project_user_role")
-@Getter
-@Setter
+@Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
@@ -44,8 +42,7 @@ public class ProjectUserRole {
 
 	@Embeddable
 	@Builder
-	@Getter
-	@Setter
+	@Data
 	@AllArgsConstructor
 	@NoArgsConstructor
 	public static class Id implements Serializable {