diff --git a/modelina-cli/README.md b/modelina-cli/README.md
index 33ae961910..ef92ec2f77 100644
--- a/modelina-cli/README.md
+++ b/modelina-cli/README.md
@@ -162,7 +162,7 @@ $ npm install -g @asyncapi/modelina-cli
 $ modelina COMMAND
 running command...
 $ modelina (--version)
-@asyncapi/modelina-cli/4.0.0-next.63 linux-x64 node-v18.20.5
+@asyncapi/modelina-cli/4.0.0-next.64 linux-x64 node-v18.20.5
 $ modelina --help [COMMAND]
 USAGE
   $ modelina COMMAND
@@ -240,7 +240,7 @@ DESCRIPTION
   CLI config settings
 ```
 
-_See code: [src/commands/config/index.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.63/modelina-cli/src/commands/config/index.ts)_
+_See code: [src/commands/config/index.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.64/modelina-cli/src/commands/config/index.ts)_
 
 ## `modelina config context`
 
@@ -254,7 +254,7 @@ DESCRIPTION
   Manage short aliases for full paths to inputs
 ```
 
-_See code: [src/commands/config/context/index.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.63/modelina-cli/src/commands/config/context/index.ts)_
+_See code: [src/commands/config/context/index.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.64/modelina-cli/src/commands/config/context/index.ts)_
 
 ## `modelina config context add CONTEXT-NAME SPEC-FILE-PATH`
 
@@ -276,7 +276,7 @@ DESCRIPTION
   Add a context to the store
 ```
 
-_See code: [src/commands/config/context/add.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.63/modelina-cli/src/commands/config/context/add.ts)_
+_See code: [src/commands/config/context/add.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.64/modelina-cli/src/commands/config/context/add.ts)_
 
 ## `modelina config context current`
 
@@ -293,7 +293,7 @@ DESCRIPTION
   Shows the current context that is being used
 ```
 
-_See code: [src/commands/config/context/current.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.63/modelina-cli/src/commands/config/context/current.ts)_
+_See code: [src/commands/config/context/current.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.64/modelina-cli/src/commands/config/context/current.ts)_
 
 ## `modelina config context edit CONTEXT-NAME NEW-SPEC-FILE-PATH`
 
@@ -314,7 +314,7 @@ DESCRIPTION
   Edit a context in the store
 ```
 
-_See code: [src/commands/config/context/edit.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.63/modelina-cli/src/commands/config/context/edit.ts)_
+_See code: [src/commands/config/context/edit.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.64/modelina-cli/src/commands/config/context/edit.ts)_
 
 ## `modelina config context init [CONTEXT-FILE-PATH]`
 
@@ -337,7 +337,7 @@ DESCRIPTION
   Initialize context
 ```
 
-_See code: [src/commands/config/context/init.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.63/modelina-cli/src/commands/config/context/init.ts)_
+_See code: [src/commands/config/context/init.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.64/modelina-cli/src/commands/config/context/init.ts)_
 
 ## `modelina config context list`
 
@@ -354,7 +354,7 @@ DESCRIPTION
   List all the stored contexts in the store
 ```
 
-_See code: [src/commands/config/context/list.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.63/modelina-cli/src/commands/config/context/list.ts)_
+_See code: [src/commands/config/context/list.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.64/modelina-cli/src/commands/config/context/list.ts)_
 
 ## `modelina config context remove CONTEXT-NAME`
 
@@ -374,7 +374,7 @@ DESCRIPTION
   Delete a context from the store
 ```
 
-_See code: [src/commands/config/context/remove.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.63/modelina-cli/src/commands/config/context/remove.ts)_
+_See code: [src/commands/config/context/remove.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.64/modelina-cli/src/commands/config/context/remove.ts)_
 
 ## `modelina config context use CONTEXT-NAME`
 
