diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86f705c277d..c232a4dccb7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,8 +56,8 @@ if (${ANDROID})
         file(GLOB_RECURSE specific_sources
                 jni/kotlin/*.h
                 jni/kotlin/*.c
-                kotlin/wallet-core-kotlin/src/androidMain/cpp/generated/*.h
-                kotlin/wallet-core-kotlin/src/androidMain/cpp/generated/*.c
+                kotlin/wallet-core-kotlin/src/commonAndroidJvmMain/cpp/generated/*.h
+                kotlin/wallet-core-kotlin/src/commonAndroidJvmMain/cpp/generated/*.c
                 )
     else ()
         file(GLOB_RECURSE specific_sources jni/android/*.h jni/android/*.c)
diff --git a/codegen/lib/code_generator.rb b/codegen/lib/code_generator.rb
index 266707d0cfd..087a75b34c2 100644
--- a/codegen/lib/code_generator.rb
+++ b/codegen/lib/code_generator.rb
@@ -110,7 +110,7 @@ def render_kotlin_common
   end
 
   def render_kotlin_android
-    render_template(header: nil, template: 'kotlin_android.erb', output_subfolder: 'kotlin/wallet-core-kotlin/src/androidMain/generated/com/trustwallet/core', extension: 'kt')
+    render_template(header: nil, template: 'kotlin_android.erb', output_subfolder: 'kotlin/wallet-core-kotlin/src/commonAndroidJvmMain/generated/com/trustwallet/core', extension: 'kt')
   end
 
   def render_kotlin_ios
@@ -126,11 +126,11 @@ def render_kotlin_js_accessors
   end
 
   def render_kotlin_jni_h
-    render_template(header: 'copyright_header.erb', template: 'kotlin_jni_h.erb', output_subfolder: 'kotlin/wallet-core-kotlin/src/androidMain/cpp/generated', extension: 'h')
+    render_template(header: 'copyright_header.erb', template: 'kotlin_jni_h.erb', output_subfolder: 'kotlin/wallet-core-kotlin/src/commonAndroidJvmMain/cpp/generated', extension: 'h')
   end
 
   def render_kotlin_jni_c
-    render_template(header: 'copyright_header.erb', template: 'kotlin_jni_c.erb', output_subfolder: 'kotlin/wallet-core-kotlin/src/androidMain/cpp/generated', extension: 'c')
+    render_template(header: 'copyright_header.erb', template: 'kotlin_jni_c.erb', output_subfolder: 'kotlin/wallet-core-kotlin/src/commonAndroidJvmMain/cpp/generated', extension: 'c')
   end
 
   def render(file, locals = {})
diff --git a/kotlin/wallet-core-kotlin/build.gradle.kts b/kotlin/wallet-core-kotlin/build.gradle.kts
index 06001de6f51..ef9c1aca20c 100644
--- a/kotlin/wallet-core-kotlin/build.gradle.kts
+++ b/kotlin/wallet-core-kotlin/build.gradle.kts
@@ -14,6 +14,8 @@ kotlin {
         publishLibraryVariants = listOf("release")
     }
 
+    jvm()
+
     val nativeTargets =
         listOf(
             iosArm64(),
@@ -37,9 +39,6 @@ kotlin {
             }
         }
 
-        val androidMain by getting {
-            kotlin.srcDir(projectDir.resolve("src/androidMain/generated"))
-        }
         val commonMain by getting {
             kotlin.srcDirs(
                 projectDir.resolve("src/commonMain/generated"),
@@ -50,10 +49,21 @@ kotlin {
                 api(libs.wire.runtime)
             }
         }
+
+        val androidMain by getting
+        val jvmMain by getting
+        create("commonAndroidJvmMain") {
+            kotlin.srcDir(projectDir.resolve("src/commonAndroidJvmMain/generated"))
+
+            dependsOn(commonMain)
+            androidMain.dependsOn(this)
+            jvmMain.dependsOn(this)
+        }
+
         val iosArm64Main by getting
         val iosSimulatorArm64Main by getting
         val iosX64Main by getting
-        val iosMain by creating {
+        create("iosMain") {
             kotlin.srcDir(projectDir.resolve("src/iosMain/generated"))
 
             dependsOn(commonMain)
@@ -61,7 +71,8 @@ kotlin {
             iosSimulatorArm64Main.dependsOn(this)
             iosX64Main.dependsOn(this)
         }
-        val jsMain by getting {
+
+        getByName("jsMain") {
             kotlin.srcDir(projectDir.resolve("src/jsMain/generated"))
         }
     }
diff --git a/kotlin/wallet-core-kotlin/src/androidMain/kotlin/com/trustwallet/core/AnySigner.kt b/kotlin/wallet-core-kotlin/src/commonAndroidJvmMain/kotlin/com/trustwallet/core/AnySigner.kt
similarity index 100%
rename from kotlin/wallet-core-kotlin/src/androidMain/kotlin/com/trustwallet/core/AnySigner.kt
rename to kotlin/wallet-core-kotlin/src/commonAndroidJvmMain/kotlin/com/trustwallet/core/AnySigner.kt