diff --git a/.github/workflows/update-skill.yml b/.github/workflows/update-skill.yml
index 82f5da57..bb538d61 100644
--- a/.github/workflows/update-skill.yml
+++ b/.github/workflows/update-skill.yml
@@ -54,6 +54,7 @@ jobs:
       - name: Update Skill via Gemini
         env:
           GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
+          GEMINI_MODEL: ${{ vars.GEMINI_MODEL }}
           SKILL_FILE: .gemini/skills/android-maps3d-sdk/SKILL.md
         run: |
           python .github/scripts/update_skill.py
diff --git a/visual-testing/src/main/java/com/google/maps/android/visualtesting/GeminiVisualTestHelper.kt b/visual-testing/src/main/java/com/google/maps/android/visualtesting/GeminiVisualTestHelper.kt
index 040a956d..d386ff05 100644
--- a/visual-testing/src/main/java/com/google/maps/android/visualtesting/GeminiVisualTestHelper.kt
+++ b/visual-testing/src/main/java/com/google/maps/android/visualtesting/GeminiVisualTestHelper.kt
@@ -82,7 +82,7 @@ class GeminiVisualTestHelper {
 
         val fullPrompt = "$systemPrompt\n\nCommand: \"$prompt\"\n\nUI Hierarchy:\n$hierarchyXml"
 
-        val modelName = "gemini-3.5-flash"
+        val modelName = System.getenv("GEMINI_MODEL") ?: "gemini-3.8-flash"
         
         val requestJson = JSONObject().apply {
             put("contents", JSONArray().apply {
@@ -207,7 +207,8 @@ class GeminiVisualTestHelper {
             })
         }
 
-        val response: HttpResponse = client.post("https://generativelanguage.googleapis.com/v1beta/models/gemini-3.5-flash:generateContent?key=$apiKey") {
+        val model = System.getenv("GEMINI_MODEL") ?: "gemini-3.8-flash"
+        val response: HttpResponse = client.post("https://generativelanguage.googleapis.com/v1beta/models/$model:generateContent?key=$apiKey") {
             contentType(ContentType.Application.Json)
             setBody(requestJson.toString())
         }