diff --git a/bin/configs/unmaintained/ocaml.yaml b/bin/configs/ocaml.yaml
similarity index 100%
rename from bin/configs/unmaintained/ocaml.yaml
rename to bin/configs/ocaml.yaml
diff --git a/modules/openapi-generator/src/main/resources/ocaml/model.mustache b/modules/openapi-generator/src/main/resources/ocaml/model.mustache
index d80e92c3055b..43518c27d96c 100644
--- a/modules/openapi-generator/src/main/resources/ocaml/model.mustache
+++ b/modules/openapi-generator/src/main/resources/ocaml/model.mustache
@@ -16,10 +16,10 @@ type t = {
     (* {{{.}}} *)
     {{/description}}
     {{#isEnum}}
-    {{{name}}}: {{^isMap}}Enums.{{/isMap}}{{{datatypeWithEnum}}}{{^isContainer}}{{#required}}{{#defaultValue}}[@default {{{.}}}]{{/defaultValue}}{{/required}}{{/isContainer}}{{^isContainer}}{{#required}}{{#isNullable}} option [@default {{#defaultValue}}Some({{{.}}}){{/defaultValue}}{{^defaultValue}}None{{/defaultValue}}]{{/isNullable}}{{/required}}{{/isContainer}}{{^isContainer}}{{^required}} option [@default {{#defaultValue}}Some({{{.}}}){{/defaultValue}}{{^defaultValue}}None{{/defaultValue}}]{{/required}}{{/isContainer}};
+    {{{name}}}: {{^isMap}}Enums.{{/isMap}}{{{datatypeWithEnum}}}{{^isContainer}}{{#required}}{{#defaultValue}}[@default {{{.}}}]{{/defaultValue}}{{/required}}{{/isContainer}}{{^isContainer}}{{#required}}{{#isNullable}} option [@default {{#defaultValue}}Some({{{.}}}){{/defaultValue}}{{^defaultValue}}None{{/defaultValue}}]{{/isNullable}}{{/required}}{{/isContainer}}{{^isContainer}}{{^required}} option [@default {{#defaultValue}}Some({{{.}}}){{/defaultValue}}{{^defaultValue}}None{{/defaultValue}}]{{/required}}{{/isContainer}}; [@key "{{{baseName}}}"]
     {{/isEnum}}
     {{^isEnum}}
-    {{{name}}}: {{{datatypeWithEnum}}}{{^isContainer}}{{#required}}{{#isNullable}} option{{/isNullable}}{{/required}}{{/isContainer}}{{^isContainer}}{{^required}} option [@default None]{{/required}}{{/isContainer}};
+    {{{name}}}: {{{datatypeWithEnum}}}{{^isContainer}}{{#required}}{{#isNullable}} option{{/isNullable}}{{/required}}{{/isContainer}}{{^isContainer}}{{^required}} option [@default None]{{/required}}{{/isContainer}}; [@key "{{{baseName}}}"]
     {{/isEnum}}
 {{/vars}}
 } [@@deriving yojson { strict = false }, show ];;
diff --git a/samples/client/petstore/ocaml/.openapi-generator/VERSION b/samples/client/petstore/ocaml/.openapi-generator/VERSION
index 89648de3311c..96cfbb19ae28 100644
--- a/samples/client/petstore/ocaml/.openapi-generator/VERSION
+++ b/samples/client/petstore/ocaml/.openapi-generator/VERSION
@@ -1 +1 @@
-6.0.1-SNAPSHOT
\ No newline at end of file
+7.13.0-SNAPSHOT
diff --git a/samples/client/petstore/ocaml/README.md b/samples/client/petstore/ocaml/README.md
index d90e0b2f23d2..4fd349fba16c 100644
--- a/samples/client/petstore/ocaml/README.md
+++ b/samples/client/petstore/ocaml/README.md
@@ -5,6 +5,7 @@ This OCaml package is automatically generated by the [OpenAPI Generator](https:/
 
 - API version: 1.0.0
 - Package version: 1.0.0
+- Generator version: 7.13.0-SNAPSHOT
 - Build package: org.openapitools.codegen.languages.OCamlClientCodegen
 
 ## Requirements.
diff --git a/samples/client/petstore/ocaml/src/models/api_response.ml b/samples/client/petstore/ocaml/src/models/api_response.ml
index 1b5a0aabac27..c0e9f89438e2 100644
--- a/samples/client/petstore/ocaml/src/models/api_response.ml
+++ b/samples/client/petstore/ocaml/src/models/api_response.ml
@@ -7,9 +7,9 @@
  *)
 
 type t = {
-    code: int32 option [@default None];
-    _type: string option [@default None];
-    message: string option [@default None];
+    code: int32 option [@default None]; [@key "code"]
+    _type: string option [@default None]; [@key "type"]
+    message: string option [@default None]; [@key "message"]
 } [@@deriving yojson { strict = false }, show ];;
 
 (** Describes the result of uploading an image resource *)
diff --git a/samples/client/petstore/ocaml/src/models/category.ml b/samples/client/petstore/ocaml/src/models/category.ml
index 830f34bc07bd..6360bbbda498 100644
--- a/samples/client/petstore/ocaml/src/models/category.ml
+++ b/samples/client/petstore/ocaml/src/models/category.ml
@@ -7,8 +7,8 @@
  *)
 
 type t = {
-    id: int64 option [@default None];
-    name: string option [@default None];
+    id: int64 option [@default None]; [@key "id"]
+    name: string option [@default None]; [@key "name"]
 } [@@deriving yojson { strict = false }, show ];;
 
 (** A category for a pet *)
diff --git a/samples/client/petstore/ocaml/src/models/order.ml b/samples/client/petstore/ocaml/src/models/order.ml
index e9f6a808003f..594d69278d79 100644
--- a/samples/client/petstore/ocaml/src/models/order.ml
+++ b/samples/client/petstore/ocaml/src/models/order.ml
@@ -7,13 +7,13 @@
  *)
 
 type t = {
-    id: int64 option [@default None];
-    pet_id: int64 option [@default None];
-    quantity: int32 option [@default None];
-    ship_date: string option [@default None];
+    id: int64 option [@default None]; [@key "id"]
+    pet_id: int64 option [@default None]; [@key "petId"]
+    quantity: int32 option [@default None]; [@key "quantity"]
+    ship_date: string option [@default None]; [@key "shipDate"]
     (* Order Status *)
-    status: Enums.status option [@default None];
-    complete: bool option [@default None];
+    status: Enums.status option [@default None]; [@key "status"]
+    complete: bool option [@default None]; [@key "complete"]
 } [@@deriving yojson { strict = false }, show ];;
 
 (** An order for a pets from the pet store *)
diff --git a/samples/client/petstore/ocaml/src/models/pet.ml b/samples/client/petstore/ocaml/src/models/pet.ml
index a1f379778ab0..34dcf0cd43c2 100644
--- a/samples/client/petstore/ocaml/src/models/pet.ml
+++ b/samples/client/petstore/ocaml/src/models/pet.ml
@@ -7,13 +7,13 @@
  *)
 
 type t = {
-    id: int64 option [@default None];
-    category: Category.t option [@default None];
-    name: string;
-    photo_urls: string list;
-    tags: Tag.t list;
+    id: int64 option [@default None]; [@key "id"]
+    category: Category.t option [@default None]; [@key "category"]
+    name: string; [@key "name"]
+    photo_urls: string list; [@key "photoUrls"]
+    tags: Tag.t list; [@key "tags"]
     (* pet status in the store *)
-    status: Enums.pet_status option [@default None];
+    status: Enums.pet_status option [@default None]; [@key "status"]
 } [@@deriving yojson { strict = false }, show ];;
 
 (** A pet for sale in the pet store *)
diff --git a/samples/client/petstore/ocaml/src/models/tag.ml b/samples/client/petstore/ocaml/src/models/tag.ml
index 3c33625f1980..36e5114e9af1 100644
--- a/samples/client/petstore/ocaml/src/models/tag.ml
+++ b/samples/client/petstore/ocaml/src/models/tag.ml
@@ -7,8 +7,8 @@
  *)
 
 type t = {
-    id: int64 option [@default None];
-    name: string option [@default None];
+    id: int64 option [@default None]; [@key "id"]
+    name: string option [@default None]; [@key "name"]
 } [@@deriving yojson { strict = false }, show ];;
 
 (** A tag for a pet *)
diff --git a/samples/client/petstore/ocaml/src/models/user.ml b/samples/client/petstore/ocaml/src/models/user.ml
index 586ef26b537d..39a6be65f066 100644
--- a/samples/client/petstore/ocaml/src/models/user.ml
+++ b/samples/client/petstore/ocaml/src/models/user.ml
@@ -7,15 +7,15 @@
  *)
 
 type t = {
-    id: int64 option [@default None];
-    username: string option [@default None];
-    first_name: string option [@default None];
-    last_name: string option [@default None];
-    email: string option [@default None];
-    password: string option [@default None];
-    phone: string option [@default None];
+    id: int64 option [@default None]; [@key "id"]
+    username: string option [@default None]; [@key "username"]
+    first_name: string option [@default None]; [@key "firstName"]
+    last_name: string option [@default None]; [@key "lastName"]
+    email: string option [@default None]; [@key "email"]
+    password: string option [@default None]; [@key "password"]
+    phone: string option [@default None]; [@key "phone"]
     (* User Status *)
-    user_status: int32 option [@default None];
+    user_status: int32 option [@default None]; [@key "userStatus"]
 } [@@deriving yojson { strict = false }, show ];;
 
 (** A User who is purchasing from the pet store *)