diff --git a/e2e/src/test/resources/projects/customer-address-postgres-json/customer-address-postgres-json.zdl b/e2e/src/test/resources/projects/customer-address-postgres-json/customer-address-postgres-json.zdl
index d78f4f66..0ff4aca9 100644
--- a/e2e/src/test/resources/projects/customer-address-postgres-json/customer-address-postgres-json.zdl
+++ b/e2e/src/test/resources/projects/customer-address-postgres-json/customer-address-postgres-json.zdl
@@ -5,7 +5,7 @@ config {
     title "ZenWave Playground Customer-Address MariaDB"
     basePackage "io.zenwave360.example"
     persistence jpa
-    databaseType mariadb
+    databaseType postgresql
 //    haltOnFailFormatting false
 
     plugins {
diff --git a/e2e/src/test/resources/projects/customer-address-postgres-json/pom.xml b/e2e/src/test/resources/projects/customer-address-postgres-json/pom.xml
index 7e2fd502..27a5f1be 100644
--- a/e2e/src/test/resources/projects/customer-address-postgres-json/pom.xml
+++ b/e2e/src/test/resources/projects/customer-address-postgres-json/pom.xml
@@ -18,7 +18,7 @@
 		<spring-boot.version>${project.parent.version}</spring-boot.version>
 		<spring-cloud.version>2022.0.4</spring-cloud.version>
 
-		<zenwave.version>1.6.0</zenwave.version>
+		<zenwave.version>1.7.0-SNAPSHOT</zenwave.version>
 
 		<jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
 		<mapstruct.version>1.5.3.Final</mapstruct.version>
diff --git a/e2e/src/test/resources/projects/customer-address-relational/pom.xml b/e2e/src/test/resources/projects/customer-address-relational/pom.xml
index 5db5954c..65c04ea7 100644
--- a/e2e/src/test/resources/projects/customer-address-relational/pom.xml
+++ b/e2e/src/test/resources/projects/customer-address-relational/pom.xml
@@ -18,7 +18,7 @@
 		<spring-boot.version>${project.parent.version}</spring-boot.version>
 		<spring-cloud.version>2022.0.4</spring-cloud.version>
 
-		<zenwave.version>1.6.0</zenwave.version>
+		<zenwave.version>1.7.0-SNAPSHOT</zenwave.version>
 
 		<jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
 		<mapstruct.version>1.5.3.Final</mapstruct.version>
diff --git a/e2e/src/test/resources/projects/online-food-delivery-mongo/pom.xml b/e2e/src/test/resources/projects/online-food-delivery-mongo/pom.xml
index b8e50f63..7029e79c 100644
--- a/e2e/src/test/resources/projects/online-food-delivery-mongo/pom.xml
+++ b/e2e/src/test/resources/projects/online-food-delivery-mongo/pom.xml
@@ -20,7 +20,7 @@
 		<spring-cloud.version>2022.0.4</spring-cloud.version>
 		<spring-modulith-bom.version>1.1.1</spring-modulith-bom.version>
 
-		<zenwave.version>1.6.0</zenwave.version>
+		<zenwave.version>1.7.0-SNAPSHOT</zenwave.version>
 
 		<jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
 		<mapstruct.version>1.5.3.Final</mapstruct.version>
diff --git a/e2e/src/test/resources/projects/simple-domain-packaging/pom.xml b/e2e/src/test/resources/projects/simple-domain-packaging/pom.xml
index 2ccb37cd..50d6137d 100644
--- a/e2e/src/test/resources/projects/simple-domain-packaging/pom.xml
+++ b/e2e/src/test/resources/projects/simple-domain-packaging/pom.xml
@@ -18,7 +18,7 @@
 		<spring-boot.version>${project.parent.version}</spring-boot.version>
 		<spring-cloud.version>2022.0.4</spring-cloud.version>
 
-		<zenwave.version>1.6.0</zenwave.version>
+		<zenwave.version>1.7.0-SNAPSHOT</zenwave.version>
 
 		<jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
 		<mapstruct.version>1.5.3.Final</mapstruct.version>
diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/parsers/ZDLParser.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/parsers/ZDLParser.java
index 83f86c97..04c71402 100644
--- a/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/parsers/ZDLParser.java
+++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/parsers/ZDLParser.java
@@ -97,7 +97,9 @@ public void updateConfiguration(Plugin configuration, Map<String, Object> model)
         var zdl = model.get(targetProperty);
         var config = JSONPath.get(zdl, "$.config", Map.<String, Object>of());
         for (var entry : config.entrySet()) {
-            configuration.withOption(entry.getKey(), entry.getValue());
+            if(!configuration.getOptions().containsKey(entry.getKey())) {
+                configuration.withOption(entry.getKey(), entry.getValue());
+            }
         }
     }
 }
diff --git a/zenwave-sdk-maven-plugin/src/main/java/io/zenwave360/sdk/GeneratorMojo.java b/zenwave-sdk-maven-plugin/src/main/java/io/zenwave360/sdk/GeneratorMojo.java
index f63ebab0..1d6483e8 100644
--- a/zenwave-sdk-maven-plugin/src/main/java/io/zenwave360/sdk/GeneratorMojo.java
+++ b/zenwave-sdk-maven-plugin/src/main/java/io/zenwave360/sdk/GeneratorMojo.java
@@ -39,13 +39,13 @@ public class GeneratorMojo extends AbstractMojo {
     /**
      * Location of the ZDL model, as URL or file.
      */
-    @Parameter(name = "zdlFile", property = "zenwave.zdlFile", required = true)
+    @Parameter(name = "zdlFile", property = "zenwave.zdlFile")
     private String zdlFile;
 
     /**
      * Location of the ZDL model, as URL or file.
      */
-    @Parameter(name = "zdlFiles", property = "zenwave.zdlFiles", required = true)
+    @Parameter(name = "zdlFiles", property = "zenwave.zdlFiles")
     private String[] zdlFiles;
 
 
@@ -127,6 +127,7 @@ public void execute() throws MojoExecutionException {
             }
             if(apiFile.endsWith(".zdl") && !zdls.contains(apiFile)) {
                 zdls.add(apiFile);
+                apiFile = null;
             }
             if(zdlFiles != null) {
                 zdls.addAll(Arrays.asList(zdlFiles));