diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
index e94b47c326fe..0af4430d937e 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
@@ -66,6 +66,11 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}}
   {{#vendorExtensions.x-field-extra-annotation}}
   {{{vendorExtensions.x-field-extra-annotation}}}
   {{/vendorExtensions.x-field-extra-annotation}}
+  {{#lombok.Builder}}
+  {{#defaultValue}}
+  @lombok.Builder.Default
+  {{/defaultValue}}
+  {{/lombok.Builder}}
   {{#deprecated}}
   @Deprecated
   {{/deprecated}}
diff --git a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Order.java
index e7f45e105e08..bada6dab4765 100644
--- a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Order.java
@@ -77,6 +77,7 @@ public static StatusEnum fromValue(String value) {
 
   private StatusEnum status;
 
+  @lombok.Builder.Default
   private Boolean complete = false;
 
 }
diff --git a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Pet.java
index d3ae9e98e83d..3db856a2e303 100644
--- a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Pet.java
@@ -38,9 +38,11 @@ public class Pet {
 
   private String name;
 
+  @lombok.Builder.Default
   @Valid
   private List<String> photoUrls = new ArrayList<>();
 
+  @lombok.Builder.Default
   @Valid
   private List<@Valid Tag> tags = new ArrayList<>();