diff --git a/oh-my-openagent.claude.jsonc b/oh-my-openagent.claude.jsonc
index eb0704f..4d7bc5b 100644
--- a/oh-my-openagent.claude.jsonc
+++ b/oh-my-openagent.claude.jsonc
@@ -14,10 +14,10 @@
     "sisyphus-junior": { "model": "anthropic/claude-sonnet-4-6" }
   },
   "categories": {
-    "visual-engineering": { "model": "ai-gateway/gemini-3.1-pro-preview", "variant": "high" },
+    "visual-engineering": { "model": "google/gemini-3.1-pro-preview", "variant": "high" },
     "ultrabrain": { "model": "openai/gpt-5.4", "variant": "xhigh" },
     "deep": { "model": "openai/gpt-5.4", "variant": "medium" },
-    "artistry": { "model": "ai-gateway/gemini-3.1-pro-preview", "variant": "high" },
+    "artistry": { "model": "google/gemini-3.1-pro-preview", "variant": "high" },
     "quick": { "model": "openai/gpt-5.4-mini" },
     "unspecified-low": { "model": "anthropic/claude-sonnet-4-6" },
     "unspecified-high": { "model": "anthropic/claude-opus-4-7", "variant": "max" },
diff --git a/oh-my-openagent.gpt.jsonc b/oh-my-openagent.gpt.jsonc
index f2df123..830436a 100644
--- a/oh-my-openagent.gpt.jsonc
+++ b/oh-my-openagent.gpt.jsonc
@@ -14,10 +14,10 @@
     "sisyphus-junior": { "model": "ai-gateway/kimi-k2p5-turbo" }
   },
   "categories": {
-    "visual-engineering": { "model": "ai-gateway/gemini-3.1-pro-preview", "variant": "high" },
+    "visual-engineering": { "model": "google/gemini-3.1-pro-preview", "variant": "high" },
     "ultrabrain": { "model": "openai/gpt-5.4", "variant": "xhigh" },
     "deep": { "model": "openai/gpt-5.4", "variant": "medium" },
-    "artistry": { "model": "ai-gateway/gemini-3.1-pro-preview", "variant": "high" },
+    "artistry": { "model": "google/gemini-3.1-pro-preview", "variant": "high" },
     "quick": { "model": "openai/gpt-5.4-mini" },
     "unspecified-low": { "model": "gpt-5.3-codex", "variant": "medium" },
     "unspecified-high": { "model": "openai/gpt-5.4", "variant": "high" },
diff --git a/opencode.jsonc b/opencode.jsonc
index 7a13c74..2b18932 100644
--- a/opencode.jsonc
+++ b/opencode.jsonc
@@ -53,27 +53,27 @@
         }
       }
     },
-    // "google": {
-    //   "npm": "@ai-sdk/google",
-    //   "options": {
-    //     "baseURL": "{env:AI_GATEWAY_BASE_URL}/v1beta",
-    //     "apiKey": "{env:AI_GATEWAY_API_KEY}"
-    //   },
-    //   "models": {
-    //     "gemini-3.1-pro-preview": {
-    //       "name": "Gemini 3.1 Pro",
-    //       "reasoning": true,
-    //       "modalities": { "input": ["text", "image", "video", "audio", "pdf"], "output": ["text"] },
-    //       "limit": { "context": 1048576, "output": 65536 }
-    //     },
-    //     "gemini-3-flash-preview": {
-    //       "name": "Gemini 3 Flash",
-    //       "reasoning": true,
-    //       "modalities": { "input": ["text", "image", "video", "audio", "pdf"], "output": ["text"] },
-    //       "limit": { "context": 1048576, "output": 65536 }
-    //     }
-    //   }
-    // },
+    "google": {
+      "npm": "@ai-sdk/google",
+      "options": {
+        "baseURL": "{env:AI_GATEWAY_BASE_URL}/v1beta",
+        "apiKey": "{env:AI_GATEWAY_API_KEY}"
+      },
+      "models": {
+        "gemini-3.1-pro-preview": {
+          "name": "Gemini 3.1 Pro",
+          "reasoning": true,
+          "modalities": { "input": ["text", "image", "video", "audio", "pdf"], "output": ["text"] },
+          "limit": { "context": 1048576, "output": 65536 }
+        },
+        "gemini-3-flash-preview": {
+          "name": "Gemini 3 Flash",
+          "reasoning": true,
+          "modalities": { "input": ["text", "image", "video", "audio", "pdf"], "output": ["text"] },
+          "limit": { "context": 1048576, "output": 65536 }
+        }
+      }
+    },
     "ai-gateway": {
       "name": "AI Gateway",
       "npm": "@ai-sdk/openai-compatible",