diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache
index a81f05ba3523..43730dc02e66 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache
@@ -33,6 +33,9 @@ apply plugin: 'kotlin'
 {{#moshiCodeGen}}
 apply plugin: 'kotlin-kapt'
 {{/moshiCodeGen}}
+{{#parcelizeModels}}
+apply plugin: 'kotlin-parcelize'
+{{/parcelizeModels}}
 
 repositories {
     maven { url "https://repo1.maven.org/maven2" }
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache
index 3cf855654310..2dd048a74f57 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache
@@ -17,7 +17,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo
 {{/jackson}}
 {{#parcelizeModels}}
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 {{/parcelizeModels}}
 {{/multiplatform}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-server/data_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-server/data_class.mustache
index 6c251cee2a6e..d9e9d591b7b9 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-server/data_class.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-server/data_class.mustache
@@ -1,6 +1,6 @@
 {{#parcelizeModels}}
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 {{/parcelizeModels}}
 {{#serializableModel}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-vertx-server/data_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-vertx-server/data_class.mustache
index 74aa6aa1f260..67a6a37c7e03 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-vertx-server/data_class.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-vertx-server/data_class.mustache
@@ -1,7 +1,7 @@
 
 {{#parcelizeModels}}
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 {{/parcelizeModels}}
 import com.google.gson.annotations.SerializedName
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
diff --git a/samples/client/petstore/kotlin-gson/pom.xml b/samples/client/petstore/kotlin-gson/pom.xml
index 56d7495846bc..47e393fec11a 100644
--- a/samples/client/petstore/kotlin-gson/pom.xml
+++ b/samples/client/petstore/kotlin-gson/pom.xml
@@ -27,7 +27,7 @@
                 <version>1.2.1</version>
                 <executions>
                     <execution>
-                        <id>bundle-test</id>
+                        <id>bundle-install</id>
                         <phase>integration-test</phase>
                         <goals>
                             <goal>exec</goal>
@@ -35,6 +35,20 @@
                         <configuration>
                             <executable>gradle</executable>
                             <arguments>
+                                <argument>wrapper</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>bundle-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>./gradlew</executable>
+                            <arguments>
+                                <argument>clean</argument>
                                 <argument>test</argument>
                             </arguments>
                         </configuration>
diff --git a/samples/client/petstore/kotlin-jackson/pom.xml b/samples/client/petstore/kotlin-jackson/pom.xml
index 76eedb89596d..f57be9c406e7 100644
--- a/samples/client/petstore/kotlin-jackson/pom.xml
+++ b/samples/client/petstore/kotlin-jackson/pom.xml
@@ -27,7 +27,7 @@
                 <version>1.2.1</version>
                 <executions>
                     <execution>
-                        <id>bundle-test</id>
+                        <id>bundle-install</id>
                         <phase>integration-test</phase>
                         <goals>
                             <goal>exec</goal>
@@ -35,6 +35,20 @@
                         <configuration>
                             <executable>gradle</executable>
                             <arguments>
+                                <argument>wrapper</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>bundle-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>./gradlew</executable>
+                            <arguments>
+                                <argument>clean</argument>
                                 <argument>test</argument>
                             </arguments>
                         </configuration>
diff --git a/samples/client/petstore/kotlin-json-request-string/pom.xml b/samples/client/petstore/kotlin-json-request-string/pom.xml
index 947997039a72..0eef90f38170 100644
--- a/samples/client/petstore/kotlin-json-request-string/pom.xml
+++ b/samples/client/petstore/kotlin-json-request-string/pom.xml
@@ -27,7 +27,7 @@
                 <version>1.2.1</version>
                 <executions>
                     <execution>
-                        <id>bundle-test</id>
+                        <id>bundle-install</id>
                         <phase>integration-test</phase>
                         <goals>
                             <goal>exec</goal>
@@ -35,6 +35,20 @@
                         <configuration>
                             <executable>gradle</executable>
                             <arguments>
+                                <argument>wrapper</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>bundle-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>./gradlew</executable>
+                            <arguments>
+                                <argument>clean</argument>
                                 <argument>test</argument>
                             </arguments>
                         </configuration>
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/pom.xml b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/pom.xml
new file mode 100644
index 000000000000..2249107ef60a
--- /dev/null
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/pom.xml
@@ -0,0 +1,60 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>KotlinPetstoreOkhttp4CoroutinesTests</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>kotlin-jvm-okhttp4-coroutines</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>bundle-install</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>gradle</executable>
+                            <arguments>
+                                <argument>wrapper</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>bundle-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>./gradlew</executable>
+                            <arguments>
+                                <argument>clean</argument>
+                                <argument>test</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/samples/client/petstore/kotlin-moshi-codegen/pom.xml b/samples/client/petstore/kotlin-moshi-codegen/pom.xml
index 9cae12c1a8bd..90c1f037a01b 100644
--- a/samples/client/petstore/kotlin-moshi-codegen/pom.xml
+++ b/samples/client/petstore/kotlin-moshi-codegen/pom.xml
@@ -27,7 +27,7 @@
                 <version>1.2.1</version>
                 <executions>
                     <execution>
-                        <id>bundle-test</id>
+                        <id>bundle-install</id>
                         <phase>integration-test</phase>
                         <goals>
                             <goal>exec</goal>
@@ -35,6 +35,20 @@
                         <configuration>
                             <executable>gradle</executable>
                             <arguments>
+                                <argument>wrapper</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>bundle-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>./gradlew</executable>
+                            <arguments>
+                                <argument>clean</argument>
                                 <argument>test</argument>
                             </arguments>
                         </configuration>
diff --git a/samples/client/petstore/kotlin-nonpublic/pom.xml b/samples/client/petstore/kotlin-nonpublic/pom.xml
index 2b400e564b9a..266078aacef4 100644
--- a/samples/client/petstore/kotlin-nonpublic/pom.xml
+++ b/samples/client/petstore/kotlin-nonpublic/pom.xml
@@ -27,7 +27,7 @@
                 <version>1.2.1</version>
                 <executions>
                     <execution>
-                        <id>bundle-test</id>
+                        <id>bundle-install</id>
                         <phase>integration-test</phase>
                         <goals>
                             <goal>exec</goal>
@@ -35,6 +35,20 @@
                         <configuration>
                             <executable>gradle</executable>
                             <arguments>
+                                <argument>wrapper</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>bundle-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>./gradlew</executable>
+                            <arguments>
+                                <argument>clean</argument>
                                 <argument>test</argument>
                             </arguments>
                         </configuration>
diff --git a/samples/client/petstore/kotlin-nullable/pom.xml b/samples/client/petstore/kotlin-nullable/pom.xml
index 2bf0f9666d6c..d0bb127ff442 100644
--- a/samples/client/petstore/kotlin-nullable/pom.xml
+++ b/samples/client/petstore/kotlin-nullable/pom.xml
@@ -27,7 +27,7 @@
                 <version>1.2.1</version>
                 <executions>
                     <execution>
-                        <id>bundle-test</id>
+                        <id>bundle-install</id>
                         <phase>integration-test</phase>
                         <goals>
                             <goal>exec</goal>
@@ -35,6 +35,20 @@
                         <configuration>
                             <executable>gradle</executable>
                             <arguments>
+                                <argument>wrapper</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>bundle-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>./gradlew</executable>
+                            <arguments>
+                                <argument>clean</argument>
                                 <argument>test</argument>
                             </arguments>
                         </configuration>
diff --git a/samples/client/petstore/kotlin-okhttp3/pom.xml b/samples/client/petstore/kotlin-okhttp3/pom.xml
index 37cf659dcacf..345c795e5846 100644
--- a/samples/client/petstore/kotlin-okhttp3/pom.xml
+++ b/samples/client/petstore/kotlin-okhttp3/pom.xml
@@ -27,7 +27,7 @@
                 <version>1.2.1</version>
                 <executions>
                     <execution>
-                        <id>bundle-test</id>
+                        <id>bundle-install</id>
                         <phase>integration-test</phase>
                         <goals>
                             <goal>exec</goal>
@@ -35,6 +35,20 @@
                         <configuration>
                             <executable>gradle</executable>
                             <arguments>
+                                <argument>wrapper</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>bundle-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>./gradlew</executable>
+                            <arguments>
+                                <argument>clean</argument>
                                 <argument>test</argument>
                             </arguments>
                         </configuration>
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/pom.xml b/samples/client/petstore/kotlin-retrofit2-rx3/pom.xml
index 1ee09680f372..4d99176011f3 100644
--- a/samples/client/petstore/kotlin-retrofit2-rx3/pom.xml
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/pom.xml
@@ -27,7 +27,7 @@
                 <version>1.2.1</version>
                 <executions>
                     <execution>
-                        <id>bundle-test</id>
+                        <id>bundle-install</id>
                         <phase>integration-test</phase>
                         <goals>
                             <goal>exec</goal>
@@ -35,6 +35,20 @@
                         <configuration>
                             <executable>gradle</executable>
                             <arguments>
+                                <argument>wrapper</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>bundle-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>./gradlew</executable>
+                            <arguments>
+                                <argument>clean</argument>
                                 <argument>test</argument>
                             </arguments>
                         </configuration>
diff --git a/samples/client/petstore/kotlin-retrofit2/pom.xml b/samples/client/petstore/kotlin-retrofit2/pom.xml
index a2a34c203fa8..fa88e4879fa2 100644
--- a/samples/client/petstore/kotlin-retrofit2/pom.xml
+++ b/samples/client/petstore/kotlin-retrofit2/pom.xml
@@ -27,7 +27,7 @@
                 <version>1.2.1</version>
                 <executions>
                     <execution>
-                        <id>bundle-test</id>
+                        <id>bundle-install</id>
                         <phase>integration-test</phase>
                         <goals>
                             <goal>exec</goal>
@@ -35,6 +35,20 @@
                         <configuration>
                             <executable>gradle</executable>
                             <arguments>
+                                <argument>wrapper</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>bundle-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>./gradlew</executable>
+                            <arguments>
+                                <argument>clean</argument>
                                 <argument>test</argument>
                             </arguments>
                         </configuration>
diff --git a/samples/client/petstore/kotlin-string/pom.xml b/samples/client/petstore/kotlin-string/pom.xml
index 51365b8eae1c..d040b7533bf4 100644
--- a/samples/client/petstore/kotlin-string/pom.xml
+++ b/samples/client/petstore/kotlin-string/pom.xml
@@ -48,6 +48,7 @@
                         <configuration>
                             <executable>./gradlew</executable>
                             <arguments>
+                                <argument>clean</argument>
                                 <argument>test</argument>
                             </arguments>
                         </configuration>
diff --git a/samples/client/petstore/kotlin-threetenbp/pom.xml b/samples/client/petstore/kotlin-threetenbp/pom.xml
index 6875e7432946..74b29a98a7c7 100644
--- a/samples/client/petstore/kotlin-threetenbp/pom.xml
+++ b/samples/client/petstore/kotlin-threetenbp/pom.xml
@@ -48,6 +48,7 @@
                         <configuration>
                             <executable>./gradlew</executable>
                             <arguments>
+                                <argument>clean</argument>
                                 <argument>test</argument>
                             </arguments>
                         </configuration>
diff --git a/samples/client/petstore/kotlin-uppercase-enum/pom.xml b/samples/client/petstore/kotlin-uppercase-enum/pom.xml
new file mode 100644
index 000000000000..e7a439414f8b
--- /dev/null
+++ b/samples/client/petstore/kotlin-uppercase-enum/pom.xml
@@ -0,0 +1,60 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>KotlinPetstoreUppercaseEnumTests</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>kotlin-uppercase-enum</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>bundle-install</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>gradle</executable>
+                            <arguments>
+                                <argument>wrapper</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>bundle-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>./gradlew</executable>
+                            <arguments>
+                                <argument>clean</argument>
+                                <argument>test</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/samples/client/petstore/kotlin/pom.xml b/samples/client/petstore/kotlin/pom.xml
index e52f9e969b08..a6140e49deaf 100644
--- a/samples/client/petstore/kotlin/pom.xml
+++ b/samples/client/petstore/kotlin/pom.xml
@@ -27,7 +27,7 @@
                 <version>1.2.1</version>
                 <executions>
                     <execution>
-                        <id>bundle-test</id>
+                        <id>bundle-install</id>
                         <phase>integration-test</phase>
                         <goals>
                             <goal>exec</goal>
@@ -35,6 +35,20 @@
                         <configuration>
                             <executable>gradle</executable>
                             <arguments>
+                                <argument>wrapper</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>bundle-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>./gradlew</executable>
+                            <arguments>
+                                <argument>clean</argument>
                                 <argument>test</argument>
                             </arguments>
                         </configuration>