diff --git a/components/order-processing/backend/pom.xml b/components/order-processing/backend/pom.xml
index c779250f..acc7a049 100644
--- a/components/order-processing/backend/pom.xml
+++ b/components/order-processing/backend/pom.xml
@@ -182,7 +182,7 @@
                 <swaggerDocketConfig>false</swaggerDocketConfig>
                 <reactive>false</reactive>
                 <bigDecimalAsString>true</bigDecimalAsString>
-                <useOptional>true</useOptional>
+                <useOptional>false</useOptional>
                 <useBeanValidation>true</useBeanValidation>
                 <useSpringBoot3>true</useSpringBoot3>
               </configOptions>
diff --git a/components/tasklist-reactive-backend/pom.xml b/components/tasklist-reactive-backend/pom.xml
index 1e042971..7285f10e 100755
--- a/components/tasklist-reactive-backend/pom.xml
+++ b/components/tasklist-reactive-backend/pom.xml
@@ -142,7 +142,7 @@
                 <swaggerDocketConfig>false</swaggerDocketConfig>
                 <reactive>false</reactive>
                 <bigDecimalAsString>true</bigDecimalAsString>
-                <useOptional>true</useOptional>
+                <useOptional>false</useOptional>
                 <useBeanValidation>true</useBeanValidation>
                 <useSpringBoot3>true</useSpringBoot3>
               </configOptions>
diff --git a/pom.xml b/pom.xml
index 11e91b71..9bc60ee5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -249,7 +249,7 @@
           <!-- Open API generator -->
           <groupId>org.openapitools</groupId>
           <artifactId>openapi-generator-maven-plugin</artifactId>
-          <version>7.0.1</version>
+          <version>7.4.0</version>
         </plugin>
 
         <plugin>
diff --git a/scenarios/distributed-axon-server/cockpit-application/backend/pom.xml b/scenarios/distributed-axon-server/cockpit-application/backend/pom.xml
index 02e86f57..b276adbd 100644
--- a/scenarios/distributed-axon-server/cockpit-application/backend/pom.xml
+++ b/scenarios/distributed-axon-server/cockpit-application/backend/pom.xml
@@ -152,7 +152,7 @@
                 <swaggerDocketConfig>false</swaggerDocketConfig>
                 <reactive>true</reactive>
                 <bigDecimalAsString>true</bigDecimalAsString>
-                <useOptional>true</useOptional>
+                <useOptional>false</useOptional>
                 <useBeanValidation>false</useBeanValidation>
                 <useSpringBoot3>true</useSpringBoot3>
               </configOptions>