diff --git a/modules/openapi-generator/src/main/resources/go-experimental/model_doc.mustache b/modules/openapi-generator/src/main/resources/go-experimental/model_doc.mustache
index 04668c66b071..9045d9fe0884 100644
--- a/modules/openapi-generator/src/main/resources/go-experimental/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/go-experimental/model_doc.mustache
@@ -8,7 +8,7 @@ Name | Type | Description | Notes
 **{{classname}}Interface** | **interface { {{#discriminator}}{{propertyGetter}}() {{propertyType}}{{/discriminator}} }** | An interface that can hold any of the proper implementing types |
 {{/vendorExtensions.x-is-one-of-interface}}
 {{^vendorExtensions.x-is-one-of-interface}}
-{{#vars}}**{{name}}** | Pointer to {{#isPrimitiveType}}**{{{dataType}}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{{dataType}}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#isReadOnly}}[readonly] {{/isReadOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
+{{#vars}}**{{name}}** | {{^required}}Pointer to {{/required}}{{#isPrimitiveType}}**{{{dataType}}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{{dataType}}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#isReadOnly}}[readonly] {{/isReadOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
 {{/vars}}
 {{/vendorExtensions.x-is-one-of-interface}}
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/Animal.md b/samples/client/petstore/go-experimental/go-petstore/docs/Animal.md
index dd124c1d2615..293f75c51717 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/Animal.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/Animal.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ClassName** | Pointer to **string** |  | 
+**ClassName** | **string** |  | 
 **Color** | Pointer to **string** |  | [optional] [default to "red"]
 
 ## Methods
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/Category.md b/samples/client/petstore/go-experimental/go-petstore/docs/Category.md
index 0fa542e093ae..0d3f6d4ff226 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/Category.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/Category.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Id** | Pointer to **int64** |  | [optional] 
-**Name** | Pointer to **string** |  | [default to "default-name"]
+**Name** | **string** |  | [default to "default-name"]
 
 ## Methods
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/EnumTest.md b/samples/client/petstore/go-experimental/go-petstore/docs/EnumTest.md
index 7a9e5c61a594..131b8e110a04 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/EnumTest.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/EnumTest.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **EnumString** | Pointer to **string** |  | [optional] 
-**EnumStringRequired** | Pointer to **string** |  | 
+**EnumStringRequired** | **string** |  | 
 **EnumInteger** | Pointer to **int32** |  | [optional] 
 **EnumNumber** | Pointer to **float64** |  | [optional] 
 **OuterEnum** | Pointer to [**OuterEnum**](OuterEnum.md) |  | [optional] 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/FormatTest.md b/samples/client/petstore/go-experimental/go-petstore/docs/FormatTest.md
index de43da0fcf31..9235479afc1d 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/FormatTest.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/FormatTest.md
@@ -7,16 +7,16 @@ Name | Type | Description | Notes
 **Integer** | Pointer to **int32** |  | [optional] 
 **Int32** | Pointer to **int32** |  | [optional] 
 **Int64** | Pointer to **int64** |  | [optional] 
-**Number** | Pointer to **float32** |  | 
+**Number** | **float32** |  | 
 **Float** | Pointer to **float32** |  | [optional] 
 **Double** | Pointer to **float64** |  | [optional] 
 **String** | Pointer to **string** |  | [optional] 
-**Byte** | Pointer to **string** |  | 
+**Byte** | **string** |  | 
 **Binary** | Pointer to [***os.File**](*os.File.md) |  | [optional] 
-**Date** | Pointer to **string** |  | 
+**Date** | **string** |  | 
 **DateTime** | Pointer to [**time.Time**](time.Time.md) |  | [optional] 
 **Uuid** | Pointer to **string** |  | [optional] 
-**Password** | Pointer to **string** |  | 
+**Password** | **string** |  | 
 **BigDecimal** | Pointer to **float64** |  | [optional] 
 
 ## Methods
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/Name.md b/samples/client/petstore/go-experimental/go-petstore/docs/Name.md
index 52fb687af7be..18cf04789d6e 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/Name.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/Name.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Name** | Pointer to **int32** |  | 
+**Name** | **int32** |  | 
 **SnakeCase** | Pointer to **int32** |  | [optional] [readonly] 
 **Property** | Pointer to **string** |  | [optional] 
 **Var123Number** | Pointer to **int32** |  | [optional] [readonly] 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/Pet.md b/samples/client/petstore/go-experimental/go-petstore/docs/Pet.md
index 6b4776422396..a6eae34657d3 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/Pet.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/Pet.md
@@ -6,8 +6,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Id** | Pointer to **int64** |  | [optional] 
 **Category** | Pointer to [**Category**](Category.md) |  | [optional] 
-**Name** | Pointer to **string** |  | 
-**PhotoUrls** | Pointer to **[]string** |  | 
+**Name** | **string** |  | 
+**PhotoUrls** | **[]string** |  | 
 **Tags** | Pointer to [**[]Tag**](Tag.md) |  | [optional] 
 **Status** | Pointer to **string** | pet status in the store | [optional] 
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/TypeHolderDefault.md b/samples/client/petstore/go-experimental/go-petstore/docs/TypeHolderDefault.md
index 726e9723fc3c..34b38a6065fa 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/TypeHolderDefault.md
@@ -4,11 +4,11 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**StringItem** | Pointer to **string** |  | [default to "what"]
-**NumberItem** | Pointer to **float32** |  | 
-**IntegerItem** | Pointer to **int32** |  | 
-**BoolItem** | Pointer to **bool** |  | [default to true]
-**ArrayItem** | Pointer to **[]int32** |  | 
+**StringItem** | **string** |  | [default to "what"]
+**NumberItem** | **float32** |  | 
+**IntegerItem** | **int32** |  | 
+**BoolItem** | **bool** |  | [default to true]
+**ArrayItem** | **[]int32** |  | 
 
 ## Methods
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/TypeHolderExample.md b/samples/client/petstore/go-experimental/go-petstore/docs/TypeHolderExample.md
index c6da08c1d253..259aae8df561 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/TypeHolderExample.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/TypeHolderExample.md
@@ -4,12 +4,12 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**StringItem** | Pointer to **string** |  | 
-**NumberItem** | Pointer to **float32** |  | 
-**FloatItem** | Pointer to **float32** |  | 
-**IntegerItem** | Pointer to **int32** |  | 
-**BoolItem** | Pointer to **bool** |  | 
-**ArrayItem** | Pointer to **[]int32** |  | 
+**StringItem** | **string** |  | 
+**NumberItem** | **float32** |  | 
+**FloatItem** | **float32** |  | 
+**IntegerItem** | **int32** |  | 
+**BoolItem** | **bool** |  | 
+**ArrayItem** | **[]int32** |  | 
 
 ## Methods
 
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Animal.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Animal.md
index dd124c1d2615..293f75c51717 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Animal.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Animal.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ClassName** | Pointer to **string** |  | 
+**ClassName** | **string** |  | 
 **Color** | Pointer to **string** |  | [optional] [default to "red"]
 
 ## Methods
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/AppleReq.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/AppleReq.md
index 31286b798875..d56e3051f58d 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/AppleReq.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/AppleReq.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Cultivar** | Pointer to **string** |  | 
+**Cultivar** | **string** |  | 
 **Mealy** | Pointer to **bool** |  | [optional] 
 
 ## Methods
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/BananaReq.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/BananaReq.md
index 2f9887641ecc..3d4ebb281916 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/BananaReq.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/BananaReq.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**LengthCm** | Pointer to **float32** |  | 
+**LengthCm** | **float32** |  | 
 **Sweet** | Pointer to **bool** |  | [optional] 
 
 ## Methods
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Category.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Category.md
index 0fa542e093ae..0d3f6d4ff226 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Category.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Category.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Id** | Pointer to **int64** |  | [optional] 
-**Name** | Pointer to **string** |  | [default to "default-name"]
+**Name** | **string** |  | [default to "default-name"]
 
 ## Methods
 
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/EnumTest.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/EnumTest.md
index 451b33b57c82..a1761a7cd725 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/EnumTest.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/EnumTest.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **EnumString** | Pointer to **string** |  | [optional] 
-**EnumStringRequired** | Pointer to **string** |  | 
+**EnumStringRequired** | **string** |  | 
 **EnumInteger** | Pointer to **int32** |  | [optional] 
 **EnumNumber** | Pointer to **float64** |  | [optional] 
 **OuterEnum** | Pointer to [**NullableOuterEnum**](OuterEnum.md) |  | [optional] 
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/FormatTest.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/FormatTest.md
index d6b81be4e115..f94ef3040f25 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/FormatTest.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/FormatTest.md
@@ -7,16 +7,16 @@ Name | Type | Description | Notes
 **Integer** | Pointer to **int32** |  | [optional] 
 **Int32** | Pointer to **int32** |  | [optional] 
 **Int64** | Pointer to **int64** |  | [optional] 
-**Number** | Pointer to **float32** |  | 
+**Number** | **float32** |  | 
 **Float** | Pointer to **float32** |  | [optional] 
 **Double** | Pointer to **float64** |  | [optional] 
 **String** | Pointer to **string** |  | [optional] 
-**Byte** | Pointer to **string** |  | 
+**Byte** | **string** |  | 
 **Binary** | Pointer to [***os.File**](*os.File.md) |  | [optional] 
-**Date** | Pointer to **string** |  | 
+**Date** | **string** |  | 
 **DateTime** | Pointer to [**time.Time**](time.Time.md) |  | [optional] 
 **Uuid** | Pointer to **string** |  | [optional] 
-**Password** | Pointer to **string** |  | 
+**Password** | **string** |  | 
 **PatternWithDigits** | Pointer to **string** | A string that is a 10 digit number. Can have leading zeros. | [optional] 
 **PatternWithDigitsAndDelimiter** | Pointer to **string** | A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. | [optional] 
 
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/FruitReq.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/FruitReq.md
index 0eac3bb84f16..1128c2be20e1 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/FruitReq.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/FruitReq.md
@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Cultivar** | Pointer to **string** |  | 
+**Cultivar** | **string** |  | 
 **Mealy** | Pointer to **bool** |  | [optional] 
-**LengthCm** | Pointer to **float32** |  | 
+**LengthCm** | **float32** |  | 
 **Sweet** | Pointer to **bool** |  | [optional] 
 
 ## Methods
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/InlineObject3.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/InlineObject3.md
index e0ababa0b506..e0c1472b2f7e 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/InlineObject3.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/InlineObject3.md
@@ -7,12 +7,12 @@ Name | Type | Description | Notes
 **Integer** | Pointer to **int32** | None | [optional] 
 **Int32** | Pointer to **int32** | None | [optional] 
 **Int64** | Pointer to **int64** | None | [optional] 
-**Number** | Pointer to **float32** | None | 
+**Number** | **float32** | None | 
 **Float** | Pointer to **float32** | None | [optional] 
-**Double** | Pointer to **float64** | None | 
+**Double** | **float64** | None | 
 **String** | Pointer to **string** | None | [optional] 
-**PatternWithoutDelimiter** | Pointer to **string** | None | 
-**Byte** | Pointer to **string** | None | 
+**PatternWithoutDelimiter** | **string** | None | 
+**Byte** | **string** | None | 
 **Binary** | Pointer to [***os.File**](*os.File.md) | None | [optional] 
 **Date** | Pointer to **string** | None | [optional] 
 **DateTime** | Pointer to [**time.Time**](time.Time.md) | None | [optional] 
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/InlineObject4.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/InlineObject4.md
index 848986f31d11..e716f8dd913e 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/InlineObject4.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/InlineObject4.md
@@ -4,8 +4,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Param** | Pointer to **string** | field1 | 
-**Param2** | Pointer to **string** | field2 | 
+**Param** | **string** | field1 | 
+**Param2** | **string** | field2 | 
 
 ## Methods
 
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/InlineObject5.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/InlineObject5.md
index f0dd583ce152..a6a4f9367b5d 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/InlineObject5.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/InlineObject5.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **AdditionalMetadata** | Pointer to **string** | Additional data to pass to server | [optional] 
-**RequiredFile** | Pointer to [***os.File**](*os.File.md) | file to upload | 
+**RequiredFile** | [***os.File**](*os.File.md) | file to upload | 
 
 ## Methods
 
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Mammal.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Mammal.md
index 9f14ab561652..6e926911167b 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Mammal.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Mammal.md
@@ -6,7 +6,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **HasBaleen** | Pointer to **bool** |  | [optional] 
 **HasTeeth** | Pointer to **bool** |  | [optional] 
-**ClassName** | Pointer to **string** |  | 
+**ClassName** | **string** |  | 
 **Type** | Pointer to **string** |  | [optional] 
 
 ## Methods
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Name.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Name.md
index 52fb687af7be..18cf04789d6e 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Name.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Name.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Name** | Pointer to **int32** |  | 
+**Name** | **int32** |  | 
 **SnakeCase** | Pointer to **int32** |  | [optional] [readonly] 
 **Property** | Pointer to **string** |  | [optional] 
 **Var123Number** | Pointer to **int32** |  | [optional] [readonly] 
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Pet.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Pet.md
index 6b4776422396..a6eae34657d3 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Pet.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Pet.md
@@ -6,8 +6,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Id** | Pointer to **int64** |  | [optional] 
 **Category** | Pointer to [**Category**](Category.md) |  | [optional] 
-**Name** | Pointer to **string** |  | 
-**PhotoUrls** | Pointer to **[]string** |  | 
+**Name** | **string** |  | 
+**PhotoUrls** | **[]string** |  | 
 **Tags** | Pointer to [**[]Tag**](Tag.md) |  | [optional] 
 **Status** | Pointer to **string** | pet status in the store | [optional] 
 
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Whale.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Whale.md
index 8f346ab7206f..f4478f612657 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Whale.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Whale.md
@@ -6,7 +6,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **HasBaleen** | Pointer to **bool** |  | [optional] 
 **HasTeeth** | Pointer to **bool** |  | [optional] 
-**ClassName** | Pointer to **string** |  | 
+**ClassName** | **string** |  | 
 
 ## Methods
 
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Zebra.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Zebra.md
index 13fd37c0ed69..72f9fea8dbcc 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Zebra.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Zebra.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Type** | Pointer to **string** |  | [optional] 
-**ClassName** | Pointer to **string** |  | 
+**ClassName** | **string** |  | 
 
 ## Methods