diff --git a/bin/configs/other/scala-akka-http-server.yaml b/bin/configs/scala-akka-http-server.yaml
similarity index 78%
rename from bin/configs/other/scala-akka-http-server.yaml
rename to bin/configs/scala-akka-http-server.yaml
index 5e0cbcffe66..9c939d81af0 100644
--- a/bin/configs/other/scala-akka-http-server.yaml
+++ b/bin/configs/scala-akka-http-server.yaml
@@ -2,3 +2,5 @@ generatorName: scala-akka-http-server
 outputDir: samples/server/petstore/scala-akka-http-server
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/scala-akka-http-server
+additionalProperties:
+  artifactId: openapi-scala-akka-http-server
diff --git a/modules/openapi-generator/src/main/resources/scala-akka-http-server/api.mustache b/modules/openapi-generator/src/main/resources/scala-akka-http-server/api.mustache
index 17d30417221..27cb2cb8d4f 100644
--- a/modules/openapi-generator/src/main/resources/scala-akka-http-server/api.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-akka-http-server/api.mustache
@@ -64,7 +64,7 @@ object {{classname}}Patterns {
 trait {{classname}}Service {
 
 {{#operation}}
-{{#responses}}  def {{operationId}}{{#vendorExtensions.x-is-default}}Default{{/vendorExtensions.x-is-default}}{{^vendorExtensions.x-is-default}}{{code}}{{/vendorExtensions.x-is-default}}{{#baseType}}({{#vendorExtensions.x-is-default}}statusCode: Int, {{/vendorExtensions.x-is-default}}response{{baseType}}{{containerType}}: {{dataType}}){{^isPrimitiveType}}(implicit toEntityMarshaller{{baseType}}{{containerType}}: ToEntityMarshaller[{{dataType}}]){{/isPrimitiveType}}{{/baseType}}{{^baseType}}{{#vendorExtensions.x-is-default}}(statusCode: Int){{/vendorExtensions.x-is-default}}{{/baseType}}: Route ={{#vendorExtensions.x-empty-response}}
+{{#responses}}  def {{operationId}}{{#vendorExtensions.x-is-default}}Default{{/vendorExtensions.x-is-default}}{{^vendorExtensions.x-is-default}}{{code}}{{/vendorExtensions.x-is-default}}{{#baseType}}({{#vendorExtensions.x-is-default}}statusCode: Int, {{/vendorExtensions.x-is-default}}response{{baseType}}{{containerType}}: {{dataType}})(implicit toEntityMarshaller{{baseType}}{{containerType}}: ToEntityMarshaller[{{dataType}}]){{/baseType}}{{^baseType}}{{#vendorExtensions.x-is-default}}(statusCode: Int){{/vendorExtensions.x-is-default}}{{/baseType}}: Route ={{#vendorExtensions.x-empty-response}}
     complete({{#vendorExtensions.x-is-default}}statusCode{{/vendorExtensions.x-is-default}}{{^vendorExtensions.x-is-default}}StatusCodes.getForKey({{code}}){{/vendorExtensions.x-is-default}}){{/vendorExtensions.x-empty-response}}{{^vendorExtensions.x-empty-response}}
     complete(({{#vendorExtensions.x-is-default}}statusCode{{/vendorExtensions.x-is-default}}{{^vendorExtensions.x-is-default}}{{code}}{{/vendorExtensions.x-is-default}}, {{#baseType}}response{{baseType}}{{containerType}}{{/baseType}}{{^baseType}}"{{message}}"{{/baseType}})){{/vendorExtensions.x-empty-response}}
 {{/responses}}
diff --git a/modules/openapi-generator/src/main/resources/scala-akka-http-server/model.mustache b/modules/openapi-generator/src/main/resources/scala-akka-http-server/model.mustache
index fe51cb9a557..68cafc5f2c0 100644
--- a/modules/openapi-generator/src/main/resources/scala-akka-http-server/model.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-akka-http-server/model.mustache
@@ -19,7 +19,7 @@ import {{import}}
 */
 final case class {{classname}} (
   {{#vars}}
-  {{{name}}}: {{^required}}Option[{{/required}}{{datatype}}{{^required}}]{{/required}}{{^-last}},{{/-last}}
+  {{{name}}}: {{^required}}Option[{{/required}}{{datatype}}{{^required}}] = None{{/required}}{{^-last}},{{/-last}}
   {{/vars}}
 )
 
diff --git a/samples/server/petstore/scala-akka-http-server/.openapi-generator/VERSION b/samples/server/petstore/scala-akka-http-server/.openapi-generator/VERSION
index 4b448de535c..5f68295fc19 100644
--- a/samples/server/petstore/scala-akka-http-server/.openapi-generator/VERSION
+++ b/samples/server/petstore/scala-akka-http-server/.openapi-generator/VERSION
@@ -1 +1 @@
-5.3.0-SNAPSHOT
\ No newline at end of file
+6.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/api/UserApi.scala b/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/api/UserApi.scala
index 2d2dc2a7c6e..8ade9a66ff3 100644
--- a/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/api/UserApi.scala
+++ b/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/api/UserApi.scala
@@ -7,6 +7,7 @@ import akka.http.scaladsl.marshalling.ToEntityMarshaller
 import akka.http.scaladsl.unmarshalling.FromEntityUnmarshaller
 import akka.http.scaladsl.unmarshalling.FromStringUnmarshaller
 import org.openapitools.server.AkkaHttpHelper._
+import java.time.OffsetDateTime
 import org.openapitools.server.model.User
 
 
diff --git a/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/ApiResponse.scala b/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/ApiResponse.scala
index 9091fd61fbc..abe04c18183 100644
--- a/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/ApiResponse.scala
+++ b/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/ApiResponse.scala
@@ -11,8 +11,8 @@ package org.openapitools.server.model
  * @param message  for example: ''null''
 */
 final case class ApiResponse (
-  code: Option[Int],
-  `type`: Option[String],
-  message: Option[String]
+  code: Option[Int] = None,
+  `type`: Option[String] = None,
+  message: Option[String] = None
 )
 
diff --git a/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/Category.scala b/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/Category.scala
index cbde3f53016..f01b8adf6e0 100644
--- a/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/Category.scala
+++ b/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/Category.scala
@@ -10,7 +10,7 @@ package org.openapitools.server.model
  * @param name  for example: ''null''
 */
 final case class Category (
-  id: Option[Long],
-  name: Option[String]
+  id: Option[Long] = None,
+  name: Option[String] = None
 )
 
diff --git a/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/InlineObject.scala b/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/InlineObject.scala
index eba3cf1fa1e..5f9b232b5d8 100644
--- a/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/InlineObject.scala
+++ b/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/InlineObject.scala
@@ -6,7 +6,7 @@ package org.openapitools.server.model
  * @param status Updated status of the pet for example: ''null''
 */
 final case class InlineObject (
-  name: Option[String],
-  status: Option[String]
+  name: Option[String] = None,
+  status: Option[String] = None
 )
 
diff --git a/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/InlineObject1.scala b/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/InlineObject1.scala
index 36afc679abf..59a5a428301 100644
--- a/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/InlineObject1.scala
+++ b/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/InlineObject1.scala
@@ -7,7 +7,7 @@ import java.io.File
  * @param file file to upload for example: ''null''
 */
 final case class InlineObject1 (
-  additionalMetadata: Option[String],
-  file: Option[File]
+  additionalMetadata: Option[String] = None,
+  file: Option[File] = None
 )
 
diff --git a/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/Order.scala b/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/Order.scala
index 669df7946c4..e79e2c15cf6 100644
--- a/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/Order.scala
+++ b/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/Order.scala
@@ -15,11 +15,11 @@ import java.time.OffsetDateTime
  * @param complete  for example: ''null''
 */
 final case class Order (
-  id: Option[Long],
-  petId: Option[Long],
-  quantity: Option[Int],
-  shipDate: Option[OffsetDateTime],
-  status: Option[String],
-  complete: Option[Boolean]
+  id: Option[Long] = None,
+  petId: Option[Long] = None,
+  quantity: Option[Int] = None,
+  shipDate: Option[OffsetDateTime] = None,
+  status: Option[String] = None,
+  complete: Option[Boolean] = None
 )
 
diff --git a/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/Pet.scala b/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/Pet.scala
index 4e929dbccb8..0f58bcee1da 100644
--- a/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/Pet.scala
+++ b/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/Pet.scala
@@ -14,11 +14,11 @@ package org.openapitools.server.model
  * @param status pet status in the store for example: ''null''
 */
 final case class Pet (
-  id: Option[Long],
-  category: Option[Category],
+  id: Option[Long] = None,
+  category: Option[Category] = None,
   name: String,
   photoUrls: Seq[String],
-  tags: Option[Seq[Tag]],
-  status: Option[String]
+  tags: Option[Seq[Tag]] = None,
+  status: Option[String] = None
 )
 
diff --git a/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/Tag.scala b/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/Tag.scala
index 3e62ea28016..9daae0f44ff 100644
--- a/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/Tag.scala
+++ b/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/Tag.scala
@@ -10,7 +10,7 @@ package org.openapitools.server.model
  * @param name  for example: ''null''
 */
 final case class Tag (
-  id: Option[Long],
-  name: Option[String]
+  id: Option[Long] = None,
+  name: Option[String] = None
 )
 
diff --git a/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/User.scala b/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/User.scala
index 315a86efd65..18e1772ba4d 100644
--- a/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/User.scala
+++ b/samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/User.scala
@@ -16,13 +16,13 @@ package org.openapitools.server.model
  * @param userStatus User Status for example: ''null''
 */
 final case class User (
-  id: Option[Long],
-  username: Option[String],
-  firstName: Option[String],
-  lastName: Option[String],
-  email: Option[String],
-  password: Option[String],
-  phone: Option[String],
-  userStatus: Option[Int]
+  id: Option[Long] = None,
+  username: Option[String] = None,
+  firstName: Option[String] = None,
+  lastName: Option[String] = None,
+  email: Option[String] = None,
+  password: Option[String] = None,
+  phone: Option[String] = None,
+  userStatus: Option[Int] = None
 )