diff --git a/README.md b/README.md
index cc369911b..5ca6461b6 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,9 @@ The project is very much Work In Progress and will be published on maven central
 
 # Release Notes
 BOAT is still under development and subject to change.
+## 0.17.7
+* Boat maven plugin
+  * Fix: Added 'containerDefaultToNull' default option to the MOJO generator
 ## 0.17.6
 * Boat engine
   * Fix: Processing of a single string type example on media-type.
diff --git a/boat-maven-plugin/src/main/java/com/backbase/oss/boat/AbstractGenerateMojo.java b/boat-maven-plugin/src/main/java/com/backbase/oss/boat/AbstractGenerateMojo.java
index b8fdffb99..14fd6e0ef 100644
--- a/boat-maven-plugin/src/main/java/com/backbase/oss/boat/AbstractGenerateMojo.java
+++ b/boat-maven-plugin/src/main/java/com/backbase/oss/boat/AbstractGenerateMojo.java
@@ -23,6 +23,7 @@ public void execute(String generatorName, String library, boolean isEmbedded, bo
         options.put("useOptional", "false");
         options.put("useJakartaEe", "true");
         options.put("useSpringBoot3", "true");
+        options.put("containerDefaultToNull", "true");
 
         this.generatorName = generatorName;
         this.generateSupportingFiles = generateSupportingFiles;