diff --git a/agenta-backend/agenta_backend/models/api/evaluation_model.py b/agenta-backend/agenta_backend/models/api/evaluation_model.py
index 2016d49bc2..cce2d7db7e 100644
--- a/agenta-backend/agenta_backend/models/api/evaluation_model.py
+++ b/agenta-backend/agenta_backend/models/api/evaluation_model.py
@@ -247,6 +247,7 @@ class LMProvidersEnum(str, Enum):
     alephalpha = "ALEPHALPHA_API_KEY"
     openrouter = "OPENROUTER_API_KEY"
     groq = "GROQ_API_KEY"
+    gemini = "GEMINI_API_KEY"
 
 
 class NewEvaluation(BaseModel):
diff --git a/agenta-backend/agenta_backend/routers/app_router.py b/agenta-backend/agenta_backend/routers/app_router.py
index 57c27e3f94..9fd85fc0da 100644
--- a/agenta-backend/agenta_backend/routers/app_router.py
+++ b/agenta-backend/agenta_backend/routers/app_router.py
@@ -578,6 +578,7 @@ async def create_app_and_variant_from_template(
                 "ALEPHALPHA_API_KEY",
                 "OPENROUTER_API_KEY",
                 "GROQ_API_KEY",
+                "GEMINI_API_KEY",
             ]
             missing_keys = [
                 key for key in supported_llm_prodviders_keys if not os.environ.get(key)
diff --git a/agenta-web/src/components/Playground/Views/GroupedSelect.tsx b/agenta-web/src/components/Playground/Views/GroupedSelect.tsx
index 67770d8ea5..b5e802acb0 100644
--- a/agenta-web/src/components/Playground/Views/GroupedSelect.tsx
+++ b/agenta-web/src/components/Playground/Views/GroupedSelect.tsx
@@ -13,6 +13,7 @@ import {
     OpenRouter,
     Fireworks,
     Groq,
+    Gemini,
 } from "@lobehub/icons"
 
 const useStyles = createUseStyles({
@@ -45,6 +46,7 @@ const iconMap: {[key: string]: React.ComponentType<any>} = {
     "Together AI": Together.Color,
     OpenRouter: OpenRouter,
     Groq: Groq,
+    Gemini: Gemini,
 }
 
 const getTextContent = (element: React.ReactNode): string => {
diff --git a/agenta-web/src/lib/Types.ts b/agenta-web/src/lib/Types.ts
index a5d9bb95f1..93915a99cb 100644
--- a/agenta-web/src/lib/Types.ts
+++ b/agenta-web/src/lib/Types.ts
@@ -264,6 +264,7 @@ export interface LlmProvidersKeys {
     TOGETHERAI_API_KEY: string
     MISTRAL_API_KEY: string
     GROQ_API_KEY: string
+    GEMINI_API_KEY: string
 }
 
 export interface AppTemplate {
diff --git a/agenta-web/src/lib/helpers/llmProviders.ts b/agenta-web/src/lib/helpers/llmProviders.ts
index 92f3d41773..7afc6a1881 100644
--- a/agenta-web/src/lib/helpers/llmProviders.ts
+++ b/agenta-web/src/lib/helpers/llmProviders.ts
@@ -21,6 +21,7 @@ export const llmAvailableProviders: LlmProvider[] = [
     {title: "Aleph Alpha", key: "", name: "ALEPHALPHA_API_KEY"},
     {title: "OpenRouter", key: "", name: "OPENROUTER_API_KEY"},
     {title: "Groq", key: "", name: "GROQ_API_KEY"},
+    {title: "Gemini", key: "", name: "GEMINI_API_KEY"},
 ]
 
 export const getApikeys = () => {