diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/broker/kafka/domain/KafkaModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/broker/kafka/domain/KafkaModuleFactory.java
index 769c52501ae..f00c310fde4 100644
--- a/src/main/java/tech/jhipster/lite/generator/server/springboot/broker/kafka/domain/KafkaModuleFactory.java
+++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/broker/kafka/domain/KafkaModuleFactory.java
@@ -25,7 +25,7 @@ public KafkaModuleFactory(final DockerImages dockerImages) {
 
   public JHipsterModule buildModuleInit(final JHipsterModuleProperties properties) {
     //@formatter:off
-    final JHipsterModuleBuilder builder = moduleBuilder(properties)
+    return moduleBuilder(properties)
       .context()
         .put("zookeeperDockerImage", dockerImages.get("confluentinc/cp-zookeeper").fullName())
         .put("kafkaDockerImage", dockerImages.get("confluentinc/cp-kafka").fullName())
@@ -67,10 +67,9 @@ public JHipsterModule buildModuleInit(final JHipsterModuleProperties properties)
         .set(propertyKey("kafka.producer.'[key.serializer]'"), propertyValue(STRING_SERIALIZER))
         .set(propertyKey("kafka.producer.'[value.serializer]'"), propertyValue(STRING_SERIALIZER))
         .set(propertyKey("kafka.polling.timeout"), propertyValue("10000"))
-        .and();
+        .and()
+      .build();
     //@formatter:on
-
-    return builder.build();
   }
 
   private String extendWith() {
@@ -87,7 +86,7 @@ private String importExtendWith() {
 
   public JHipsterModule buildModuleDummyProducerConsumer(final JHipsterModuleProperties properties) {
     //@formatter:off
-    final JHipsterModuleBuilder builder = moduleBuilder(properties)
+    return moduleBuilder(properties)
       .springMainProperties()
         .set(propertyKey("kafka.topic.dummy"), propertyValue("queue." + properties.projectBaseName().name() + ".dummy"))
         .and()
@@ -102,23 +101,21 @@ public JHipsterModule buildModuleDummyProducerConsumer(final JHipsterModulePrope
         .add(SOURCE.template("DummyConsumer.java"), toSrcMainJava().append(properties.basePackage().path() + "/" + DUMMY_INFRASTRUCTURE_PRIMARY_KAFKA_CONSUMER + "/DummyConsumer.java"))
         .add(SOURCE.template("DummyConsumerTest.java"), toSrcTestJava().append(properties.basePackage().path() + "/" + DUMMY_INFRASTRUCTURE_PRIMARY_KAFKA_CONSUMER + "/DummyConsumerTest.java"))
         .add(SOURCE.template("DummyConsumerIT.java"), toSrcTestJava().append(properties.basePackage().path() + "/" + DUMMY_INFRASTRUCTURE_PRIMARY_KAFKA_CONSUMER + "/DummyConsumerIT.java"))
-        .and();
+        .and()
+      .build();
     //@formatter:on
-
-    return builder.build();
   }
 
   public JHipsterModule buildModuleAkhq(JHipsterModuleProperties properties) {
     //@formatter:off
-    final JHipsterModuleBuilder builder = moduleBuilder(properties)
+    return moduleBuilder(properties)
       .context()
         .put("akhqDockerImage", dockerImages.get("tchiotludo/akhq").fullName())
         .and()
       .files()
         .add(SOURCE.template("akhq.yml"), toSrcMainDocker().append("akhq.yml"))
-        .and();
+        .and()
+      .build();
     //@formatter:on
-
-    return builder.build();
   }
 }
diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/broker/kafka/domain/KafkaModuleFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/broker/kafka/domain/KafkaModuleFactoryTest.java
index 0ad3b3421be..585277c7ff8 100644
--- a/src/test/java/tech/jhipster/lite/generator/server/springboot/broker/kafka/domain/KafkaModuleFactoryTest.java
+++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/broker/kafka/domain/KafkaModuleFactoryTest.java
@@ -116,20 +116,17 @@ void shouldBuildKafkaModuleDummyProducerConsumer() {
       .createFile(TEST_RESOURCES + "/config/application.properties")
       .containing("kafka.topic.dummy=queue.myapp.dummy")
       .and()
-      .createFile(MAIN_JAVA + "/" + properties.basePackage().path() + "/" + dummyProducerPath + "/DummyProducer.java")
-      .and()
-      .createFile(TEST_JAVA + "/" + properties.basePackage().path() + "/" + dummyProducerPath + "/DummyProducerTest.java")
-      .and()
-      .createFile(TEST_JAVA + "/" + properties.basePackage().path() + "/" + dummyProducerPath + "/DummyProducerIT.java")
-      .and()
-      .createFile(MAIN_JAVA + "/" + properties.basePackage().path() + "/" + dummyConsumerPath + "/AbstractConsumer.java")
-      .and()
-      .createFile(MAIN_JAVA + "/" + properties.basePackage().path() + "/" + dummyConsumerPath + "/DummyConsumer.java")
-      .and()
-      .createFile(TEST_JAVA + "/" + properties.basePackage().path() + "/" + dummyConsumerPath + "/DummyConsumerTest.java")
-      .and()
-      .createFile(TEST_JAVA + "/" + properties.basePackage().path() + "/" + dummyConsumerPath + "/DummyConsumerIT.java")
-      .and();
+      .createFiles(
+        MAIN_JAVA + "/" + properties.basePackage().path() + "/" + dummyProducerPath + "/DummyProducer.java",
+        MAIN_JAVA + "/" + properties.basePackage().path() + "/" + dummyConsumerPath + "/AbstractConsumer.java",
+        MAIN_JAVA + "/" + properties.basePackage().path() + "/" + dummyConsumerPath + "/DummyConsumer.java"
+      )
+      .createFiles(
+        TEST_JAVA + "/" + properties.basePackage().path() + "/" + dummyProducerPath + "/DummyProducerTest.java",
+        TEST_JAVA + "/" + properties.basePackage().path() + "/" + dummyProducerPath + "/DummyProducerIT.java",
+        TEST_JAVA + "/" + properties.basePackage().path() + "/" + dummyConsumerPath + "/DummyConsumerTest.java",
+        TEST_JAVA + "/" + properties.basePackage().path() + "/" + dummyConsumerPath + "/DummyConsumerIT.java"
+      );
   }
 
   @Test