diff --git a/kcpp_adapters/AutoGuess.json b/kcpp_adapters/AutoGuess.json
index 48e588989..3d5b27615 100644
--- a/kcpp_adapters/AutoGuess.json
+++ b/kcpp_adapters/AutoGuess.json
@@ -38,6 +38,8 @@
     "search": ["System role not supported", "<start_of_turn>"],
     "name": "Google Gemma 2.",
     "adapter": {
+        "system_start": "<start_of_turn>user\n",
+        "system_end": "<end_of_turn>\n",
         "user_start": "<start_of_turn>user\n",
         "user_end": "<end_of_turn>\n",
         "assistant_start": "<start_of_turn>model\n",
@@ -47,6 +49,8 @@
     "search": ["<start_of_image>", "<start_of_turn>", "<end_of_turn>"],
     "name": "Google Gemma 3.",
     "adapter": {
+        "system_start": "<start_of_turn>user\n",
+        "system_end": "<end_of_turn>\n",
         "user_start": "<start_of_turn>user\n",
         "user_end": "<end_of_turn>\n",
         "assistant_start": "<start_of_turn>model\n",
diff --git a/kcpp_adapters/Gemma-2.json b/kcpp_adapters/Gemma-2.json
index 81e032b59..836f4a10f 100644
--- a/kcpp_adapters/Gemma-2.json
+++ b/kcpp_adapters/Gemma-2.json
@@ -1,5 +1,5 @@
 {
-  "system_start": "<start_of_turn>system\n",
+  "system_start": "<start_of_turn>user\n",
   "system_end": "<end_of_turn>\n",
   "user_start": "<start_of_turn>user\n",
   "user_end": "<end_of_turn>\n",