diff --git a/aider/models.py b/aider/models.py
index 7a9d1af18..ae76f0342 100644
--- a/aider/models.py
+++ b/aider/models.py
@@ -93,11 +93,11 @@ MODEL_ALIASES = {
     "3": "gpt-3.5-turbo",
     # Other models
     "deepseek": "deepseek/deepseek-chat",
-    "flash": "gemini/gemini-2.5-flash-preview-04-17",
+    "flash": "gemini/gemini-2.5-flash",
     "quasar": "openrouter/openrouter/quasar-alpha",
     "r1": "deepseek/deepseek-reasoner",
-    "gemini-2.5-pro": "gemini/gemini-2.5-pro-preview-06-05",
-    "gemini": "gemini/gemini-2.5-pro-preview-06-05",
+    "gemini-2.5-pro": "gemini/gemini-2.5-pro",
+    "gemini": "gemini/gemini-2.5-pro",
     "gemini-exp": "gemini/gemini-2.5-pro-exp-03-25",
     "grok3": "xai/grok-3-beta",
     "optimus": "openrouter/openrouter/optimus-alpha",
diff --git a/aider/resources/model-metadata.json b/aider/resources/model-metadata.json
index 5dd8f06de..0c3676e56 100644
--- a/aider/resources/model-metadata.json
+++ b/aider/resources/model-metadata.json
@@ -519,6 +519,61 @@
         "supported_output_modalities": ["text"],
         "source": "https://ai.google.dev/gemini-api/docs/pricing#gemini-2.5-pro-preview"
     },
+    "gemini/gemini-2.5-pro": {
+        "max_tokens": 65536,
+        "max_input_tokens": 1048576,
+        "max_output_tokens": 65536,
+        "max_images_per_prompt": 3000,
+        "max_videos_per_prompt": 10,
+        "max_video_length": 1,
+        "max_audio_length_hours": 8.4,
+        "max_audio_per_prompt": 1,
+        "max_pdf_size_mb": 20,
+        "input_cost_per_token": 0.00000125,
+        "input_cost_per_token_above_200k_tokens": 0.0000025,
+        "output_cost_per_token": 0.00001,
+        "output_cost_per_token_above_200k_tokens": 0.000015,
+        "litellm_provider": "gemini",
+        "mode": "chat",
+        "rpm": 2000,
+        "tpm": 8000000,
+        "supports_system_messages": true,
+        "supports_function_calling": true,
+        "supports_vision": true,
+        "supports_response_schema": true,
+        "supports_audio_output": false,
+        "supports_tool_choice": true,
+        "supported_modalities": ["text", "image", "audio", "video"],
+        "supported_output_modalities": ["text"],
+        "source": "https://ai.google.dev/gemini-api/docs/pricing#gemini-2.5-pro"
+    },
+    "gemini/gemini-2.5-flash": {
+        "max_tokens": 65536,
+        "max_input_tokens": 1048576,
+        "max_output_tokens": 65536,
+        "max_images_per_prompt": 3000,
+        "max_videos_per_prompt": 10,
+        "max_video_length": 1,
+        "max_audio_length_hours": 8.4,
+        "max_audio_per_prompt": 1,
+        "max_pdf_size_mb": 20,
+        "input_cost_per_token": 0.00000035,
+        "input_cost_per_audio_token": 0.000001,
+        "output_cost_per_token": 0.0000025,
+        "litellm_provider": "gemini",
+        "mode": "chat",
+        "rpm": 10000,
+        "tpm": 8000000,
+        "supports_system_messages": true,
+        "supports_function_calling": true,
+        "supports_vision": true,
+        "supports_response_schema": true,
+        "supports_audio_output": false,
+        "supports_tool_choice": true,
+        "supported_modalities": ["text", "image", "audio", "video"],
+        "supported_output_modalities": ["text"],
+        "source": "https://ai.google.dev/gemini-api/docs/pricing#gemini-2.5-flash"
+    },
   "together_ai/Qwen/Qwen3-235B-A22B-fp8-tput": {
         "input_cost_per_token": 0.0000002,
         "output_cost_per_token": 0.0000006,
diff --git a/aider/resources/model-settings.yml b/aider/resources/model-settings.yml
index ff713c3fa..dc3bc8e2b 100644
--- a/aider/resources/model-settings.yml
+++ b/aider/resources/model-settings.yml
@@ -533,28 +533,10 @@
   edit_format: diff-fenced
   use_repo_map: true
 
-- name: gemini/gemini-1.5-pro-exp-0827
-  edit_format: diff-fenced
-  use_repo_map: true
-
 - name: gemini/gemini-exp-1206
   edit_format: diff
   use_repo_map: true
 
-- name: gemini/gemini-exp-1114
-  edit_format: diff
-  use_repo_map: true
-
-- name: gemini/gemini-exp-1121
-  edit_format: diff
-  use_repo_map: true
-
-- name: vertex_ai/gemini-pro-experimental
-  edit_format: diff-fenced
-  use_repo_map: true
-
-- name: gemini/gemini-1.5-flash-exp-0827
-
 - name: gemini/gemini-2.0-flash-exp
   edit_format: diff
   use_repo_map: true
@@ -1462,6 +1444,21 @@
   weak_model_name: gemini/gemini-2.5-flash-preview-04-17
   accepts_settings: ["thinking_tokens"]
 
+- name: gemini/gemini-2.5-flash
+  overeager: true
+  edit_format: diff-fenced
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["thinking_tokens"]
+
+- name: gemini/gemini-2.5-pro
+  overeager: true
+  edit_format: diff-fenced
+  use_repo_map: true
+  weak_model_name: gemini/gemini-2.5-flash
+  use_temperature: false
+  accepts_settings: ["thinking_tokens"]
+
 - name: vertex_ai/gemini-2.5-pro-preview-05-06
   edit_format: diff-fenced
   use_repo_map: true