diff --git a/apps/lombok.config b/apps/lombok.config
index 6fb4b534..8a52cc50 100644
--- a/apps/lombok.config
+++ b/apps/lombok.config
@@ -1,4 +1,2 @@
 lombok.builder.className=Builder
 lombok.addLombokGeneratedAnnotation=true
-lombok.accessors.fluent=false
-lombok.accessors.chain=true
diff --git a/libs/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulkaNewRequestEg.java b/libs/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulkaNewRequestEg.java
index 20922c3a..a16727c2 100644
--- a/libs/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulkaNewRequestEg.java
+++ b/libs/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulkaNewRequestEg.java
@@ -4,8 +4,11 @@ public class SepulkaNewRequestEg {
     public static final String NAME = "foo";
 
     public static class Pojos {
+
         public static SepulkaNewRequestMsg sepulkaNewRequestMsg() {
-            return new SepulkaNewRequestMsg().setName(NAME);
+            var requestMsg = new SepulkaNewRequestMsg();
+            requestMsg.setName(NAME);
+            return requestMsg;
         }
     }
 }
diff --git a/libs/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulkaNewResponseEg.java b/libs/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulkaNewResponseEg.java
index b5dd8b5e..9b7d7a19 100644
--- a/libs/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulkaNewResponseEg.java
+++ b/libs/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulkaNewResponseEg.java
@@ -7,11 +7,15 @@ public class SepulkaNewResponseEg {
     public static class Pojos {
 
         public static SepulkaNewResponseMsg sepulkaNewResponseMsg() {
-            return new SepulkaNewResponseMsg().setId(UUID.randomUUID().toString());
+            var responseMsg = new SepulkaNewResponseMsg();
+            responseMsg.setId(UUID.randomUUID().toString());
+            return responseMsg;
         }
 
         public static SepulkaNewResponseMsg sepulkaNewResponseMsg(UUID id) {
-            return sepulkaNewResponseMsg().setId(id.toString());
+            var responseMsg = sepulkaNewResponseMsg();
+            responseMsg.setId(id.toString());
+            return responseMsg;
         }
     }
 }
diff --git a/libs/lombok.config b/libs/lombok.config
index 6fb4b534..8a52cc50 100644
--- a/libs/lombok.config
+++ b/libs/lombok.config
@@ -1,4 +1,2 @@
 lombok.builder.className=Builder
 lombok.addLombokGeneratedAnnotation=true
-lombok.accessors.fluent=false
-lombok.accessors.chain=true
diff --git a/libs/storage/src/main/java/smecalculus/bezmen/configuration/StateMappingPropsEg.java b/libs/storage/src/main/java/smecalculus/bezmen/configuration/StateMappingPropsEg.java
index 8ca3589b..c7bb4c25 100644
--- a/libs/storage/src/main/java/smecalculus/bezmen/configuration/StateMappingPropsEg.java
+++ b/libs/storage/src/main/java/smecalculus/bezmen/configuration/StateMappingPropsEg.java
@@ -5,7 +5,9 @@
 public class StateMappingPropsEg {
     public static class Pojos {
         public static StateMappingPropsCfg stateMappingPropsCfg() {
-            return new StateMappingPropsCfg().setMode(SPRING_DATA.name());
+            StateMappingPropsCfg propsCfg = new StateMappingPropsCfg();
+            propsCfg.setMode(SPRING_DATA.name());
+            return propsCfg;
         }
     }
 
diff --git a/libs/storage/src/main/java/smecalculus/bezmen/configuration/StoragePropsEg.java b/libs/storage/src/main/java/smecalculus/bezmen/configuration/StoragePropsEg.java
index ba2dac45..c4784ce7 100644
--- a/libs/storage/src/main/java/smecalculus/bezmen/configuration/StoragePropsEg.java
+++ b/libs/storage/src/main/java/smecalculus/bezmen/configuration/StoragePropsEg.java
@@ -8,7 +8,10 @@
 public class StoragePropsEg {
     public static class Pojos {
         public static StoragePropsCfg storagePropsCfg() {
-            return new StoragePropsCfg().setProtocol(storageProtocolPropsCfg()).setMapping(stateMappingPropsCfg());
+            StoragePropsCfg propsCfg = new StoragePropsCfg();
+            propsCfg.setProtocol(storageProtocolPropsCfg());
+            propsCfg.setMapping(stateMappingPropsCfg());
+            return propsCfg;
         }
     }
 
diff --git a/libs/storage/src/main/java/smecalculus/bezmen/configuration/StorageProtocolPropsEg.java b/libs/storage/src/main/java/smecalculus/bezmen/configuration/StorageProtocolPropsEg.java
index efce19d4..e4e89b39 100644
--- a/libs/storage/src/main/java/smecalculus/bezmen/configuration/StorageProtocolPropsEg.java
+++ b/libs/storage/src/main/java/smecalculus/bezmen/configuration/StorageProtocolPropsEg.java
@@ -3,7 +3,9 @@
 public class StorageProtocolPropsEg {
     public static class Pojos {
         public static StorageProtocolPropsCfg storageProtocolPropsCfg() {
-            return new StorageProtocolPropsCfg().setMode(StorageProtocolMode.H2.name());
+            StorageProtocolPropsCfg propsCfg = new StorageProtocolPropsCfg();
+            propsCfg.setMode(StorageProtocolMode.H2.name());
+            return propsCfg;
         }
     }