@@ -394,7 +394,7 @@ DESCRIPTION
   Set a context as current
 ```
 
-_See code: [src/commands/config/context/use.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.63/modelina-cli/src/commands/config/context/use.ts)_
+_See code: [src/commands/config/context/use.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.64/modelina-cli/src/commands/config/context/use.ts)_
 
 ## `modelina generate LANGUAGE FILE`
 
@@ -406,8 +406,8 @@ USAGE
     [--tsModelType class|interface] [--tsEnumType enum|union] [--tsModuleSystem ESM|CJS] [--tsIncludeComments]
     [--tsExportType default|named] [--tsJsonBinPack] [--tsMarshalling] [--tsExampleInstance] [--tsRawPropertyNames]
     [--csharpAutoImplement] [--csharpNewtonsoft] [--csharpArrayType Array|List] [--csharpHashcode] [--csharpEqual]
-    [--csharpSystemJson] [--javaIncludeComments] [--javaJackson] [--javaConstraints] [--javaArrayType Array|List]
-    [--pyDantic]
+    [--csharpSystemJson] [--goIncludeComments] [--goIncludeTags] [--javaIncludeComments] [--javaJackson]
+    [--javaConstraints] [--javaArrayType Array|List] [--pyDantic]
 
 ARGUMENTS
   LANGUAGE  (typescript|csharp|golang|java|javascript|dart|python|rust|kotlin|php|cplusplus|scala) The language you want
@@ -425,6 +425,8 @@ FLAGS
       --csharpHashcode            C# specific, generate the models with the GetHashCode method overwritten
       --csharpNewtonsoft          C# specific, generate the models with newtonsoft serialization support
       --csharpSystemJson          C# specific, generate the models with System.Text.Json serialization support
+      --goIncludeComments         Golang specific, if enabled add comments while generating models.
+      --goIncludeTags             Golang specific, if enabled add tags while generating models.
       --javaArrayType=<option>    [default: Array] Java specific, define which type of array needs to be generated.
                                   <options: Array|List>
       --javaConstraints           Java specific, generate the models with constraints
@@ -456,7 +458,7 @@ DESCRIPTION
   Generates typed models
 ```
 
-_See code: [src/commands/generate.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.63/modelina-cli/src/commands/generate.ts)_
+_See code: [src/commands/generate.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.64/modelina-cli/src/commands/generate.ts)_
 
 ## `modelina help [COMMAND]`
 
diff --git a/modelina-cli/package-lock.json b/modelina-cli/package-lock.json
index af40bcfbaa..0989fafe2d 100644
--- a/modelina-cli/package-lock.json
+++ b/modelina-cli/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@asyncapi/modelina-cli",
-  "version": "4.0.0-next.64",
+  "version": "4.0.0-next.65",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@asyncapi/modelina-cli",
-      "version": "4.0.0-next.64",
+      "version": "4.0.0-next.65",
       "license": "Apache-2.0",
       "dependencies": {
         "@asyncapi/modelina": "^4.0.0-next.64",
diff --git a/modelina-cli/package.json b/modelina-cli/package.json
index 88bf1ccf98..80fe467060 100644
--- a/modelina-cli/package.json
+++ b/modelina-cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@asyncapi/modelina-cli",
   "description": "CLI to work with Modelina",
-  "version": "4.0.0-next.64",
+  "version": "4.0.0-next.65",
   "bin": {
     "modelina": "./bin/run_bin"
   },
diff --git a/package-lock.json b/package-lock.json
index 83fa0eca46..c29fd01426 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@asyncapi/modelina",
-  "version": "4.0.0-next.64",
+  "version": "4.0.0-next.65",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@asyncapi/modelina",
-      "version": "4.0.0-next.64",
+      "version": "4.0.0-next.65",
       "license": "Apache-2.0",
       "dependencies": {
         "@apidevtools/json-schema-ref-parser": "^11.1.0",
diff --git a/package.json b/package.json
index 9cc98fc6fe..ee86da38ab 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@asyncapi/modelina",
-  "version": "4.0.0-next.64",
+  "version": "4.0.0-next.65",
   "description": "Library for generating data models based on inputs such as AsyncAPI, OpenAPI, or JSON Schema documents",
   "license": "Apache-2.0",
   "homepage": "https://www.modelina.org",