diff --git a/src/main/kotlin/ee/carlrobert/codegpt/settings/models/ModelIcons.kt b/src/main/kotlin/ee/carlrobert/codegpt/settings/models/ModelIcons.kt
index 433ed3e2..3106e198 100644
--- a/src/main/kotlin/ee/carlrobert/codegpt/settings/models/ModelIcons.kt
+++ b/src/main/kotlin/ee/carlrobert/codegpt/settings/models/ModelIcons.kt
@@ -18,7 +18,7 @@ object ModelIcons {
             ModelRegistry.CLAUDE_4_SONNET_THINKING, ModelRegistry.CLAUDE_4_SONNET -> Icons.Anthropic
             ModelRegistry.GEMINI_PRO_2_5, ModelRegistry.GEMINI_FLASH_2_5 -> Icons.Google
             ModelRegistry.DEEPSEEK_R1, ModelRegistry.DEEPSEEK_V3 -> Icons.DeepSeek
-            ModelRegistry.KIMI_K2 -> Icons.Moonshot
+            ModelRegistry.QWEN3_CODER -> Icons.Qwen
             "qwen-2.5-32b-chat", ModelRegistry.QWEN_2_5_32B_CODE -> Icons.Qwen
             "llama-3.1-405b" -> Icons.Meta
             else -> Icons.DefaultSmall
diff --git a/src/main/kotlin/ee/carlrobert/codegpt/settings/models/ModelRegistry.kt b/src/main/kotlin/ee/carlrobert/codegpt/settings/models/ModelRegistry.kt
index 50fb3489..4347b94d 100644
--- a/src/main/kotlin/ee/carlrobert/codegpt/settings/models/ModelRegistry.kt
+++ b/src/main/kotlin/ee/carlrobert/codegpt/settings/models/ModelRegistry.kt
@@ -135,11 +135,11 @@ class ModelRegistry {
             FeatureType.NEXT_EDIT to ModelSelection(ServiceType.PROXYAI, ZETA, "Zeta")
         ),
         PricingPlan.FREE to mapOf(
-            FeatureType.CHAT to ModelSelection(ServiceType.PROXYAI, KIMI_K2, "Kimi K2"),
-            FeatureType.AUTO_APPLY to ModelSelection(ServiceType.PROXYAI, KIMI_K2, "Kimi K2"),
-            FeatureType.COMMIT_MESSAGE to ModelSelection(ServiceType.PROXYAI, KIMI_K2, "Kimi K2"),
-            FeatureType.EDIT_CODE to ModelSelection(ServiceType.PROXYAI, KIMI_K2, "Kimi K2"),
-            FeatureType.LOOKUP to ModelSelection(ServiceType.PROXYAI, KIMI_K2, "Kimi K2"),
+            FeatureType.CHAT to ModelSelection(ServiceType.PROXYAI, QWEN3_CODER, "Qwen3 Coder"),
+            FeatureType.AUTO_APPLY to ModelSelection(ServiceType.PROXYAI, QWEN3_CODER, "Qwen3 Coder"),
+            FeatureType.COMMIT_MESSAGE to ModelSelection(ServiceType.PROXYAI, QWEN3_CODER, "Qwen3 Coder"),
+            FeatureType.EDIT_CODE to ModelSelection(ServiceType.PROXYAI, QWEN3_CODER, "Qwen3 Coder"),
+            FeatureType.LOOKUP to ModelSelection(ServiceType.PROXYAI, QWEN3_CODER, "Qwen3 Coder"),
             FeatureType.CODE_COMPLETION to ModelSelection(
                 ServiceType.PROXYAI,
                 QWEN_2_5_32B_CODE,
@@ -359,9 +359,9 @@ class ModelRegistry {
             ),
             ModelSelection(
                 ServiceType.PROXYAI,
-                KIMI_K2,
-                "Kimi K2",
-                Icons.Moonshot,
+                QWEN3_CODER,
+                "Qwen3 Coder",
+                Icons.Qwen,
                 PricingPlan.FREE
             )
         )
@@ -539,7 +539,7 @@ class ModelRegistry {
         const val DEEPSEEK_V3 = "deepseek-v3"
         const val QWEN_2_5_32B_CODE = "qwen-2.5-32b-code"
         const val ZETA = "zeta"
-        const val KIMI_K2 = "kimi-k2-instruct"
+        const val QWEN3_CODER = "qwen3-coder"
 
         // OpenAI Models
         const val GPT_3_5_TURBO_INSTRUCT = "gpt-3.5-turbo-instruct"
diff --git a/src/main/kotlin/ee/carlrobert/codegpt/settings/service/codegpt/CodeGPTAvailableModels.kt b/src/main/kotlin/ee/carlrobert/codegpt/settings/service/codegpt/CodeGPTAvailableModels.kt
index 7922a067..41067e76 100644
--- a/src/main/kotlin/ee/carlrobert/codegpt/settings/service/codegpt/CodeGPTAvailableModels.kt
+++ b/src/main/kotlin/ee/carlrobert/codegpt/settings/service/codegpt/CodeGPTAvailableModels.kt
@@ -20,7 +20,7 @@ object CodeGPTAvailableModels {
         CodeGPTModel("Gemini 2.5 Flash", "gemini-flash-2.5", Icons.Google, ANONYMOUS),
         CodeGPTModel("DeepSeek R1", "deepseek-r1", Icons.DeepSeek, INDIVIDUAL),
         CodeGPTModel("DeepSeek V3", "deepseek-v3", Icons.DeepSeek, FREE),
-        CodeGPTModel("Kimi K2", "kimi-k2", Icons.Moonshot, FREE),
+        CodeGPTModel("Qwen3 Coder", "qwen3-coder", Icons.Qwen, FREE),
     )
 
     @JvmStatic
diff --git a/src/test/kotlin/ee/carlrobert/codegpt/settings/models/ModelRegistryTest.kt b/src/test/kotlin/ee/carlrobert/codegpt/settings/models/ModelRegistryTest.kt
index de1130cb..cf967daa 100644
--- a/src/test/kotlin/ee/carlrobert/codegpt/settings/models/ModelRegistryTest.kt
+++ b/src/test/kotlin/ee/carlrobert/codegpt/settings/models/ModelRegistryTest.kt
@@ -27,8 +27,8 @@ class ModelRegistryTest : IntegrationTest() {
         val result = modelRegistry.getDefaultModelForFeature(FeatureType.CHAT, PricingPlan.FREE)
 
         assertThat(result.provider).isEqualTo(ServiceType.PROXYAI)
-        assertThat(result.model).isEqualTo("kimi-k2-instruct")
-        assertThat(result.displayName).isEqualTo("Kimi K2")
+        assertThat(result.model).isEqualTo("qwen3-coder")
+        assertThat(result.displayName).isEqualTo("Qwen3 Coder")
     }
 
     fun `test getDefaultModelForFeature with anonymous plan returns basic model`() {
diff --git a/src/test/kotlin/ee/carlrobert/codegpt/settings/models/ModelSelectionServiceTest.kt b/src/test/kotlin/ee/carlrobert/codegpt/settings/models/ModelSelectionServiceTest.kt
index 1b6604bc..0589cc12 100644
--- a/src/test/kotlin/ee/carlrobert/codegpt/settings/models/ModelSelectionServiceTest.kt
+++ b/src/test/kotlin/ee/carlrobert/codegpt/settings/models/ModelSelectionServiceTest.kt
@@ -41,7 +41,7 @@ class ModelSelectionServiceTest : IntegrationTest() {
             modelSelectionService.getModelSelectionForFeature(FeatureType.CHAT, PricingPlan.FREE)
 
         assertThat(individualResult.model).isEqualTo("claude-4-sonnet-thinking")
-        assertThat(freeResult.model).isEqualTo("kimi-k2-instruct")
+        assertThat(freeResult.model).isEqualTo("qwen3-coder")
     }
 
     fun `test getModelSelectionForFeature with code completion returns code model`() {