diff --git a/client/src/ee/pages/settings/platform/ai-providers/components/AiProviderForm.tsx b/client/src/ee/pages/settings/platform/ai-providers/components/AiProviderForm.tsx
index 6e23130c40c..6f59ac7b001 100644
--- a/client/src/ee/pages/settings/platform/ai-providers/components/AiProviderForm.tsx
+++ b/client/src/ee/pages/settings/platform/ai-providers/components/AiProviderForm.tsx
@@ -1,6 +1,7 @@
 import Button from '@/components/Button/Button';
 import {Form, FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage} from '@/components/ui/form';
 import {Input} from '@/components/ui/input';
+import {AiProvider} from '@/ee/shared/middleware/platform/configuration';
 import {useUpdateAiProviderMutation} from '@/ee/shared/mutations/platform/aiProvider.mutations';
 import {AiProviderKeys} from '@/ee/shared/queries/platform/aiProviders.queries';
 import {WorkflowNodeOptionKeys} from '@/shared/queries/platform/workflowNodeOptions.queries';
@@ -9,26 +10,28 @@ import {useQueryClient} from '@tanstack/react-query';
 import {useForm} from 'react-hook-form';
 import {z} from 'zod';
 
-const formSchema = z.object({
-    apiKey: z.string().min(1, {
-        message: 'API Key is required.',
-    }),
-});
-
 const AiProviderForm = ({
+    aiProvider,
     environment,
-    id,
     onClose,
     showCancel = false,
 }: {
+    aiProvider: AiProvider;
     environment: number;
-    id: number;
     onClose: () => void;
     showCancel: boolean;
 }) => {
+    const isOllama = aiProvider.name?.toLowerCase() === 'ollama';
+
+    const formSchema = z.object({
+        apiKey: isOllama ? z.string().optional() : z.string().min(1, {message: 'API Key is required.'}),
+        url: z.string().optional(),
+    });
+
     const form = useForm<z.infer<typeof formSchema>>({
         defaultValues: {
             apiKey: '',
+            url: aiProvider.url ?? '',
         },
         resolver: zodResolver(formSchema),
     });
@@ -51,33 +54,53 @@ const AiProviderForm = ({
     function handleSubmit(values: z.infer<typeof formSchema>) {
         updateAiProviderMutation.mutate({
             environment,
-            id,
-            updateAiProviderRequest: {
-                apiKey: values.apiKey,
-            },
+            id: aiProvider.id!,
+            updateAiProviderRequest: isOllama ? {url: values.url} : {apiKey: values.apiKey},
         });
     }
 
     return (
         <Form {...form}>
             <form className="space-y-4" onSubmit={form.handleSubmit(handleSubmit)}>
-                <FormField
-                    control={form.control}
-                    name="apiKey"
-                    render={({field}) => (
-                        <FormItem>
-                            <FormLabel>API Key</FormLabel>
+                {isOllama ? (
+                    <FormField
+                        control={form.control}
+                        name="url"
+                        render={({field}) => (
+                            <FormItem>
+                                <FormLabel>Base URL</FormLabel>
 
-                            <FormControl>
-                                <Input placeholder="API Key" {...field} />
-                            </FormControl>
+                                <FormControl>
+                                    <Input placeholder="http://localhost:11434" {...field} />
+                                </FormControl>
 
-                            <FormDescription>This is your AI provider&apos;`s API key.</FormDescription>
+                                <FormDescription>
+                                    The base URL of your Ollama server. Leave blank to use http://localhost:11434.
+                                </FormDescription>
 
-                            <FormMessage />
-                        </FormItem>
-                    )}
-                />
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+                ) : (
+                    <FormField
+                        control={form.control}
+                        name="apiKey"
+                        render={({field}) => (
+                            <FormItem>
+                                <FormLabel>API Key</FormLabel>
+
+                                <FormControl>
+                                    <Input placeholder="API Key" {...field} />
+                                </FormControl>
+
+                                <FormDescription>This is your AI provider&apos;s API key.</FormDescription>
+
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+                )}
 
                 <div className="flex gap-1">
                     {showCancel && (
diff --git a/client/src/ee/pages/settings/platform/ai-providers/components/AiProviderList.test.tsx b/client/src/ee/pages/settings/platform/ai-providers/components/AiProviderList.test.tsx
index 79efc20e1c7..34bc21208fe 100644
--- a/client/src/ee/pages/settings/platform/ai-providers/components/AiProviderList.test.tsx
+++ b/client/src/ee/pages/settings/platform/ai-providers/components/AiProviderList.test.tsx
@@ -1,6 +1,6 @@
 import {AiProvider} from '@/ee/shared/middleware/platform/configuration';
 import {createTestQueryClientWrapper} from '@/shared/util/test-utils';
-import {render, screen} from '@testing-library/react';
+import {fireEvent, render, screen} from '@testing-library/react';
 import {ReactNode} from 'react';
 import {describe, expect, it, vi} from 'vitest';
 
@@ -75,6 +75,45 @@ describe('AiProviderList', () => {
         expect(screen.getByText('Anthropic')).toBeInTheDocument();
     });
 
+    it('shows the Base URL row with the localhost default for Ollama when no URL is set', async () => {
+        const ollamaProviders: AiProvider[] = [
+            {
+                enabled: false,
+                icon: '/icons/ollama.svg',
+                id: 3,
+                name: 'Ollama',
+                supportsEmbeddings: true,
+            },
+        ];
+
+        renderWithProviders(<AiProviderList aiProviders={ollamaProviders} environment={1} />);
+
+        fireEvent.click(screen.getByText('Ollama'));
+
+        expect(await screen.findByText('Base URL:')).toBeInTheDocument();
+        expect(screen.getByText('http://localhost:11434')).toBeInTheDocument();
+    });
+
+    it('shows the configured Base URL for Ollama', async () => {
+        const ollamaProviders: AiProvider[] = [
+            {
+                enabled: true,
+                icon: '/icons/ollama.svg',
+                id: 3,
+                name: 'Ollama',
+                supportsEmbeddings: true,
+                url: 'http://remote-host:11434',
+            },
+        ];
+
+        renderWithProviders(<AiProviderList aiProviders={ollamaProviders} environment={1} />);
+
+        fireEvent.click(screen.getByText('Ollama'));
+
+        expect(await screen.findByText('Base URL:')).toBeInTheDocument();
+        expect(screen.getByText('http://remote-host:11434')).toBeInTheDocument();
+    });
+
     it('does not render the Embeddings badge when no provider supports embeddings', () => {
         const noEmbeddingProviders: AiProvider[] = [
             {
diff --git a/client/src/ee/pages/settings/platform/ai-providers/components/AiProviderList.tsx b/client/src/ee/pages/settings/platform/ai-providers/components/AiProviderList.tsx
index edaf342bf48..e888c7f1100 100644
--- a/client/src/ee/pages/settings/platform/ai-providers/components/AiProviderList.tsx
+++ b/client/src/ee/pages/settings/platform/ai-providers/components/AiProviderList.tsx
@@ -13,6 +13,11 @@ import InlineSVG from 'react-inlinesvg';
 
 import './AiProviderList.css';
 
+const isOllamaProvider = (aiProvider: AiProvider) => aiProvider.name?.toLowerCase() === 'ollama';
+
+// Ollama runs locally and needs no API key, so it counts as configured; other providers require an API key.
+const isConfigured = (aiProvider: AiProvider) => isOllamaProvider(aiProvider) || !!aiProvider.apiKey;
+
 const AiProviderList = ({aiProviders, environment}: {aiProviders: AiProvider[]; environment: number}) => {
     const [enabledItems, setEnabledItems] = useState<{[key: number]: boolean}>({});
     const [openItem, setOpenItem] = useState<string>();
@@ -39,11 +44,13 @@ const AiProviderList = ({aiProviders, environment}: {aiProviders: AiProvider[];
 
         setOpenItem(undefined);
 
-        if (!aiProvider.apiKey && value) {
+        const configured = isConfigured(aiProvider);
+
+        if (!configured && value) {
             setOpenItem(`item-${aiProvider.id}`);
         }
 
-        if (aiProvider.apiKey) {
+        if (configured) {
             enableAiProviderMutation.mutate({
                 enable: value,
                 environment,
@@ -58,7 +65,7 @@ const AiProviderList = ({aiProviders, environment}: {aiProviders: AiProvider[];
 
             aiProviders.forEach((aiProvider) => {
                 enabledItems[aiProvider.id!] = !!aiProvider.enabled;
-                showForm[aiProvider.id!] = !aiProvider.apiKey;
+                showForm[aiProvider.id!] = !isConfigured(aiProvider);
             });
 
             setEnabledItems(enabledItems);
@@ -112,21 +119,27 @@ const AiProviderList = ({aiProviders, environment}: {aiProviders: AiProvider[];
                             <AccordionContent className="pb-3 pl-9">
                                 {showForm[aiProvider.id!] ? (
                                     <AiProviderForm
+                                        aiProvider={aiProvider}
                                         environment={environment}
-                                        id={aiProvider.id!}
                                         onClose={() =>
                                             setShowForm((prev) => ({
                                                 ...prev,
                                                 [aiProvider.id!]: false,
                                             }))
                                         }
-                                        showCancel={!!aiProvider.apiKey}
+                                        showCancel={isConfigured(aiProvider)}
                                     />
                                 ) : (
                                     <div className="flex items-center gap-2">
-                                        <span className="text-base text-muted-foreground">API Key: </span>
+                                        <span className="text-base text-muted-foreground">
+                                            {isOllamaProvider(aiProvider) ? 'Base URL: ' : 'API Key: '}
+                                        </span>
 
-                                        <span className="text-base">{aiProvider.apiKey}</span>
+                                        <span className="text-base">
+                                            {isOllamaProvider(aiProvider)
+                                                ? aiProvider.url || 'http://localhost:11434'
+                                                : aiProvider.apiKey}
+                                        </span>
 
                                         <Button
                                             onClick={() =>
diff --git a/client/src/ee/shared/middleware/platform/configuration/docs/AiProvider.md b/client/src/ee/shared/middleware/platform/configuration/docs/AiProvider.md
index c89451b4e82..0aeda51a5c8 100644
--- a/client/src/ee/shared/middleware/platform/configuration/docs/AiProvider.md
+++ b/client/src/ee/shared/middleware/platform/configuration/docs/AiProvider.md
@@ -11,6 +11,7 @@ Name | Type
 `name` | string
 `icon` | string
 `apiKey` | string
+`url` | string
 `enabled` | boolean
 `supportsEmbeddings` | boolean
 
@@ -25,6 +26,7 @@ const example = {
   "name": null,
   "icon": null,
   "apiKey": null,
+  "url": null,
   "enabled": null,
   "supportsEmbeddings": null,
 } satisfies AiProvider
diff --git a/client/src/ee/shared/middleware/platform/configuration/docs/UpdateAiProviderRequest.md b/client/src/ee/shared/middleware/platform/configuration/docs/UpdateAiProviderRequest.md
index d3c2a4886c2..8ebdbad8c71 100644
--- a/client/src/ee/shared/middleware/platform/configuration/docs/UpdateAiProviderRequest.md
+++ b/client/src/ee/shared/middleware/platform/configuration/docs/UpdateAiProviderRequest.md
@@ -7,6 +7,7 @@
 Name | Type
 ------------ | -------------
 `apiKey` | string
+`url` | string
 
 ## Example
 
@@ -16,6 +17,7 @@ import type { UpdateAiProviderRequest } from ''
 // TODO: Update the object below with actual values
 const example = {
   "apiKey": null,
+  "url": null,
 } satisfies UpdateAiProviderRequest
 
 console.log(example)
diff --git a/client/src/ee/shared/middleware/platform/configuration/models/AiProvider.ts b/client/src/ee/shared/middleware/platform/configuration/models/AiProvider.ts
index 456c3651d4e..8e64ee4f7bb 100644
--- a/client/src/ee/shared/middleware/platform/configuration/models/AiProvider.ts
+++ b/client/src/ee/shared/middleware/platform/configuration/models/AiProvider.ts
@@ -43,6 +43,12 @@ export interface AiProvider {
      * @memberof AiProvider
      */
     apiKey?: string;
+    /**
+     * The base URL of an AI provider (used by Ollama; blank defaults to localhost).
+     * @type {string}
+     * @memberof AiProvider
+     */
+    url?: string;
     /**
      * The enabled status of an AI provider.
      * @type {boolean}
@@ -79,6 +85,7 @@ export function AiProviderFromJSONTyped(json: any, ignoreDiscriminator: boolean)
         'name': json['name'],
         'icon': json['icon'] == null ? undefined : json['icon'],
         'apiKey': json['apiKey'] == null ? undefined : json['apiKey'],
+        'url': json['url'] == null ? undefined : json['url'],
         'enabled': json['enabled'] == null ? undefined : json['enabled'],
         'supportsEmbeddings': json['supportsEmbeddings'] == null ? undefined : json['supportsEmbeddings'],
     };
@@ -96,6 +103,7 @@ export function AiProviderToJSONTyped(value?: Omit<AiProvider, 'id'|'name'|'icon
     return {
         
         'apiKey': value['apiKey'],
+        'url': value['url'],
         'enabled': value['enabled'],
     };
 }
diff --git a/client/src/ee/shared/middleware/platform/configuration/models/UpdateAiProviderRequest.ts b/client/src/ee/shared/middleware/platform/configuration/models/UpdateAiProviderRequest.ts
index b52f741c682..23b948cad79 100644
--- a/client/src/ee/shared/middleware/platform/configuration/models/UpdateAiProviderRequest.ts
+++ b/client/src/ee/shared/middleware/platform/configuration/models/UpdateAiProviderRequest.ts
@@ -25,6 +25,12 @@ export interface UpdateAiProviderRequest {
      * @memberof UpdateAiProviderRequest
      */
     apiKey?: string;
+    /**
+     * The base URL of an AI provider (used by Ollama; blank defaults to localhost).
+     * @type {string}
+     * @memberof UpdateAiProviderRequest
+     */
+    url?: string;
 }
 
 /**
@@ -45,6 +51,7 @@ export function UpdateAiProviderRequestFromJSONTyped(json: any, ignoreDiscrimina
     return {
         
         'apiKey': json['apiKey'] == null ? undefined : json['apiKey'],
+        'url': json['url'] == null ? undefined : json['url'],
     };
 }
 
@@ -60,6 +67,7 @@ export function UpdateAiProviderRequestToJSONTyped(value?: UpdateAiProviderReque
     return {
         
         'apiKey': value['apiKey'],
+        'url': value['url'],
     };
 }
 
diff --git a/docs/content/docs/self-hosting/configuration/environment-variables.md b/docs/content/docs/self-hosting/configuration/environment-variables.md
index 40519499a1a..9a7554c141d 100644
--- a/docs/content/docs/self-hosting/configuration/environment-variables.md
+++ b/docs/content/docs/self-hosting/configuration/environment-variables.md
@@ -10,7 +10,8 @@ ByteChef can be configured using environment variables. This page documents all
 | Environment Variable | Description | Default Value |
 |---|---|---|
 | `BYTECHEF_AI_COPILOT_ENABLED` | Enable or disable the AI copilot feature | `false` |
-| `BYTECHEF_AI_COPILOT_PROVIDER` | The AI provider to use for copilot (OPENAI, ANTHROPIC) | `ANTHROPIC` |
+| `BYTECHEF_AI_COPILOT_DOCS_EMBEDDING_PROVIDER` | Embedding provider for the Copilot documentation index (OLLAMA, OPENAI) | - |
+| `BYTECHEF_AI_COPILOT_DOCS_EMBEDDING_APIKEY` | API key for the Copilot documentation embedding provider — OpenAI only; Ollama runs locally and needs none (sensitive) | - |
 
 ## AI Firecrawl Configuration
 
@@ -41,6 +42,11 @@ ByteChef can be configured using environment variables. This page documents all
 | Environment Variable | Description | Default Value |
 |---|---|---|
 | `BYTECHEF_AI_MEMORY_PROVIDER` | Memory storage provider for chat-style interactions (AWS, IN_MEMORY, JDBC, REDIS) | `JDBC` |
+| `BYTECHEF_AI_MEMORY_AWS_BUCKETPREFIX` | Prefix used to derive the per-tenant S3 bucket name (provider `AWS`) | `bytechef-chat-memory` |
+| `BYTECHEF_AI_MEMORY_AWS_REGION` | AWS region for S3-backed chat memory (provider `AWS`) | - |
+| `BYTECHEF_AI_MEMORY_AWS_ACCESSKEYID` | AWS access key ID for S3-backed chat memory (sensitive) | - |
+| `BYTECHEF_AI_MEMORY_AWS_SECRETACCESSKEY` | AWS secret access key for S3-backed chat memory (sensitive) | - |
+| `BYTECHEF_AI_MEMORY_AWS_KEYPREFIX` | Key prefix prepended to every stored object key (provider `AWS`) | - |
 
 ## AI Provider API Keys
 
@@ -52,6 +58,8 @@ ByteChef can be configured using environment variables. This page documents all
 | `BYTECHEF_AI_PROVIDER_GROQ_APIKEY`          | Groq API key (sensitive) | - |
 | `BYTECHEF_AI_PROVIDER_MISTRAL_APIKEY`       | Mistral API key (sensitive) | - |
 | `BYTECHEF_AI_PROVIDER_NVIDIA_APIKEY`        | NVIDIA API key (sensitive) | - |
+| `BYTECHEF_AI_PROVIDER_OLLAMA_APIKEY`        | Ollama API key (sensitive) | - |
+| `BYTECHEF_AI_PROVIDER_OLLAMA_URL`           | Ollama server base URL; fallback for chat and embedding models (defaults to `http://localhost:11434` when blank) | - |
 | `BYTECHEF_AI_PROVIDER_OPENAI_APIKEY`        | OpenAI API key (sensitive) | - |
 | `BYTECHEF_AI_PROVIDER_PERPLEXITY_APIKEY`    | Perplexity API key (sensitive) | - |
 | `BYTECHEF_AI_PROVIDER_STABILITY_APIKEY`     | Stability API key (sensitive) | - |
@@ -72,6 +80,7 @@ ByteChef can be configured using environment variables. This page documents all
 
 | Environment Variable | Description | Default Value |
 |---|---|---|
+| `BYTECHEF_AI_PROVIDER_EMBEDDING_OLLAMA_OPTIONS_MODEL` | Ollama embedding model name | `qwen3-embedding:8b` |
 | `BYTECHEF_AI_PROVIDER_EMBEDDING_OPENAI_OPTIONS_MODEL` | OpenAI embedding model name | `text-embedding-3-small` |
 
 ## AI Vectorstore Configuration
diff --git a/server/apps/server-app/src/main/resources/config/application-bytechef.yml b/server/apps/server-app/src/main/resources/config/application-bytechef.yml
index 7d198a27e10..391f07c9ff3 100644
--- a/server/apps/server-app/src/main/resources/config/application-bytechef.yml
+++ b/server/apps/server-app/src/main/resources/config/application-bytechef.yml
@@ -23,6 +23,9 @@ bytechef:
             reasoning-effect: medium
             verbosity: low
       embedding:
+        ollama:
+          options:
+            model: qwen3-embedding:8b
         openai:
           options:
             model: text-embedding-3-small
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-api/src/main/java/com/bytechef/ee/ai/copilot/connection/CopilotConnectionLister.java b/server/ee/libs/ai/ai-copilot/ai-copilot-api/src/main/java/com/bytechef/ee/ai/copilot/connection/CopilotConnectionLister.java
new file mode 100644
index 00000000000..13029ebbc0c
--- /dev/null
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-api/src/main/java/com/bytechef/ee/ai/copilot/connection/CopilotConnectionLister.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the ByteChef Enterprise license (the "Enterprise License");
+ * you may not use this file except in compliance with the Enterprise License.
+ */
+
+package com.bytechef.ee.ai.copilot.connection;
+
+import java.util.List;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * SPI for listing the connections the copilot can offer for a component before {@code createConnection}, so the LLM can
+ * suggest an existing connection instead of forcing the user through the create dialog. Each surface contributes an
+ * implementation that {@link #supports(CopilotConnectionRequest) claims} the requests it can serve: the in-editor / AI
+ * Hub surface lists the workspace's connections scoped to the current environment; the embedded workflow chat has no
+ * workspace and lists the connected user's connections instead. The {@code listConnectionsForComponent} tool builds a
+ * {@link CopilotConnectionRequest} from its invocation context and dispatches to the first supporting implementation.
+ *
+ * @version ee
+ *
+ * @author Ivica Cardic
+ */
+public interface CopilotConnectionLister {
+
+    /**
+     * Whether this implementation can serve the given request. The tool dispatches to the first implementation that
+     * returns {@code true}; implementations must key on mutually exclusive request state (e.g. presence of a workspace
+     * vs. an embedded external user) so at most one claims any request.
+     *
+     * @param request the request describing the current chat surface
+     * @return {@code true} if this implementation can list connections for the request
+     */
+    boolean supports(CopilotConnectionRequest request);
+
+    /**
+     * Lists the connections available for the request's component. Only called when {@link #supports} returned
+     * {@code true} for the same request.
+     *
+     * @param request the request describing the component, environment, and calling principal
+     * @return the matching connections, possibly empty
+     */
+    List<CopilotConnection> listConnections(CopilotConnectionRequest request);
+
+    /**
+     * Surface-neutral description of a connection-listing request. Carries the union of the fields the surfaces need;
+     * each implementation reads only the ones relevant to it. Built by the tool from its invocation context, so the SPI
+     * stays free of the tool's context type (and of Spring Security types — the embedded external user id is resolved
+     * by the tool from its captured authentication).
+     *
+     * @param workspaceId       the workspace id when invoked from a workspace surface, otherwise {@code null}
+     * @param userId            the platform user id when available (used to rehydrate the workspace security context)
+     * @param externalUserId    the embedded connected user's external id when invoked from embedded chat, otherwise
+     *                          {@code null}
+     * @param environmentId     the {@code Environment} ordinal to scope connections to
+     * @param componentName     the component to filter connections by
+     * @param connectionVersion the connection definition version to filter by, or {@code null} to not filter by version
+     */
+    record CopilotConnectionRequest(
+        @Nullable Long workspaceId, @Nullable Long userId, @Nullable String externalUserId, int environmentId,
+        String componentName, @Nullable Integer connectionVersion) {
+    }
+
+    record CopilotConnection(long id, String name, int environmentId, boolean active) {
+    }
+}
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/build.gradle.kts b/server/ee/libs/ai/ai-copilot/ai-copilot-service/build.gradle.kts
index 1911739bb3a..d4eec379ddf 100644
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-service/build.gradle.kts
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-service/build.gradle.kts
@@ -97,8 +97,11 @@ spotless {
 
 dependencies {
     implementation(libs.com.github.mizosoft.methanol)
+    implementation("com.openai:openai-java-client-okhttp")
     implementation("org.apache.commons:commons-lang3")
     implementation("org.springframework.ai:spring-ai-commons")
+    implementation("org.springframework.ai:spring-ai-ollama")
+    implementation("org.springframework.ai:spring-ai-openai")
     implementation("org.springframework.ai:spring-ai-pgvector-store")
     implementation("org.springframework.ai:spring-ai-autoconfigure-vector-store-pgvector")
     implementation("org.springframework.boot:spring-boot-autoconfigure")
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/agent/ClusterElementSpringAIAgent.java b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/agent/ClusterElementSpringAIAgent.java
index 9104324585c..04cfb93c9ed 100644
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/agent/ClusterElementSpringAIAgent.java
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/agent/ClusterElementSpringAIAgent.java
@@ -15,6 +15,7 @@
 import com.agui.core.state.State;
 import com.agui.server.LocalAgent;
 import com.agui.spring.ai.SpringAIAgent;
+import com.bytechef.ee.ai.copilot.util.CopilotToolContextUtils;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -84,6 +85,11 @@ protected ChatClient resolveChatClient(RunAgentInput input) {
         return super.resolveChatClient(input);
     }
 
+    @Override
+    protected Map<String, Object> toolContext(RunAgentInput input) {
+        return CopilotToolContextUtils.toToolContext(input.state());
+    }
+
     @Override
     protected SystemMessage createSystemMessage(State state, List<Context> contexts) {
         Map<?, ?> parameters = (Map<?, ?>) state.get("parameters");
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/agent/CodeEditorSpringAIAgent.java b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/agent/CodeEditorSpringAIAgent.java
index 37907ee894f..721736ef04a 100644
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/agent/CodeEditorSpringAIAgent.java
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/agent/CodeEditorSpringAIAgent.java
@@ -15,6 +15,7 @@
 import com.agui.core.state.State;
 import com.agui.server.LocalAgent;
 import com.agui.spring.ai.SpringAIAgent;
+import com.bytechef.ee.ai.copilot.util.CopilotToolContextUtils;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -82,6 +83,11 @@ protected ChatClient resolveChatClient(RunAgentInput input) {
         return super.resolveChatClient(input);
     }
 
+    @Override
+    protected Map<String, Object> toolContext(RunAgentInput input) {
+        return CopilotToolContextUtils.toToolContext(input.state());
+    }
+
     @Override
     protected SystemMessage createSystemMessage(State state, List<Context> contexts) {
         Map<?, ?> parameters = (Map<?, ?>) state.get("parameters");
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/agent/ConverterSpringAIAgent.java b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/agent/ConverterSpringAIAgent.java
index fb68608a943..7f44f37d768 100644
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/agent/ConverterSpringAIAgent.java
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/agent/ConverterSpringAIAgent.java
@@ -46,7 +46,9 @@
 import com.agui.server.EventFactory;
 import com.agui.server.LocalAgent;
 import com.agui.spring.ai.SpringAIAgent;
+import com.bytechef.ee.ai.copilot.util.CopilotToolContextUtils;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.UUID;
 import java.util.function.Function;
@@ -117,6 +119,11 @@ protected void run(RunAgentInput input, AgentSubscriber subscriber) {
         super.run(input, new JsonExtractingSubscriber(subscriber));
     }
 
+    @Override
+    protected Map<String, Object> toolContext(RunAgentInput input) {
+        return CopilotToolContextUtils.toToolContext(input.state());
+    }
+
     @Override
     protected SystemMessage createSystemMessage(State state, List<Context> contexts) {
         contexts.add(
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/agent/SkillsSpringAIAgent.java b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/agent/SkillsSpringAIAgent.java
index 9fb0e87d35c..60f2abb8b98 100644
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/agent/SkillsSpringAIAgent.java
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/agent/SkillsSpringAIAgent.java
@@ -7,6 +7,7 @@
 
 package com.bytechef.ee.ai.copilot.agent;
 
+import com.agui.core.agent.RunAgentInput;
 import com.agui.core.context.Context;
 import com.agui.core.exception.AGUIException;
 import com.agui.core.message.BaseMessage;
@@ -14,7 +15,9 @@
 import com.agui.core.state.State;
 import com.agui.server.LocalAgent;
 import com.agui.spring.ai.SpringAIAgent;
+import com.bytechef.ee.ai.copilot.util.CopilotToolContextUtils;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.UUID;
 import java.util.function.Function;
@@ -46,6 +49,11 @@ public static Builder builder() {
         return new Builder();
     }
 
+    @Override
+    protected Map<String, Object> toolContext(RunAgentInput input) {
+        return CopilotToolContextUtils.toToolContext(input.state());
+    }
+
     @Override
     protected SystemMessage createSystemMessage(State state, List<Context> contexts) {
         List<String> contextStrings = contexts.stream()
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/CopilotConfiguration.java b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/CopilotConfiguration.java
index 77c3bd4d9e0..e92e586690b 100644
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/CopilotConfiguration.java
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/CopilotConfiguration.java
@@ -23,6 +23,7 @@
 import com.bytechef.ee.ai.copilot.agent.CopilotChatClientResolver;
 import com.bytechef.ee.ai.copilot.agent.SkillsSpringAIAgent;
 import com.bytechef.ee.ai.copilot.agent.WorkflowEditorSpringAIAgent;
+import com.bytechef.ee.ai.copilot.connection.CopilotConnectionLister;
 import com.bytechef.ee.ai.copilot.tool.AskUserQuestionToolCallback;
 import com.bytechef.ee.ai.copilot.tool.CreateConnectionToolCallback;
 import com.bytechef.ee.ai.copilot.tool.ListConnectionsForComponentToolCallback;
@@ -35,6 +36,7 @@
 import com.bytechef.ee.ai.copilot.tool.SelectPropertyOptionToolCallback;
 import com.bytechef.ee.ai.copilot.tool.SelectTriggerPropertyOptionToolCallback;
 import com.bytechef.ee.ai.copilot.tool.ToolStateVisibilityMetrics;
+import com.bytechef.ee.ai.copilot.tool.WorkspaceCopilotConnectionLister;
 import com.bytechef.ee.ai.copilot.util.Mode;
 import com.bytechef.ee.ai.copilot.util.Source;
 import com.bytechef.ee.automation.ai.tool.ReadSkillsTools;
@@ -103,6 +105,7 @@ public class CopilotConfiguration {
     private final TriggerDefinitionService triggerDefinitionService;
     private final TriggerDefinitionFacade triggerDefinitionFacade;
     private final PropertyOptionsResolver propertyOptionsResolver;
+    private final ObjectProvider<CopilotConnectionLister> connectionListerProvider;
     private final JsonMapper jsonMapper = new JsonMapper();
 
     @SuppressFBWarnings("EI")
@@ -120,8 +123,10 @@ public CopilotConfiguration(
         ConnectionDefinitionService connectionDefinitionService, WorkspaceConnectionFacade workspaceConnectionFacade,
         ComponentDefinitionService componentDefinitionService, ActionDefinitionService actionDefinitionService,
         ActionDefinitionFacade actionDefinitionFacade, TriggerDefinitionService triggerDefinitionService,
-        TriggerDefinitionFacade triggerDefinitionFacade, PropertyOptionsResolver propertyOptionsResolver) {
+        TriggerDefinitionFacade triggerDefinitionFacade, PropertyOptionsResolver propertyOptionsResolver,
+        ObjectProvider<CopilotConnectionLister> connectionListerProvider) {
 
+        this.connectionListerProvider = connectionListerProvider;
         this.connectionDefinitionService = connectionDefinitionService;
         this.workspaceConnectionFacade = workspaceConnectionFacade;
         this.componentDefinitionService = componentDefinitionService;
@@ -147,6 +152,7 @@ public CopilotConfiguration(
     CodeEditorSpringAIAgent codeEditorAskSpringAIAgent(
         ChatMemory chatMemory, ChatModel chatModel, ReadProjectWorkflowTools readProjectWorkflowTools,
         ComponentTools componentTools, Optional<FirecrawlTools> firecrawlTools,
+        SecurityContextRehydrator securityContextRehydrator,
         ObjectProvider<CopilotChatClientResolver> overrideChatClientResolverProvider) throws AGUIException {
         String name = Source.CODE_EDITOR.name() + "_" + Mode.ASK.name();
 
@@ -160,7 +166,7 @@ CodeEditorSpringAIAgent codeEditorAskSpringAIAgent(
             .chatMemory(chatMemory)
             .chatModel(chatModel)
             .systemMessage(getSystemPrompt(promptCodeEditorAskResource))
-            .tools(tools)
+            .toolCallbacks(wrapTools(securityContextRehydrator, tools))
             .state(state)
             .overrideChatClientResolver(overrideChatClientResolverProvider.getIfAvailable())
             .build();
@@ -170,6 +176,7 @@ CodeEditorSpringAIAgent codeEditorAskSpringAIAgent(
     CodeEditorSpringAIAgent codeEditorBuildSpringAIAgent(
         ChatMemory chatMemory, ChatModel chatModel, ScriptTools scriptTools,
         ReadProjectWorkflowTools readProjectWorkflowTools, ComponentTools componentTools,
+        SecurityContextRehydrator securityContextRehydrator,
         ObjectProvider<CopilotChatClientResolver> overrideChatClientResolverProvider)
         throws AGUIException {
 
@@ -180,10 +187,12 @@ CodeEditorSpringAIAgent codeEditorBuildSpringAIAgent(
             .chatMemory(chatMemory)
             .chatModel(chatModel)
             .systemMessage(getSystemPrompt(promptCodeEditorBuildResource))
-            .tools(
-                List.of(
-                    readProjectWorkflowTools, scriptTools, componentTools, workflowValidatorTools,
-                    workflowInstructionTools))
+            .toolCallbacks(
+                wrapTools(
+                    securityContextRehydrator,
+                    List.of(
+                        readProjectWorkflowTools, scriptTools, componentTools, workflowValidatorTools,
+                        workflowInstructionTools)))
             .state(state)
             .overrideChatClientResolver(overrideChatClientResolverProvider.getIfAvailable())
             .build();
@@ -192,7 +201,7 @@ CodeEditorSpringAIAgent codeEditorBuildSpringAIAgent(
     @Bean
     ClusterElementSpringAIAgent clusterElementAskSpringAIAgent(
         ChatMemory chatMemory, ChatModel chatModel, ReadProjectWorkflowTools readProjectWorkflowTools,
-        ComponentTools componentTools, TaskTools taskTools,
+        ComponentTools componentTools, TaskTools taskTools, SecurityContextRehydrator securityContextRehydrator,
         ObjectProvider<CopilotChatClientResolver> overrideChatClientResolverProvider) throws AGUIException {
 
         String name = Source.CLUSTER_ELEMENT.name() + "_" + Mode.ASK.name();
@@ -202,10 +211,12 @@ ClusterElementSpringAIAgent clusterElementAskSpringAIAgent(
             .chatMemory(chatMemory)
             .chatModel(chatModel)
             .systemMessage(getSystemPrompt(promptClusterElementAskResource))
-            .tools(
-                List.of(
-                    readProjectWorkflowTools, componentTools, taskTools, workflowValidatorTools,
-                    workflowInstructionTools))
+            .toolCallbacks(
+                wrapTools(
+                    securityContextRehydrator,
+                    List.of(
+                        readProjectWorkflowTools, componentTools, taskTools, workflowValidatorTools,
+                        workflowInstructionTools)))
             .state(state)
             .overrideChatClientResolver(overrideChatClientResolverProvider.getIfAvailable())
             .build();
@@ -215,6 +226,7 @@ ClusterElementSpringAIAgent clusterElementAskSpringAIAgent(
     ClusterElementSpringAIAgent clusterElementBuildSpringAIAgent(
         ChatMemory chatMemory, ChatModel chatModel, ClusterElementTools clusterElementTools,
         ReadProjectWorkflowTools readProjectWorkflowTools, ComponentTools componentTools, TaskTools taskTools,
+        SecurityContextRehydrator securityContextRehydrator,
         ObjectProvider<CopilotChatClientResolver> overrideChatClientResolverProvider)
         throws AGUIException {
 
@@ -225,15 +237,33 @@ ClusterElementSpringAIAgent clusterElementBuildSpringAIAgent(
             .chatMemory(chatMemory)
             .chatModel(chatModel)
             .systemMessage(getSystemPrompt(promptClusterElementBuildResource))
-            .tools(
-                List.of(
-                    readProjectWorkflowTools, clusterElementTools, componentTools, taskTools, workflowValidatorTools,
-                    workflowInstructionTools))
+            .toolCallbacks(
+                wrapTools(
+                    securityContextRehydrator,
+                    List.of(
+                        readProjectWorkflowTools, clusterElementTools, componentTools, taskTools,
+                        workflowValidatorTools, workflowInstructionTools)))
             .state(state)
             .overrideChatClientResolver(overrideChatClientResolverProvider.getIfAvailable())
             .build();
     }
 
+    private List<ToolCallback> wrapTools(SecurityContextRehydrator securityContextRehydrator, List<Object> tools) {
+        List<ToolCallback> toolCallbacks = new ArrayList<>();
+
+        for (Object tool : tools) {
+            if (tool instanceof ToolCallback toolCallback) {
+                toolCallbacks.add(RehydrateContextToolCallback.wrap(toolCallback, securityContextRehydrator));
+            } else {
+                for (ToolCallback toolCallback : ToolCallbacks.from(tool)) {
+                    toolCallbacks.add(RehydrateContextToolCallback.wrap(toolCallback, securityContextRehydrator));
+                }
+            }
+        }
+
+        return toolCallbacks;
+    }
+
     @Bean
     QuestionAnswerAdvisor questionAnswerAdvisor(VectorStore copilotPgVectorStore) {
         return QuestionAnswerAdvisor.builder(copilotPgVectorStore)
@@ -241,10 +271,20 @@ QuestionAnswerAdvisor questionAnswerAdvisor(VectorStore copilotPgVectorStore) {
     }
 
     private List<ToolCallback> interactivePickerToolCallbacks() {
+        List<CopilotConnectionLister> connectionListers = new ArrayList<>();
+
+        connectionListers.add(new WorkspaceCopilotConnectionLister(workspaceConnectionFacade, propertyOptionsResolver));
+
+        CopilotConnectionLister embeddedConnectionLister = connectionListerProvider.getIfAvailable();
+
+        if (embeddedConnectionLister != null) {
+            connectionListers.add(embeddedConnectionLister);
+        }
+
         return List.of(
             new ListConnectionsForComponentToolCallback(
-                componentDefinitionService, connectionDefinitionService, workspaceConnectionFacade,
-                propertyOptionsResolver, ToolStateVisibilityMetrics.NOOP),
+                componentDefinitionService, connectionDefinitionService, ToolStateVisibilityMetrics.NOOP,
+                connectionListers),
             new SelectConnectionToolCallback(componentDefinitionService),
             new LookupActionPropertyOptionsToolCallback(
                 actionDefinitionService, actionDefinitionFacade, propertyOptionsResolver,
@@ -268,6 +308,7 @@ WorkflowEditorSpringAIAgent workflowEditorAskSpringAIAgent(
         ReadProjectWorkflowTools readProjectWorkflowTools, ComponentTools componentTools, TaskTools taskTools,
         Optional<FirecrawlTools> firecrawlTools, WorkflowService workflowService,
         WorkflowNodeOutputFacade workflowNodeOutputFacade, QuestionAnswerAdvisor questionAnswerAdvisor,
+        SecurityContextRehydrator securityContextRehydrator,
         ObjectProvider<CopilotChatClientResolver> overrideChatClientResolverProvider)
         throws AGUIException {
 
@@ -288,7 +329,7 @@ WorkflowEditorSpringAIAgent workflowEditorAskSpringAIAgent(
             .chatModel(chatModel)
             .systemMessage(getSystemPrompt(promptWorkflowEditorAskResource))
             .state(state)
-            .tools(tools)
+            .toolCallbacks(wrapTools(securityContextRehydrator, tools))
             .advisor(questionAnswerAdvisor)
             .workflowService(workflowService)
             .workflowNodeOutputFacade(workflowNodeOutputFacade)
@@ -307,20 +348,12 @@ WorkflowEditorSpringAIAgent workflowEditorBuildSpringAIAgent(
 
         String name = Source.WORKFLOW_EDITOR.name() + "_" + Mode.BUILD.name();
 
-        List<ToolCallback> toolCallbacks = new ArrayList<>();
-
-        for (Object tool : List.of(
-            projectTools, projectWorkflowTools, componentTools, taskTools, scriptTools, workflowValidatorTools,
-            workflowInstructionTools)) {
-
-            for (ToolCallback toolCallback : ToolCallbacks.from(tool)) {
-                toolCallbacks.add(RehydrateContextToolCallback.wrap(toolCallback, securityContextRehydrator));
-            }
-        }
+        List<Object> tools = new ArrayList<>(
+            List.of(
+                projectTools, projectWorkflowTools, componentTools, taskTools, scriptTools, workflowValidatorTools,
+                workflowInstructionTools));
 
-        for (ToolCallback toolCallback : interactivePickerToolCallbacks()) {
-            toolCallbacks.add(RehydrateContextToolCallback.wrap(toolCallback, securityContextRehydrator));
-        }
+        tools.addAll(interactivePickerToolCallbacks());
 
         return WorkflowEditorSpringAIAgent.builder()
             .agentId(name.toLowerCase())
@@ -328,7 +361,7 @@ WorkflowEditorSpringAIAgent workflowEditorBuildSpringAIAgent(
             .chatModel(chatModel)
             .systemMessage(getSystemPrompt(promptWorkflowEditorBuildResource))
             .state(state)
-            .toolCallbacks(toolCallbacks)
+            .toolCallbacks(wrapTools(securityContextRehydrator, tools))
             .workflowService(workflowService)
             .workflowNodeOutputFacade(workflowNodeOutputFacade)
             .overrideChatClientResolver(overrideChatClientResolverProvider.getIfAvailable())
@@ -338,7 +371,8 @@ WorkflowEditorSpringAIAgent workflowEditorBuildSpringAIAgent(
     @Bean
     ConverterSpringAIAgent converterBuildSpringAIAgent(
         ChatMemory chatMemory, ChatModel chatModel, ProjectTools projectTools,
-        ProjectWorkflowTools projectWorkflowTools, TaskTools taskTools, ScriptTools scriptTools)
+        ProjectWorkflowTools projectWorkflowTools, TaskTools taskTools, ScriptTools scriptTools,
+        SecurityContextRehydrator securityContextRehydrator)
         throws AGUIException {
 
         String name = Source.CONVERTER.name() + "_" + Mode.BUILD.name();
@@ -349,17 +383,20 @@ ConverterSpringAIAgent converterBuildSpringAIAgent(
             .chatModel(chatModel)
             .systemMessage(getSystemPrompt(promptConverterBuildResource))
             .state(state)
-            .tools(
-                List.of(
-                    projectTools, projectWorkflowTools, taskTools, scriptTools, workflowValidatorTools,
-                    workflowInstructionTools))
+            .toolCallbacks(
+                wrapTools(
+                    securityContextRehydrator,
+                    List.of(
+                        projectTools, projectWorkflowTools, taskTools, scriptTools, workflowValidatorTools,
+                        workflowInstructionTools)))
             .build();
     }
 
     @Bean
     SkillsSpringAIAgent skillsAskSpringAIAgent(
         ChatMemory chatMemory, ChatModel chatModel, ReadProjectTools readProjectTools,
-        ReadProjectWorkflowTools readProjectWorkflowTools, ReadSkillsTools readSkillsTools)
+        ReadProjectWorkflowTools readProjectWorkflowTools, ReadSkillsTools readSkillsTools,
+        SecurityContextRehydrator securityContextRehydrator)
         throws AGUIException {
 
         String name = Source.SKILLS.name() + "_" + Mode.ASK.name();
@@ -370,17 +407,20 @@ SkillsSpringAIAgent skillsAskSpringAIAgent(
             .chatModel(chatModel)
             .systemMessage(getSystemPrompt(promptSkillsAskResource))
             .state(state)
-            .tools(
-                List.of(
-                    readSkillsTools, readProjectTools, readProjectWorkflowTools, workflowValidatorTools,
-                    workflowInstructionTools))
+            .toolCallbacks(
+                wrapTools(
+                    securityContextRehydrator,
+                    List.of(
+                        readSkillsTools, readProjectTools, readProjectWorkflowTools, workflowValidatorTools,
+                        workflowInstructionTools)))
             .build();
     }
 
     @Bean
     SkillsSpringAIAgent skillsBuildSpringAIAgent(
         ChatMemory chatMemory, ChatModel chatModel, ReadProjectTools readProjectTools,
-        ReadProjectWorkflowTools readProjectWorkflowTools, SkillsTools skillsTools)
+        ReadProjectWorkflowTools readProjectWorkflowTools, SkillsTools skillsTools,
+        SecurityContextRehydrator securityContextRehydrator)
         throws AGUIException {
 
         String name = Source.SKILLS.name() + "_" + Mode.BUILD.name();
@@ -391,18 +431,15 @@ SkillsSpringAIAgent skillsBuildSpringAIAgent(
             .chatModel(chatModel)
             .systemMessage(getSystemPrompt(promptSkillsBuildResource))
             .state(state)
-            .tools(
-                List.of(
-                    skillsTools, readProjectTools, readProjectWorkflowTools, workflowValidatorTools,
-                    workflowInstructionTools))
+            .toolCallbacks(
+                wrapTools(
+                    securityContextRehydrator,
+                    List.of(
+                        skillsTools, readProjectTools, readProjectWorkflowTools, workflowValidatorTools,
+                        workflowInstructionTools)))
             .build();
     }
 
-    /**
-     * Stateless Code Editor ASK sub-agent {@link ChatClient}, consumed by {@code CodeEditorAgentToolCallback} on the AI
-     * Hub ASK agent. Same system prompt and tool catalog as {@link #codeEditorAskSpringAIAgent} (Firecrawl tools added
-     * when present in the deployment), no {@link ChatMemory}.
-     */
     @Bean
     ChatClient codeEditorAskSubAgentChatClient(
         ChatModel chatModel, ReadProjectWorkflowTools readProjectWorkflowTools,
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/CopilotPgVectorConfiguration.java b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/CopilotPgVectorConfiguration.java
index d6656f2c9d3..c12002a61da 100644
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/CopilotPgVectorConfiguration.java
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/CopilotPgVectorConfiguration.java
@@ -16,9 +16,19 @@
 
 package com.bytechef.ee.ai.copilot.config;
 
+import com.bytechef.config.ApplicationProperties;
+import com.bytechef.config.ApplicationProperties.Ai.Copilot.Docs.Embedding.Provider;
+import com.openai.client.okhttp.OpenAIOkHttpClient;
 import io.micrometer.observation.ObservationRegistry;
+import java.time.Duration;
+import org.springframework.ai.document.MetadataMode;
 import org.springframework.ai.embedding.BatchingStrategy;
 import org.springframework.ai.embedding.EmbeddingModel;
+import org.springframework.ai.ollama.OllamaEmbeddingModel;
+import org.springframework.ai.ollama.api.OllamaApi;
+import org.springframework.ai.ollama.api.OllamaEmbeddingOptions;
+import org.springframework.ai.openai.OpenAiEmbeddingModel;
+import org.springframework.ai.openai.OpenAiEmbeddingOptions;
 import org.springframework.ai.vectorstore.VectorStore;
 import org.springframework.ai.vectorstore.observation.VectorStoreObservationConvention;
 import org.springframework.ai.vectorstore.pgvector.PgVectorStore;
@@ -48,6 +58,30 @@ public VectorStore copilotPgVectorStore(
         ObjectProvider<VectorStoreObservationConvention> customObservationConvention,
         BatchingStrategy batchingStrategy) {
 
+        return buildVectorStore(
+            pgVectorJdbcTemplate, embeddingModel, properties, observationRegistry, customObservationConvention,
+            batchingStrategy);
+    }
+
+    @Bean
+    @ConditionalOnProperty(prefix = "bytechef.ai.copilot.docs.embedding", name = "provider")
+    public VectorStore copilotDocsLoaderVectorStore(
+        @Qualifier("pgVectorJdbcTemplate") JdbcTemplate pgVectorJdbcTemplate,
+        PgVectorStoreProperties properties, ObjectProvider<ObservationRegistry> observationRegistry,
+        ObjectProvider<VectorStoreObservationConvention> customObservationConvention,
+        BatchingStrategy batchingStrategy, ApplicationProperties applicationProperties) {
+
+        return buildVectorStore(
+            pgVectorJdbcTemplate, copilotDocsEmbeddingModel(applicationProperties), properties, observationRegistry,
+            customObservationConvention, batchingStrategy);
+    }
+
+    private static VectorStore buildVectorStore(
+        JdbcTemplate pgVectorJdbcTemplate, EmbeddingModel embeddingModel, PgVectorStoreProperties properties,
+        ObjectProvider<ObservationRegistry> observationRegistry,
+        ObjectProvider<VectorStoreObservationConvention> customObservationConvention,
+        BatchingStrategy batchingStrategy) {
+
         return PgVectorStore.builder(pgVectorJdbcTemplate, embeddingModel)
             .schemaName(properties.getSchemaName())
             .idType(properties.getIdType())
@@ -64,4 +98,54 @@ public VectorStore copilotPgVectorStore(
             .maxDocumentBatchSize(properties.getMaxDocumentBatchSize())
             .build();
     }
+
+    private static EmbeddingModel copilotDocsEmbeddingModel(ApplicationProperties applicationProperties) {
+        ApplicationProperties.Ai ai = applicationProperties.getAi();
+
+        ApplicationProperties.Ai.Copilot.Docs.Embedding embedding = ai.getCopilot()
+            .getDocs()
+            .getEmbedding();
+
+        if (embedding.getProvider() == Provider.OLLAMA) {
+            String model = ai.getProvider()
+                .getEmbedding()
+                .getOllama()
+                .getOptions()
+                .getModel();
+
+            return OllamaEmbeddingModel.builder()
+                .ollamaApi(
+                    OllamaApi.builder()
+                        .build())
+                .options(
+                    OllamaEmbeddingOptions.builder()
+                        .model(model)
+                        .build())
+                .build();
+        }
+
+        String apiKey = embedding.getApiKey();
+
+        if (apiKey == null || apiKey.isBlank()) {
+            throw new IllegalStateException(
+                "Copilot docs embedding provider is set to OPENAI but 'bytechef.ai.copilot.docs.embedding.api-key' " +
+                    "is not configured");
+        }
+
+        String model = ai.getProvider()
+            .getEmbedding()
+            .getOpenAi()
+            .getOptions()
+            .getModel();
+
+        return new OpenAiEmbeddingModel(
+            OpenAIOkHttpClient.builder()
+                .apiKey(apiKey)
+                .timeout(Duration.ofSeconds(60))
+                .build(),
+            MetadataMode.ALL,
+            OpenAiEmbeddingOptions.builder()
+                .model(model)
+                .build());
+    }
 }
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/CopilotVectorStoreLoaderConfiguration.java b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/CopilotVectorStoreLoaderConfiguration.java
index e05cd8ad9c6..3c5b2b84aa9 100644
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/CopilotVectorStoreLoaderConfiguration.java
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/CopilotVectorStoreLoaderConfiguration.java
@@ -23,10 +23,13 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.ai.document.Document;
 import org.springframework.ai.document.MetadataMode;
 import org.springframework.ai.embedding.TokenCountBatchingStrategy;
 import org.springframework.ai.vectorstore.VectorStore;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.event.ApplicationStartedEvent;
@@ -51,28 +54,40 @@ class CopilotVectorStoreLoaderConfiguration {
     private static final int MAX_TOKENS = 1536;
     private static final String NAME = "name";
 
+    private static final Logger log = LoggerFactory.getLogger(CopilotVectorStoreLoaderConfiguration.class);
+
     private final TokenCountBatchingStrategy batchingStrategy;
+    private final ObjectProvider<VectorStore> copilotDocsLoaderVectorStoreProvider;
     private final CopilotVectorStoreService copilotVectorStoreService;
     private final ResourcePatternResolver resourcePatternResolver;
-    private final VectorStore vectorStore;
 
     @SuppressFBWarnings(value = "EI")
     public CopilotVectorStoreLoaderConfiguration(
         CopilotVectorStoreService copilotVectorStoreService,
-        @Qualifier("copilotPgVectorStore") VectorStore vectorStore) {
+        @Qualifier("copilotDocsLoaderVectorStore") ObjectProvider<VectorStore> copilotDocsLoaderVectorStoreProvider) {
 
         this.batchingStrategy = new TokenCountBatchingStrategy(
             EncodingType.CL100K_BASE, 8191, 0.1, Document.DEFAULT_CONTENT_FORMATTER, MetadataMode.ALL);
+        this.copilotDocsLoaderVectorStoreProvider = copilotDocsLoaderVectorStoreProvider;
         this.copilotVectorStoreService = copilotVectorStoreService;
         this.resourcePatternResolver = new PathMatchingResourcePatternResolver();
-        this.vectorStore = vectorStore;
     }
 
     @EventListener(ApplicationStartedEvent.class)
     public void onApplicationStartedEvent() {
+        VectorStore vectorStore = copilotDocsLoaderVectorStoreProvider.getIfAvailable();
+
+        if (vectorStore == null) {
+            log.info(
+                "Skipping copilot documentation indexing: no internal Copilot embedding key " +
+                    "(bytechef.ai.copilot.docs.embedding.api-key) is set. Set it and restart to index copilot docs.");
+
+            return;
+        }
+
         List<Map<String, Object>> vectorsMetadataList = getVectorsMetadataList();
 
-        storeDocsDocuments(vectorsMetadataList);
+        storeDocsDocuments(vectorStore, vectorsMetadataList);
     }
 
     private void addDocumentChunks(
@@ -86,7 +101,7 @@ private void addDocumentChunks(
     }
 
     private void addToDocuments(
-        List<Map<String, Object>> vectorStoreMetadataList, String name, String content,
+        VectorStore vectorStore, List<Map<String, Object>> vectorStoreMetadataList, String name, String content,
         List<Document> documents) {
 
         String cleanedDocument = preprocessDocument(content);
@@ -105,7 +120,7 @@ private void addToDocuments(
                 int vectorHash = (int) fileMetadata.get("hash");
 
                 if (vectorHash != hash) {
-                    deleteFromVectorStore(name);
+                    deleteFromVectorStore(vectorStore, name);
 
                     addDocumentChunks(name, documents, cleanedDocument, hash);
                 }
@@ -120,7 +135,7 @@ private static boolean containsVectorStoreFile(
             .anyMatch(map -> fileName.equals(map.get(NAME)) && DOCS.equals(map.get(CATEGORY)));
     }
 
-    private void deleteFromVectorStore(String name) {
+    private void deleteFromVectorStore(VectorStore vectorStore, String name) {
         vectorStore.delete(String.format("name == '%s' AND category == '%s'", name, DOCS));
     }
 
@@ -244,7 +259,7 @@ private static List<String> splitDocument(String[] tokens) {
     }
 
     private void deleteStaleDocsFromVectorStore(
-        List<Map<String, Object>> vectorsMetadataList, Set<String> resourceNames) {
+        VectorStore vectorStore, List<Map<String, Object>> vectorsMetadataList, Set<String> resourceNames) {
 
         Set<String> deleted = new HashSet<>();
 
@@ -256,26 +271,27 @@ private void deleteStaleDocsFromVectorStore(
             String name = (String) metadata.get(NAME);
 
             if (name != null && !resourceNames.contains(name) && deleted.add(name)) {
-                deleteFromVectorStore(name);
+                deleteFromVectorStore(vectorStore, name);
             }
         }
     }
 
-    private void storeDocsDocuments(List<Map<String, Object>> vectorsMetadataList) {
+    private void storeDocsDocuments(VectorStore vectorStore, List<Map<String, Object>> vectorsMetadataList) {
         List<Document> documentList = new ArrayList<>();
         Set<String> resourceNames = new HashSet<>();
 
-        storeDocsFromClasspath(vectorsMetadataList, documentList, resourceNames);
+        storeDocsFromClasspath(vectorStore, vectorsMetadataList, documentList, resourceNames);
 
         for (List<Document> batch : batchingStrategy.batch(documentList)) {
             vectorStore.add(batch);
         }
 
-        deleteStaleDocsFromVectorStore(vectorsMetadataList, resourceNames);
+        deleteStaleDocsFromVectorStore(vectorStore, vectorsMetadataList, resourceNames);
     }
 
     private void storeDocsFromClasspath(
-        List<Map<String, Object>> vectorsMetadataList, List<Document> documentList, Set<String> resourceNames) {
+        VectorStore vectorStore, List<Map<String, Object>> vectorsMetadataList, List<Document> documentList,
+        Set<String> resourceNames) {
 
         try {
             Resource[] resources = resourcePatternResolver.getResources(CLASSPATH_DOCS_PATTERN);
@@ -287,7 +303,7 @@ private void storeDocsFromClasspath(
                         String docName = extractDocName(resource);
 
                         resourceNames.add(docName);
-                        addToDocuments(vectorsMetadataList, docName, content, documentList);
+                        addToDocuments(vectorStore, vectorsMetadataList, docName, content, documentList);
                     }
                 }
             }
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_cluster_element_ask.txt b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_cluster_element_ask.txt
index eaed6605f31..2c5dba5740e 100644
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_cluster_element_ask.txt
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_cluster_element_ask.txt
@@ -22,7 +22,7 @@ Types of cluster element tasks:
    - `validateWorkflow(workflow)` - Complete validation
 
 ## Important Rules when getting Errors:
-- Every workflow must only have one trigger, but as many actions or task dispatchers as needed
+- A workflow can have one or more triggers, plus as many actions or task dispatchers as needed
 - Every task must have a unique name in format: componentName_{number}
 - Required fields must be filled, the other fields are optional
 - If an array in taskDefinition contains multiple objects, you can use any of the objects for that array
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_cluster_element_build.txt b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_cluster_element_build.txt
index c0726373145..687dfe7ca23 100644
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_cluster_element_build.txt
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_cluster_element_build.txt
@@ -77,7 +77,7 @@ updateWorkflowRootProperties(workflowId, rootPropertiesDefinition)  // only if r
 // If a component is still missing a connection, ask the user to create it
 
 ## Important Rules when getting Errors:
-- Every workflow must only have one trigger, but as many actions or task dispatchers as needed
+- A workflow can have one or more triggers, plus as many actions or task dispatchers as needed
 - Every task must have a unique name in format: componentName_{number}
 - Required fields must be filled, the other fields are optional
 - If an array in taskDefinition contains multiple objects, you can use any of the objects for that array
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_code_editor_ask.txt b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_code_editor_ask.txt
index 799432b182a..6bd024086f0 100644
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_code_editor_ask.txt
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_code_editor_ask.txt
@@ -36,7 +36,7 @@ Scripts execute inside a GraalVM Polyglot engine — a synchronous, sandboxed en
 
 ## Important Rules when getting Errors:
 - Ignore Warnings for Script component
-- Every workflow must only have one trigger, but as many actions or task dispatchers as needed
+- A workflow can have one or more triggers, plus as many actions or task dispatchers as needed
 - Every task must have a unique name in format: componentName_{number}
 - Required fields must be filled, the other fields are optional
 - If an array in taskDefinition contains multiple objects, you can use any of the objects for that array
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_code_editor_build.txt b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_code_editor_build.txt
index 430f79810a2..ccddead7288 100644
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_code_editor_build.txt
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_code_editor_build.txt
@@ -87,7 +87,7 @@ updateWorkflow(workflowId, workflow)
 
 ## Important Rules when getting Errors:
 - Ignore Warnings for Script component
-- Every workflow must only have one trigger, but as many actions or task dispatchers as needed
+- A workflow can have one or more triggers, plus as many actions or task dispatchers as needed
 - Every task must have a unique name in format: componentName_{number}
 - Required fields must be filled, the other fields are optional
 - If an array in taskDefinition contains multiple objects, you can use any of the objects for that array
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_converter_build.txt b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_converter_build.txt
index 430707f7736..1fc89f5ec72 100644
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_converter_build.txt
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_converter_build.txt
@@ -101,7 +101,7 @@ fromAi(...) expressions must NEVER appear in any standalone workflow task parame
 - During validation, double-check that no fromAi(...) expressions leaked into standalone tasks.
 
 ## Important Rules:
-- Every workflow must only have one trigger, but as many actions or task dispatchers as needed
+- A workflow can have one or more triggers, plus as many actions or task dispatchers as needed
 - Every task must have a unique name in format: componentName_{number}
 - Required fields must be filled, the other fields are optional
 - If an array in taskDefinition contains multiple objects, you can use any of the objects for that array
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_workflow_editor_ask.txt b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_workflow_editor_ask.txt
index ca04267b3c8..194d82f86e6 100644
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_workflow_editor_ask.txt
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_workflow_editor_ask.txt
@@ -23,7 +23,7 @@ fromAi(...) expressions must NEVER appear in any standalone workflow task parame
 - If asked about a component or how to create the connection, getComponent() tool will get extra instructions from the documentation. You will also provide a link to the ByteChef documentation of the component https://docs.bytechef.io/reference/components/{componentName}
 - If asked about anything ByteChef related, the instructions are also in the vector database. You will also provide a link to the ByteChef documentation at https://docs.bytechef.io/{documentNamePath}
 - For information that you can't find in the context, use tools like webSearch, websiteMap and webpageScrape to access the web. For example, when there are no instructions in context on how to create a connection.
-- Every workflow must only have one trigger, but as many actions or task dispatchers as needed
+- A workflow can have one or more triggers, plus as many actions or task dispatchers as needed
 - Every task must have a unique name in format: componentName_{number}
 - Required fields must be filled, the other fields are optional
 - If an array in taskDefinition contains multiple objects, you can use any of the objects for that array
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_workflow_editor_build.txt b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_workflow_editor_build.txt
index 53cd0633803..5fa71d8640a 100644
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_workflow_editor_build.txt
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/prompt_workflow_editor_build.txt
@@ -153,7 +153,7 @@ required component, e.g. `"connections": {"slack": {"componentName": "slack", "c
   for each picked connection. Do not re-validate or re-save the definition just to "store" the connection.
 
 ## Important Rules:
-- Every workflow must only have one trigger, but as many actions or task dispatchers as needed
+- A workflow can have one or more triggers, plus as many actions or task dispatchers as needed
 - Every task must have a unique name in format: componentName_{number}
 - Required fields must be filled, the other fields are optional
 - If an array in taskDefinition contains multiple objects, you can use any of the objects for that array
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/test/java/com/bytechef/ee/ai/copilot/agent/CopilotAgentToolContextTest.java b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/test/java/com/bytechef/ee/ai/copilot/agent/CopilotAgentToolContextTest.java
new file mode 100644
index 00000000000..19c81d2a1c0
--- /dev/null
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/test/java/com/bytechef/ee/ai/copilot/agent/CopilotAgentToolContextTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the ByteChef Enterprise license (the "Enterprise License");
+ * you may not use this file except in compliance with the Enterprise License.
+ */
+
+package com.bytechef.ee.ai.copilot.agent;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+import com.agui.core.agent.RunAgentInput;
+import com.agui.core.state.State;
+import com.bytechef.ee.ai.copilot.constant.CopilotConstants;
+import com.bytechef.ee.ai.copilot.tool.context.AgentToolInvocationContext;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+import org.springframework.ai.chat.model.ChatModel;
+
+/**
+ * @version ee
+ *
+ * @author Ivica Cardic
+ */
+class CopilotAgentToolContextTest {
+
+    @Test
+    void testCodeEditorAgentPublishesCallerIdentity() throws Exception {
+        CodeEditorSpringAIAgent agent = CodeEditorSpringAIAgent.builder()
+            .agentId("test")
+            .chatModel(mock(ChatModel.class))
+            .systemMessage("system")
+            .state(new State(new HashMap<>()))
+            .build();
+
+        assertPublishesUserId(agent.toolContext(newInputWithUserId()));
+    }
+
+    @Test
+    void testClusterElementAgentPublishesCallerIdentity() throws Exception {
+        ClusterElementSpringAIAgent agent = ClusterElementSpringAIAgent.builder()
+            .agentId("test")
+            .chatModel(mock(ChatModel.class))
+            .systemMessage("system")
+            .state(new State(new HashMap<>()))
+            .build();
+
+        assertPublishesUserId(agent.toolContext(newInputWithUserId()));
+    }
+
+    @Test
+    void testSkillsAgentPublishesCallerIdentity() throws Exception {
+        SkillsSpringAIAgent agent = SkillsSpringAIAgent.builder()
+            .agentId("test")
+            .chatModel(mock(ChatModel.class))
+            .systemMessage("system")
+            .state(new State(new HashMap<>()))
+            .build();
+
+        assertPublishesUserId(agent.toolContext(newInputWithUserId()));
+    }
+
+    @Test
+    void testConverterAgentPublishesCallerIdentity() throws Exception {
+        ConverterSpringAIAgent agent = ConverterSpringAIAgent.builder()
+            .agentId("test")
+            .chatModel(mock(ChatModel.class))
+            .systemMessage("system")
+            .state(new State(new HashMap<>()))
+            .build();
+
+        assertPublishesUserId(agent.toolContext(newInputWithUserId()));
+    }
+
+    private static void assertPublishesUserId(Map<String, Object> toolContext) {
+        assertThat(toolContext).containsEntry(AgentToolInvocationContext.TOOL_CONTEXT_USER_ID_KEY, 99L);
+    }
+
+    private static RunAgentInput newInputWithUserId() {
+        Map<String, Object> stateMap = new HashMap<>();
+
+        stateMap.put(CopilotConstants.STATE_AUTHENTICATED_USER_ID, 99L);
+
+        return newInput(stateMap);
+    }
+
+    private static RunAgentInput newInput(Map<String, Object> stateMap) {
+        return new RunAgentInput(null, null, new State(stateMap), null, null, null, null);
+    }
+}
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-tool/build.gradle.kts b/server/ee/libs/ai/ai-copilot/ai-copilot-tool/build.gradle.kts
index db7cea1e564..be35739fe46 100644
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-tool/build.gradle.kts
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-tool/build.gradle.kts
@@ -11,6 +11,7 @@ dependencies {
     implementation(project(":server:libs:core:tenant:tenant-api"))
     implementation(project(":server:libs:platform:platform-ai:platform-ai-skill:platform-ai-skill-api"))
     implementation(project(":server:libs:platform:platform-component:platform-component-api"))
+    implementation(project(":server:libs:platform:platform-configuration:platform-configuration-api"))
     implementation(project(":server:libs:platform:platform-user:platform-user-api"))
 
     implementation(project(":server:ee:libs:ai:ai-api"))
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/ListConnectionsForComponentToolCallback.java b/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/ListConnectionsForComponentToolCallback.java
index a8898a2a9bd..84e08243980 100644
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/ListConnectionsForComponentToolCallback.java
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/ListConnectionsForComponentToolCallback.java
@@ -7,21 +7,23 @@
 
 package com.bytechef.ee.ai.copilot.tool;
 
-import com.bytechef.automation.configuration.facade.WorkspaceConnectionFacade;
 import com.bytechef.commons.util.JsonUtils;
 import com.bytechef.ee.ai.agent.tool.ToolErrors;
+import com.bytechef.ee.ai.copilot.connection.CopilotConnectionLister;
+import com.bytechef.ee.ai.copilot.connection.CopilotConnectionLister.CopilotConnection;
+import com.bytechef.ee.ai.copilot.connection.CopilotConnectionLister.CopilotConnectionRequest;
 import com.bytechef.ee.ai.copilot.tool.context.AgentToolInvocationContext;
 import com.bytechef.ee.ai.copilot.tool.util.ComponentSlugUtils;
 import com.bytechef.platform.component.domain.ComponentDefinition;
 import com.bytechef.platform.component.domain.ConnectionDefinition;
 import com.bytechef.platform.component.service.ComponentDefinitionService;
 import com.bytechef.platform.component.service.ConnectionDefinitionService;
-import com.bytechef.platform.connection.dto.ConnectionDTO;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.Optional;
 
 import org.jspecify.annotations.Nullable;
@@ -30,11 +32,15 @@
 import org.springframework.ai.chat.model.ToolContext;
 import org.springframework.ai.tool.ToolCallback;
 import org.springframework.ai.tool.definition.ToolDefinition;
+import org.springframework.security.core.Authentication;
 import tools.jackson.core.JacksonException;
 
 /**
- * Spring AI {@link ToolCallback} that lists the workspace's existing connections for a given component, scoped to the
- * current workspace and environment. Used by the LLM before {@code createConnection} so it can offer the user an
+ * Spring AI {@link ToolCallback} that lists existing connections for a given component. The tool builds a
+ * {@link CopilotConnectionRequest} from its invocation context and dispatches to the first
+ * {@link CopilotConnectionLister} that supports it: the workspace path (in-editor copilot / AI Hub) lists the
+ * workspace's connections scoped to the current environment; the embedded workflow chat has no workspace and lists the
+ * connected user's connections instead. Used by the LLM before {@code createConnection} so it can offer the user an
  * existing connection instead of forcing them through the create dialog when one is already there.
  *
  * @version ee
@@ -48,7 +54,7 @@ public class ListConnectionsForComponentToolCallback implements ToolCallback {
     private static final Logger log = LoggerFactory.getLogger(ListConnectionsForComponentToolCallback.class);
 
     private static final String DESCRIPTION = """
-        List existing workspace connections for a component, scoped to the current environment. Use before
+        List existing connections for a component, scoped to the current environment. Use before
         createConnection so the user can pick an existing connection rather than re-entering credentials. Returns
         componentName, connectionVersion (the connection definition's version, NOT the component version), and
         a connections array of {id, name, environmentId, active}.""";
@@ -65,21 +71,18 @@ componentName, connectionVersion (the connection definition's version, NOT the c
 
     private final ComponentDefinitionService componentDefinitionService;
     private final ConnectionDefinitionService connectionDefinitionService;
-    private final WorkspaceConnectionFacade workspaceConnectionFacade;
-    private final PropertyOptionsResolver resolver;
     private final ToolStateVisibilityMetrics metrics;
+    private final List<CopilotConnectionLister> connectionListers;
 
     @SuppressFBWarnings("EI_EXPOSE_REP2")
     public ListConnectionsForComponentToolCallback(
         ComponentDefinitionService componentDefinitionService, ConnectionDefinitionService connectionDefinitionService,
-        WorkspaceConnectionFacade workspaceConnectionFacade, PropertyOptionsResolver resolver,
-        ToolStateVisibilityMetrics metrics) {
+        ToolStateVisibilityMetrics metrics, List<CopilotConnectionLister> connectionListers) {
 
         this.componentDefinitionService = componentDefinitionService;
         this.connectionDefinitionService = connectionDefinitionService;
-        this.workspaceConnectionFacade = workspaceConnectionFacade;
-        this.resolver = resolver;
         this.metrics = metrics;
+        this.connectionListers = List.copyOf(connectionListers);
     }
 
     @Override
@@ -109,60 +112,77 @@ public String call(String toolInput, @Nullable ToolContext toolContext) {
 
             AgentToolInvocationContext invocationContext = AgentToolInvocationContext.fromToolContext(toolContext);
 
-            if (invocationContext == null || invocationContext.workspaceId() == null) {
-                return toolError("Workspace context unavailable — open this chat from the AI Hub.");
+            if (invocationContext == null) {
+                metrics.recordStateVisibility(TOOL_NAME, "context_unavailable");
+
+                return toolError("Invocation context unavailable.");
             }
 
-            Optional<ComponentDefinition> componentDefinitionOptional =
-                componentDefinitionService.fetchComponentDefinition(componentName, null);
+            String resolvedFromComponentName = null;
+            Optional<ComponentDefinition> componentDefinitionOptional = componentDefinitionService
+                .fetchComponentDefinition(componentName, null);
 
             if (componentDefinitionOptional.isEmpty()) {
-                metrics.recordStateVisibility(TOOL_NAME, "unknown_component");
+                String resolvedComponentName = ComponentSlugUtils.resolveSingleMatch(
+                    componentName, componentDefinitionService);
+
+                if (resolvedComponentName == null) {
+                    metrics.recordStateVisibility(TOOL_NAME, "unknown_component");
+
+                    return toolError(
+                        ComponentSlugUtils.unknownComponentMessage(componentName, componentDefinitionService));
+                }
 
-                return toolError(
-                    ComponentSlugUtils.unknownComponentMessage(componentName, componentDefinitionService));
+                metrics.recordStateVisibility(TOOL_NAME, "resolved_slug");
+
+                resolvedFromComponentName = componentName;
+                componentName = resolvedComponentName;
             }
 
             int componentVersion = input.componentVersion() == null ? 1 : input.componentVersion();
-
             ConnectionDefinition connectionDefinition;
 
             try {
                 connectionDefinition = connectionDefinitionService.getConnectionDefinition(
                     componentName, componentVersion);
-            } catch (RuntimeException exception) {
-                log.warn(
-                    "Failed to resolve connection definition for {} v{}; treating as no connections available. Reason: {}",
-                    componentName, componentVersion, exception.getMessage());
+            } catch (NoSuchElementException exception) {
+                metrics.recordStateVisibility(TOOL_NAME, "empty");
+
+                log.debug(
+                    "Component {} v{} exposes no connection definition; treating as no connections available.",
+                    componentName, componentVersion);
 
                 return JsonUtils.write(buildEmptyEnvelope(componentName));
             }
 
             int connectionVersion = connectionDefinition.getVersion();
 
-            long environmentId = invocationContext.resolveEnvironmentOrDefault();
-
-            List<ConnectionDTO> connectionDTOs = resolver.withUserSecurityContext(
-                invocationContext.userId(),
-                () -> workspaceConnectionFacade.getConnections(
-                    invocationContext.workspaceId(), componentName, connectionVersion, environmentId, null));
+            List<CopilotConnection> copilotConnections = listConnections(invocationContext, componentName,
+                connectionVersion);
 
-            List<Map<String, Object>> connections = new ArrayList<>(connectionDTOs.size());
+            if (copilotConnections == null) {
+                metrics.recordStateVisibility(TOOL_NAME, "context_unavailable");
 
-            for (ConnectionDTO connectionDTO : connectionDTOs) {
-                Map<String, Object> row = new LinkedHashMap<>();
+                return toolError("Connection listing is unavailable for this chat session.");
+            }
 
-                row.put("id", connectionDTO.id());
-                row.put("name", connectionDTO.name());
-                row.put("environmentId", connectionDTO.environmentId());
-                row.put("active", connectionDTO.active());
+            List<Map<String, Object>> connections = new ArrayList<>(copilotConnections.size());
 
-                connections.add(row);
+            for (CopilotConnection copilotConnection : copilotConnections) {
+                connections.add(
+                    buildRow(
+                        copilotConnection.id(), copilotConnection.name(), copilotConnection.environmentId(),
+                        copilotConnection.active()));
             }
 
             Map<String, Object> envelope = new LinkedHashMap<>();
 
             envelope.put("componentName", componentName);
+
+            if (resolvedFromComponentName != null) {
+                envelope.put("resolvedFromComponentName", resolvedFromComponentName);
+            }
+
             envelope.put("connectionVersion", connectionVersion);
             envelope.put("connections", connections);
 
@@ -196,6 +216,36 @@ private static Map<String, Object> buildEmptyEnvelope(String componentName) {
         return envelope;
     }
 
+    private static Map<String, Object> buildRow(long id, String name, int environmentId, boolean active) {
+        Map<String, Object> row = new LinkedHashMap<>();
+
+        row.put("id", id);
+        row.put("name", name);
+        row.put("environmentId", environmentId);
+        row.put("active", active);
+
+        return row;
+    }
+
+    private @Nullable List<CopilotConnection> listConnections(
+        AgentToolInvocationContext invocationContext, String componentName, int connectionVersion) {
+
+        Authentication authentication = invocationContext.authentication();
+
+        CopilotConnectionRequest request = new CopilotConnectionRequest(
+            invocationContext.workspaceId(), invocationContext.userId(),
+            authentication == null ? null : authentication.getName(), invocationContext.resolveEnvironmentOrDefault(),
+            componentName, connectionVersion);
+
+        for (CopilotConnectionLister connectionLister : connectionListers) {
+            if (connectionLister.supports(request)) {
+                return connectionLister.listConnections(request);
+            }
+        }
+
+        return null;
+    }
+
     private String toolError(String message) {
         return ToolErrors.toolError(message);
     }
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/LookupActionPropertyOptionsToolCallback.java b/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/LookupActionPropertyOptionsToolCallback.java
index 2a584f52bbc..91649cfbb90 100644
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/LookupActionPropertyOptionsToolCallback.java
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/LookupActionPropertyOptionsToolCallback.java
@@ -129,8 +129,8 @@ public String call(String toolInput, @Nullable ToolContext toolContext) {
 
             AgentToolInvocationContext invocationContext = AgentToolInvocationContext.fromToolContext(toolContext);
 
-            if (invocationContext == null || invocationContext.workspaceId() == null) {
-                return toolError("Workspace context unavailable — open this chat from the AI Hub.");
+            if (invocationContext == null) {
+                return toolError("Invocation context unavailable.");
             }
 
             int componentVersion = input.componentVersion() == null ? 1 : input.componentVersion();
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/LookupTriggerPropertyOptionsToolCallback.java b/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/LookupTriggerPropertyOptionsToolCallback.java
index acf1a5c626c..d5aa27739db 100644
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/LookupTriggerPropertyOptionsToolCallback.java
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/LookupTriggerPropertyOptionsToolCallback.java
@@ -126,8 +126,8 @@ public String call(String toolInput, @Nullable ToolContext toolContext) {
 
             AgentToolInvocationContext invocationContext = AgentToolInvocationContext.fromToolContext(toolContext);
 
-            if (invocationContext == null || invocationContext.workspaceId() == null) {
-                return toolError("Workspace context unavailable — open this chat from the AI Hub.");
+            if (invocationContext == null) {
+                return toolError("Invocation context unavailable.");
             }
 
             int componentVersion = input.componentVersion() == null ? 1 : input.componentVersion();
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/RehydrateContextToolCallback.java b/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/RehydrateContextToolCallback.java
index 5612c975621..7b35f31c220 100644
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/RehydrateContextToolCallback.java
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/RehydrateContextToolCallback.java
@@ -9,6 +9,8 @@
 
 import com.bytechef.automation.configuration.security.AutomationAuthorizationContext;
 import com.bytechef.ee.ai.copilot.tool.context.AgentToolInvocationContext;
+import com.bytechef.platform.configuration.context.EnvironmentContext;
+import com.bytechef.platform.configuration.domain.Environment;
 import com.bytechef.platform.security.util.SecurityUtils;
 import com.bytechef.tenant.TenantContext;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -20,14 +22,12 @@
 import org.springframework.security.core.Authentication;
 
 /**
- * Decorator that rehydrates the request's tenant and Spring Security principal from the
- * {@link AgentToolInvocationContext} carried on the Spring AI {@link ToolContext}, before delegating. Spring AI
- * dispatches tool calls on Reactor scheduler / worker threads that do not inherit the request thread's
- * {@code TenantContext} or SecurityContext thread-locals, so a tool that reads tenant-scoped data or hits a
- * {@code @PreAuthorize} method would otherwise see the {@code public} tenant and no principal. Each half is
- * independent: a missing tenant id leaves the tenant unchanged, and the security context is restored from either a
- * captured {@link Authentication} (preferred — works for principals with no backing platform user, such as the embedded
- * API-key principal) or, failing that, a user id rehydrated via {@link SecurityContextRehydrator}.
+ * Decorator that rehydrates the request's environment, tenant, and Spring Security principal from the
+ * {@link AgentToolInvocationContext} on the Spring AI {@link ToolContext} before delegating, since Spring AI runs tool
+ * calls on worker threads that do not inherit the {@code EnvironmentContext}, {@code TenantContext}, or SecurityContext
+ * thread-locals. Each part is independent; security is restored from a captured {@link Authentication} (preferred —
+ * supports principals with no backing platform user, such as the embedded API-key principal) or, failing that, a user
+ * id via {@link SecurityContextRehydrator}.
  *
  * @version ee
  *
@@ -44,10 +44,6 @@ private RehydrateContextToolCallback(ToolCallback delegate, SecurityContextRehyd
         this.securityContextRehydrator = securityContextRehydrator;
     }
 
-    /**
-     * Wraps {@code delegate} so each {@link #call(String, ToolContext)} runs under the invocation's tenant + principal.
-     * Idempotent — re-wrapping a callback already wrapped by this class returns it unchanged.
-     */
     public static ToolCallback wrap(ToolCallback delegate, SecurityContextRehydrator securityContextRehydrator) {
         if (delegate instanceof RehydrateContextToolCallback) {
             return delegate;
@@ -74,13 +70,36 @@ public String call(String toolInput, @Nullable ToolContext toolContext) {
             return delegate.call(toolInput, toolContext);
         }
 
-        String tenantId = invocationContext.tenantId();
+        return withEnvironment(
+            invocationContext.environmentId(),
+            () -> withTenant(
+                invocationContext.tenantId(),
+                () -> withSecurityContext(invocationContext, () -> delegate.call(toolInput, toolContext))));
+    }
+
+    private static String withEnvironment(@Nullable Long environmentId, Supplier<String> action) {
+        if (environmentId == null || environmentId < 0 || environmentId >= Environment.values().length) {
+            return action.get();
+        }
+
+        Environment previousEnvironment = EnvironmentContext.fetchCurrentEnvironment();
+
+        EnvironmentContext.set(environmentId.intValue());
 
-        Supplier<String> securedCall =
-            () -> withSecurityContext(invocationContext, () -> delegate.call(toolInput, toolContext));
+        try {
+            return action.get();
+        } finally {
+            if (previousEnvironment == null) {
+                EnvironmentContext.clear();
+            } else {
+                EnvironmentContext.set(previousEnvironment);
+            }
+        }
+    }
 
+    private static String withTenant(@Nullable String tenantId, Supplier<String> action) {
         if (tenantId == null) {
-            return securedCall.get();
+            return action.get();
         }
 
         String previousTenantId = TenantContext.getCurrentTenantId();
@@ -88,7 +107,7 @@ public String call(String toolInput, @Nullable ToolContext toolContext) {
         try {
             TenantContext.setCurrentTenantId(tenantId);
 
-            return securedCall.get();
+            return action.get();
         } finally {
             TenantContext.setCurrentTenantId(previousTenantId);
         }
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/SelectPropertyOptionToolCallback.java b/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/SelectPropertyOptionToolCallback.java
index df3b8870551..60c1566fc89 100644
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/SelectPropertyOptionToolCallback.java
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/SelectPropertyOptionToolCallback.java
@@ -124,8 +124,8 @@ public String call(String toolInput, @Nullable ToolContext toolContext) {
 
             AgentToolInvocationContext invocationContext = AgentToolInvocationContext.fromToolContext(toolContext);
 
-            if (invocationContext == null || invocationContext.workspaceId() == null) {
-                return toolError("Workspace context unavailable — open this chat from the AI Hub.");
+            if (invocationContext == null) {
+                return toolError("Invocation context unavailable.");
             }
 
             int componentVersion = input.componentVersion() == null ? 1 : input.componentVersion();
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/SelectTriggerPropertyOptionToolCallback.java b/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/SelectTriggerPropertyOptionToolCallback.java
index df7f2a2ae90..22cd7c8ce12 100644
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/SelectTriggerPropertyOptionToolCallback.java
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/SelectTriggerPropertyOptionToolCallback.java
@@ -127,8 +127,8 @@ public String call(String toolInput, @Nullable ToolContext toolContext) {
 
             AgentToolInvocationContext invocationContext = AgentToolInvocationContext.fromToolContext(toolContext);
 
-            if (invocationContext == null || invocationContext.workspaceId() == null) {
-                return toolError("Workspace context unavailable — open this chat from the AI Hub.");
+            if (invocationContext == null) {
+                return toolError("Invocation context unavailable.");
             }
 
             int componentVersion = input.componentVersion() == null ? 1 : input.componentVersion();
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/WorkspaceCopilotConnectionLister.java b/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/WorkspaceCopilotConnectionLister.java
new file mode 100644
index 00000000000..9a11556cff4
--- /dev/null
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/main/java/com/bytechef/ee/ai/copilot/tool/WorkspaceCopilotConnectionLister.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the ByteChef Enterprise license (the "Enterprise License");
+ * you may not use this file except in compliance with the Enterprise License.
+ */
+
+package com.bytechef.ee.ai.copilot.tool;
+
+import com.bytechef.automation.configuration.facade.WorkspaceConnectionFacade;
+import com.bytechef.ee.ai.copilot.connection.CopilotConnectionLister;
+import com.bytechef.platform.connection.dto.ConnectionDTO;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Lists a workspace's connections for a component, scoped to the current environment. Serves the copilot
+ * {@code listConnectionsForComponent} tool for the in-editor / AI Hub surfaces, which carry a workspace context. The
+ * lookup runs inside the calling user's rehydrated security context so workspace authorization is enforced.
+ *
+ * @version ee
+ *
+ * @author Ivica Cardic
+ */
+public class WorkspaceCopilotConnectionLister implements CopilotConnectionLister {
+
+    private final WorkspaceConnectionFacade workspaceConnectionFacade;
+    private final PropertyOptionsResolver propertyOptionsResolver;
+
+    @SuppressFBWarnings("EI_EXPOSE_REP2")
+    public WorkspaceCopilotConnectionLister(
+        WorkspaceConnectionFacade workspaceConnectionFacade, PropertyOptionsResolver propertyOptionsResolver) {
+
+        this.workspaceConnectionFacade = workspaceConnectionFacade;
+        this.propertyOptionsResolver = propertyOptionsResolver;
+    }
+
+    @Override
+    public boolean supports(CopilotConnectionRequest request) {
+        return request.workspaceId() != null;
+    }
+
+    @Override
+    public List<CopilotConnection> listConnections(CopilotConnectionRequest request) {
+        List<ConnectionDTO> connectionDTOs = propertyOptionsResolver.withUserSecurityContext(
+            request.userId(),
+            () -> workspaceConnectionFacade.getConnections(
+                Objects.requireNonNull(request.workspaceId()), request.componentName(), request.connectionVersion(),
+                (long) request.environmentId(), null));
+
+        return connectionDTOs.stream()
+            .map(connectionDTO -> new CopilotConnection(
+                connectionDTO.id(), connectionDTO.name(), connectionDTO.environmentId(), connectionDTO.active()))
+            .toList();
+    }
+}
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/test/java/com/bytechef/ee/ai/copilot/tool/ListConnectionsForComponentToolCallbackTest.java b/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/test/java/com/bytechef/ee/ai/copilot/tool/ListConnectionsForComponentToolCallbackTest.java
index 3f337008ec2..df6b46479f1 100644
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/test/java/com/bytechef/ee/ai/copilot/tool/ListConnectionsForComponentToolCallbackTest.java
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/test/java/com/bytechef/ee/ai/copilot/tool/ListConnectionsForComponentToolCallbackTest.java
@@ -26,6 +26,7 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.Optional;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -77,8 +78,8 @@ void testListsConnectionsForComponent() throws Exception {
             new PropertyOptionsResolver(new SecurityContextRehydrator(userService, mock(AuthorityService.class)));
 
         ListConnectionsForComponentToolCallback callback = new ListConnectionsForComponentToolCallback(
-            componentDefinitionService, connectionDefinitionService, workspaceConnectionFacade, resolver,
-            mock(ToolStateVisibilityMetrics.class));
+            componentDefinitionService, connectionDefinitionService, mock(ToolStateVisibilityMetrics.class),
+            List.of(new WorkspaceCopilotConnectionLister(workspaceConnectionFacade, resolver)));
 
         ToolContext toolContext = new ToolContext(
             new AgentToolInvocationContext(1L, 10L, 0L, "thread-1", null).toToolContext());
@@ -110,15 +111,17 @@ void testReturnsEmptyEnvelopeWhenComponentExistsButHasNoConnectionDefinition() t
 
         when(componentDefinitionService.fetchComponentDefinition("noConnectionComponent", null))
             .thenReturn(Optional.of(mock(ComponentDefinition.class)));
+        // getConnectionDefinition's Optional.orElseThrow() raises NoSuchElementException when the component exposes no
+        // connection definition — the legitimate "no connections to list" signal.
         when(connectionDefinitionService.getConnectionDefinition("noConnectionComponent", 1))
-            .thenThrow(new RuntimeException("no connection definition"));
+            .thenThrow(new NoSuchElementException("no connection definition"));
 
         PropertyOptionsResolver resolver = new PropertyOptionsResolver(
             new SecurityContextRehydrator(mock(UserService.class), mock(AuthorityService.class)));
 
         ListConnectionsForComponentToolCallback callback = new ListConnectionsForComponentToolCallback(
-            componentDefinitionService, connectionDefinitionService, mock(WorkspaceConnectionFacade.class), resolver,
-            mock(ToolStateVisibilityMetrics.class));
+            componentDefinitionService, connectionDefinitionService, mock(ToolStateVisibilityMetrics.class),
+            List.of(new WorkspaceCopilotConnectionLister(mock(WorkspaceConnectionFacade.class), resolver)));
 
         ToolContext toolContext = new ToolContext(
             new AgentToolInvocationContext(1L, 10L, 0L, "thread-1", null).toToolContext());
@@ -133,27 +136,64 @@ componentDefinitionService, connectionDefinitionService, mock(WorkspaceConnectio
     }
 
     @Test
-    void testReturnsToolErrorWithSuggestionsWhenComponentUnknown() throws Exception {
+    void testSurfacesFailureWhenConnectionDefinitionLookupFailsUnexpectedly() throws Exception {
+        ComponentDefinitionService componentDefinitionService = mock(ComponentDefinitionService.class);
+        ConnectionDefinitionService connectionDefinitionService = mock(ConnectionDefinitionService.class);
+
+        when(componentDefinitionService.fetchComponentDefinition("slack", null))
+            .thenReturn(Optional.of(mock(ComponentDefinition.class)));
+        // A non-NoSuchElementException failure is a real backend defect, not "no connections" — it must NOT be masked
+        // as an empty envelope. The tool reports a failure to the LLM instead.
+        when(connectionDefinitionService.getConnectionDefinition("slack", 1))
+            .thenThrow(new IllegalStateException("registry unavailable"));
+
+        PropertyOptionsResolver resolver = new PropertyOptionsResolver(
+            new SecurityContextRehydrator(mock(UserService.class), mock(AuthorityService.class)));
+
+        ListConnectionsForComponentToolCallback callback = new ListConnectionsForComponentToolCallback(
+            componentDefinitionService, connectionDefinitionService, mock(ToolStateVisibilityMetrics.class),
+            List.of(new WorkspaceCopilotConnectionLister(mock(WorkspaceConnectionFacade.class), resolver)));
+
+        ToolContext toolContext = new ToolContext(
+            new AgentToolInvocationContext(1L, 10L, 0L, "thread-1", null).toToolContext());
+
+        String result = callback.call("{\"componentName\":\"slack\"}", toolContext);
+
+        JsonNode node = jsonMapper.readTree(result);
+
+        // The outer RuntimeException handler turns this into an error/lookup-failed envelope, not an empty connections
+        // list — so the LLM does not falsely conclude the component has zero connections.
+        assertThat(node.has("error")).isTrue();
+        assertThat(node.has("connections")).isFalse();
+    }
+
+    @Test
+    void testReturnsToolErrorWithSuggestionsWhenComponentAmbiguous() throws Exception {
         ComponentDefinitionService componentDefinitionService = mock(ComponentDefinitionService.class);
         ComponentDefinition googleMail = mock(ComponentDefinition.class);
+        ComponentDefinition googleDrive = mock(ComponentDefinition.class);
 
         when(googleMail.getName()).thenReturn("googleMail");
         when(googleMail.getTitle()).thenReturn("Gmail");
+        when(googleDrive.getName()).thenReturn("googleDrive");
+        when(googleDrive.getTitle()).thenReturn("Google Drive");
 
-        when(componentDefinitionService.fetchComponentDefinition("gmail", null)).thenReturn(Optional.empty());
-        when(componentDefinitionService.getComponentDefinitions()).thenReturn(List.of(googleMail));
+        // "google" matches two components, so there is no single unambiguous slug to auto-resolve to — the tool must
+        // still fail loud with candidates so the agent picks one, rather than guessing.
+        when(componentDefinitionService.fetchComponentDefinition("google", null)).thenReturn(Optional.empty());
+        when(componentDefinitionService.getComponentDefinitions()).thenReturn(List.of(googleMail, googleDrive));
 
         PropertyOptionsResolver resolver = new PropertyOptionsResolver(
             new SecurityContextRehydrator(mock(UserService.class), mock(AuthorityService.class)));
 
         ListConnectionsForComponentToolCallback callback = new ListConnectionsForComponentToolCallback(
-            componentDefinitionService, mock(ConnectionDefinitionService.class), mock(WorkspaceConnectionFacade.class),
-            resolver, mock(ToolStateVisibilityMetrics.class));
+            componentDefinitionService, mock(ConnectionDefinitionService.class), mock(ToolStateVisibilityMetrics.class),
+            List.of(new WorkspaceCopilotConnectionLister(mock(WorkspaceConnectionFacade.class), resolver)));
 
         ToolContext toolContext = new ToolContext(
             new AgentToolInvocationContext(1L, 10L, 0L, "thread-1", null).toToolContext());
 
-        String result = callback.call("{\"componentName\":\"gmail\"}", toolContext);
+        String result = callback.call("{\"componentName\":\"google\"}", toolContext);
 
         JsonNode node = jsonMapper.readTree(result);
 
@@ -162,8 +202,83 @@ componentDefinitionService, mock(ConnectionDefinitionService.class), mock(Worksp
         String error = node.get("error")
             .asString();
 
-        assertThat(error).contains("gmail");
+        assertThat(error).contains("google");
         assertThat(error).contains("googleMail (Gmail)");
+        assertThat(error).contains("googleDrive (Google Drive)");
+    }
+
+    @Test
+    void testAutoResolvesSingleFuzzyMatchAndListsConnections() throws Exception {
+        assertAutoResolves("gmail");
+    }
+
+    @Test
+    void testAutoResolvesHyphenatedNameAndListsConnections() throws Exception {
+        // The colloquial "google-mail" used to match nothing (the hyphen broke the raw substring match), forcing an
+        // extra round-trip; normalized matching now resolves it to the single googleMail slug.
+        assertAutoResolves("google-mail");
+    }
+
+    private void assertAutoResolves(String requestedComponentName) throws Exception {
+        ComponentDefinitionService componentDefinitionService = mock(ComponentDefinitionService.class);
+        ConnectionDefinitionService connectionDefinitionService = mock(ConnectionDefinitionService.class);
+        WorkspaceConnectionFacade workspaceConnectionFacade = mock(WorkspaceConnectionFacade.class);
+        UserService userService = mock(UserService.class);
+
+        ComponentDefinition googleMail = mock(ComponentDefinition.class);
+
+        when(googleMail.getName()).thenReturn("googleMail");
+        when(googleMail.getTitle()).thenReturn("Gmail");
+
+        when(componentDefinitionService.fetchComponentDefinition(requestedComponentName, null))
+            .thenReturn(Optional.empty());
+        when(componentDefinitionService.getComponentDefinitions()).thenReturn(List.of(googleMail));
+        when(connectionDefinitionService.getConnectionDefinition("googleMail", 1))
+            .thenReturn(buildConnectionDefinition(1));
+
+        User user = mock(User.class);
+
+        when(user.getLogin()).thenReturn("user@localhost.com");
+        when(user.getAuthorityIds()).thenReturn(List.of());
+        when(userService.fetchUser(10L)).thenReturn(Optional.of(user));
+
+        ConnectionDTO connectionDTO = ConnectionDTO.builder()
+            .id(77L)
+            .name("Gmail24")
+            .componentName("googleMail")
+            .connectionVersion(1)
+            .environmentId(0)
+            .active(true)
+            .build();
+
+        when(workspaceConnectionFacade.getConnections(eq(1L), eq("googleMail"), eq(1), eq(0L), eq(null)))
+            .thenReturn(List.of(connectionDTO));
+
+        PropertyOptionsResolver resolver =
+            new PropertyOptionsResolver(new SecurityContextRehydrator(userService, mock(AuthorityService.class)));
+
+        ListConnectionsForComponentToolCallback callback = new ListConnectionsForComponentToolCallback(
+            componentDefinitionService, connectionDefinitionService, mock(ToolStateVisibilityMetrics.class),
+            List.of(new WorkspaceCopilotConnectionLister(workspaceConnectionFacade, resolver)));
+
+        ToolContext toolContext = new ToolContext(
+            new AgentToolInvocationContext(1L, 10L, 0L, "thread-1", null).toToolContext());
+
+        String result = callback.call("{\"componentName\":\"" + requestedComponentName + "\"}", toolContext);
+
+        JsonNode node = jsonMapper.readTree(result);
+
+        assertThat(node.has("error")).isFalse();
+        assertThat(node.get("componentName")
+            .asText()).isEqualTo("googleMail");
+        assertThat(node.get("resolvedFromComponentName")
+            .asText()).isEqualTo(requestedComponentName);
+        assertThat(node.get("connections")
+            .size()).isEqualTo(1);
+        assertThat(node.get("connections")
+            .get(0)
+            .get("id")
+            .asLong()).isEqualTo(77L);
     }
 
     @Test
@@ -173,7 +288,8 @@ void testReturnsToolErrorWhenWorkspaceContextMissing() throws Exception {
 
         ListConnectionsForComponentToolCallback callback = new ListConnectionsForComponentToolCallback(
             mock(ComponentDefinitionService.class), mock(ConnectionDefinitionService.class),
-            mock(WorkspaceConnectionFacade.class), resolver, mock(ToolStateVisibilityMetrics.class));
+            mock(ToolStateVisibilityMetrics.class),
+            List.of(new WorkspaceCopilotConnectionLister(mock(WorkspaceConnectionFacade.class), resolver)));
 
         String result = callback.call("{\"componentName\":\"slack\"}");
 
@@ -181,7 +297,7 @@ void testReturnsToolErrorWhenWorkspaceContextMissing() throws Exception {
 
         assertThat(node.has("error")).isTrue();
         assertThat(node.get("error")
-            .asText()).contains("Workspace context unavailable");
+            .asText()).contains("Invocation context unavailable");
     }
 
     @Test
@@ -191,7 +307,8 @@ void testRejectsBlankComponentName() throws Exception {
 
         ListConnectionsForComponentToolCallback callback = new ListConnectionsForComponentToolCallback(
             mock(ComponentDefinitionService.class), mock(ConnectionDefinitionService.class),
-            mock(WorkspaceConnectionFacade.class), resolver, mock(ToolStateVisibilityMetrics.class));
+            mock(ToolStateVisibilityMetrics.class),
+            List.of(new WorkspaceCopilotConnectionLister(mock(WorkspaceConnectionFacade.class), resolver)));
 
         ToolContext toolContext = new ToolContext(
             new AgentToolInvocationContext(1L, 10L, 0L, "thread-1", null).toToolContext());
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/test/java/com/bytechef/ee/ai/copilot/tool/RehydrateContextToolCallbackTest.java b/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/test/java/com/bytechef/ee/ai/copilot/tool/RehydrateContextToolCallbackTest.java
index 96d9b8105c0..0d4f5085517 100644
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/test/java/com/bytechef/ee/ai/copilot/tool/RehydrateContextToolCallbackTest.java
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-tool/src/test/java/com/bytechef/ee/ai/copilot/tool/RehydrateContextToolCallbackTest.java
@@ -12,10 +12,13 @@
 
 import com.bytechef.automation.configuration.security.AutomationAuthorizationContext;
 import com.bytechef.ee.ai.copilot.tool.context.AgentToolInvocationContext;
+import com.bytechef.platform.configuration.context.EnvironmentContext;
+import com.bytechef.platform.configuration.domain.Environment;
 import com.bytechef.tenant.TenantContext;
 import java.util.Map;
 import java.util.function.Supplier;
 import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.ai.chat.model.ToolContext;
 import org.springframework.ai.tool.ToolCallback;
@@ -50,6 +53,7 @@ private static final class ProbeToolCallback implements ToolCallback {
         private String tenantSeenInside;
         private Authentication authenticationSeenInside;
         private boolean skipChecksSeenInside;
+        private Environment environmentSeenInside;
 
         @Override
         public ToolDefinition getToolDefinition() {
@@ -71,11 +75,17 @@ public String call(String toolInput, @Nullable ToolContext toolContext) {
             authenticationSeenInside = SecurityContextHolder.getContext()
                 .getAuthentication();
             skipChecksSeenInside = AutomationAuthorizationContext.isSkipChecks();
+            environmentSeenInside = EnvironmentContext.getCurrentEnvironment();
 
             return "ok";
         }
     }
 
+    @AfterEach
+    void tearDown() {
+        EnvironmentContext.clear();
+    }
+
     @Test
     void testSetsTenantAndUserInsideCallThenRestores() {
         TenantContext.setCurrentTenantId(TenantContext.DEFAULT_TENANT_ID);
@@ -160,6 +170,42 @@ void testDoesNotSkipChecksWhenFlagAbsent() {
         assertThat(probe.skipChecksSeenInside).isFalse();
     }
 
+    @Test
+    void testBindsEnvironmentInsideCallThenClears() {
+        TenantContext.setCurrentTenantId(TenantContext.DEFAULT_TENANT_ID);
+
+        ProbeToolCallback probe = new ProbeToolCallback();
+
+        ToolCallback wrapped = RehydrateContextToolCallback.wrap(probe, new RecordingRehydrator());
+
+        Map<String, Object> map = new AgentToolInvocationContext(
+            null, 42L, (long) Environment.STAGING.ordinal(), null, "acme").toToolContext();
+
+        String result = wrapped.call("{}", new ToolContext(map));
+
+        assertThat(result).isEqualTo("ok");
+        // The Reactor worker thread sees the invocation's environment, not the unbound default.
+        assertThat(probe.environmentSeenInside).isEqualTo(Environment.STAGING);
+        // ... and the ThreadLocal returns to its unbound default (PRODUCTION) afterward.
+        assertThat(EnvironmentContext.getCurrentEnvironment()).isEqualTo(Environment.PRODUCTION);
+    }
+
+    @Test
+    void testLeavesEnvironmentUnboundWhenIdAbsent() {
+        TenantContext.setCurrentTenantId(TenantContext.DEFAULT_TENANT_ID);
+
+        ProbeToolCallback probe = new ProbeToolCallback();
+
+        ToolCallback wrapped = RehydrateContextToolCallback.wrap(probe, new RecordingRehydrator());
+
+        Map<String, Object> map = new AgentToolInvocationContext(null, 42L, null, null, "acme").toToolContext();
+
+        wrapped.call("{}", new ToolContext(map));
+
+        // No environment in the context → left unbound, resolving to the PRODUCTION default downstream.
+        assertThat(probe.environmentSeenInside).isEqualTo(Environment.PRODUCTION);
+    }
+
     @Test
     void testIdempotentWrap() {
         RecordingRehydrator rehydrator = new RecordingRehydrator();
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-service/src/main/java/com/bytechef/ee/embedded/configuration/facade/EmbeddedCopilotConnectionLister.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-service/src/main/java/com/bytechef/ee/embedded/configuration/facade/EmbeddedCopilotConnectionLister.java
new file mode 100644
index 00000000000..f82e1932842
--- /dev/null
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-service/src/main/java/com/bytechef/ee/embedded/configuration/facade/EmbeddedCopilotConnectionLister.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the ByteChef Enterprise license (the "Enterprise License");
+ * you may not use this file except in compliance with the Enterprise License.
+ */
+
+package com.bytechef.ee.embedded.configuration.facade;
+
+import com.bytechef.ee.ai.copilot.connection.CopilotConnectionLister;
+import com.bytechef.ee.embedded.connected.user.domain.ConnectedUser;
+import com.bytechef.ee.embedded.connected.user.service.ConnectedUserService;
+import com.bytechef.platform.annotation.ConditionalOnEEVersion;
+import com.bytechef.platform.configuration.domain.Environment;
+import com.bytechef.platform.configuration.service.EnvironmentService;
+import com.bytechef.platform.connection.dto.ConnectionDTO;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.util.List;
+import org.springframework.stereotype.Component;
+
+/**
+ * Lists an embedded connected user's connections for a component, sourced from their IntegrationInstances. Serves the
+ * copilot {@code listConnectionsForComponent} tool when invoked from the embedded workflow chat, which has no workspace
+ * context; the in-editor / AI Hub surfaces use the workspace path instead.
+ *
+ * @version ee
+ *
+ * @author Ivica Cardic
+ */
+@Component
+@ConditionalOnEEVersion
+public class EmbeddedCopilotConnectionLister implements CopilotConnectionLister {
+
+    private final ConnectedUserConnectionFacade connectedUserConnectionFacade;
+    private final ConnectedUserService connectedUserService;
+    private final EnvironmentService environmentService;
+
+    @SuppressFBWarnings("EI_EXPOSE_REP2")
+    public EmbeddedCopilotConnectionLister(
+        ConnectedUserConnectionFacade connectedUserConnectionFacade, ConnectedUserService connectedUserService,
+        EnvironmentService environmentService) {
+
+        this.connectedUserConnectionFacade = connectedUserConnectionFacade;
+        this.connectedUserService = connectedUserService;
+        this.environmentService = environmentService;
+    }
+
+    @Override
+    public boolean supports(CopilotConnectionRequest request) {
+        return request.workspaceId() == null && request.externalUserId() != null;
+    }
+
+    @Override
+    public List<CopilotConnection> listConnections(CopilotConnectionRequest request) {
+        Environment environment = environmentService.getEnvironment(request.environmentId());
+
+        ConnectedUser connectedUser = connectedUserService.getConnectedUser(request.externalUserId(), environment);
+
+        List<ConnectionDTO> connectionDTOs =
+            connectedUserConnectionFacade.getConnections(connectedUser.getId(), request.componentName(), List.of());
+
+        return connectionDTOs.stream()
+            .map(connectionDTO -> new CopilotConnection(
+                connectionDTO.id(), connectionDTO.name(), connectionDTO.environmentId(), connectionDTO.active()))
+            .toList();
+    }
+}
diff --git a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/build.gradle.kts b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/build.gradle.kts
index 17edce8b41b..51005e89242 100644
--- a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/build.gradle.kts
+++ b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/build.gradle.kts
@@ -11,11 +11,14 @@ dependencies {
     implementation(project(":server:libs:modules:components:ai:llm:groq"))
     implementation(project(":server:libs:modules:components:ai:llm:mistral"))
     implementation(project(":server:libs:modules:components:ai:llm:nvidia"))
+    implementation(project(":server:libs:modules:components:ai:llm:ollama"))
     implementation(project(":server:libs:modules:components:ai:llm:open-ai"))
     implementation(project(":server:libs:modules:components:ai:llm:perplexity"))
     implementation(project(":server:libs:platform:platform-component:platform-component-api"))
     implementation(project(":server:libs:platform:platform-configuration:platform-configuration-api"))
-    api(project(":server:ee:libs:platform:platform-ai:platform-ai-agent:platform-ai-agent-api"))
+
+    implementation(project(":server:ee:libs:platform:platform-ai:platform-ai-agent:platform-ai-agent-api"))
+    implementation(project(":server:ee:libs:platform:platform-configuration:platform-configuration-api"))
 
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.junit.jupiter:junit-jupiter")
diff --git a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/main/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogChatClientResolverImpl.java b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/main/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogChatClientResolverImpl.java
index c5536a32ae3..b5200e6cfcf 100644
--- a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/main/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogChatClientResolverImpl.java
+++ b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/main/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogChatClientResolverImpl.java
@@ -7,7 +7,8 @@
 
 package com.bytechef.ee.platform.ai.agent.catalog;
 
-import com.bytechef.component.ai.llm.Provider;
+import com.bytechef.ee.platform.configuration.facade.AiProviderFacade;
+import com.bytechef.platform.ai.llm.Provider;
 import com.bytechef.platform.annotation.ConditionalOnEEVersion;
 import com.bytechef.platform.configuration.domain.Environment;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -20,11 +21,6 @@
 import org.springframework.stereotype.Component;
 
 /**
- * Default {@link CatalogChatClientResolver}: given a catalog provider key (e.g. {@code "ai.provider.openAi"}) + model
- * name, reads the environment-scoped platform API key and builds a Spring-AI {@link ChatModel} via
- * {@link CatalogChatModelFactory}. Returns {@code null} (caller falls back) when the key is unknown, the provider is
- * disabled, no API key is stored, or the factory can't build it.
- *
  * @version ee
  *
  * @author Ivica Cardic
@@ -34,14 +30,14 @@
 public class CatalogChatClientResolverImpl implements CatalogChatClientResolver {
 
     private final CatalogChatModelFactory catalogChatModelFactory;
-    private final ProviderApiKeyResolver providerApiKeyResolver;
+    private final AiProviderFacade aiProviderFacade;
 
     @SuppressFBWarnings("EI")
     public CatalogChatClientResolverImpl(
-        CatalogChatModelFactory catalogChatModelFactory, ProviderApiKeyResolver providerApiKeyResolver) {
+        CatalogChatModelFactory catalogChatModelFactory, AiProviderFacade aiProviderFacade) {
 
         this.catalogChatModelFactory = catalogChatModelFactory;
-        this.providerApiKeyResolver = providerApiKeyResolver;
+        this.aiProviderFacade = aiProviderFacade;
     }
 
     @Override
@@ -59,13 +55,15 @@ public CatalogChatClientResolverImpl(
             return null;
         }
 
-        String apiKey = providerApiKeyResolver.resolve(provider, environment);
+        String apiKey = aiProviderFacade.getApiKey(provider.getKey(), environment);
 
-        if (apiKey == null || apiKey.isBlank()) {
+        if ((apiKey == null || apiKey.isBlank()) && provider.requiresApiKey()) {
             return null;
         }
 
-        ChatModel chatModel = catalogChatModelFactory.createChatModel(provider, model, apiKey);
+        String url = aiProviderFacade.getUrl(provider.getKey(), environment);
+
+        ChatModel chatModel = catalogChatModelFactory.createChatModel(provider, model, apiKey, url);
 
         if (chatModel == null) {
             return null;
diff --git a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/main/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogChatModel.java b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/main/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogChatModel.java
new file mode 100644
index 00000000000..efd2b8a779c
--- /dev/null
+++ b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/main/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogChatModel.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the ByteChef Enterprise license (the "Enterprise License");
+ * you may not use this file except in compliance with the Enterprise License.
+ */
+
+package com.bytechef.ee.platform.ai.agent.catalog;
+
+import com.bytechef.ee.platform.configuration.dto.AiDefaultModelWithApiKeyDTO;
+import com.bytechef.ee.platform.configuration.facade.AiProviderFacade;
+import com.bytechef.platform.ai.llm.Provider;
+import com.bytechef.platform.annotation.ConditionalOnEEVersion;
+import com.bytechef.platform.configuration.context.EnvironmentContext;
+import com.bytechef.platform.configuration.domain.Environment;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.time.Duration;
+import org.springframework.ai.chat.model.ChatModel;
+import org.springframework.ai.chat.model.ChatResponse;
+import org.springframework.ai.chat.prompt.Prompt;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+
+/**
+ * Always-present {@link ChatModel} that resolves the underlying provider model at call time from the UI-activated chat
+ * provider for the current {@link EnvironmentContext} environment. Lets the application boot without a
+ * statically-configured chat provider; the copilot (and any other consumer injecting a bare {@link ChatModel}) starts
+ * working as soon as a provider is activated in the AI Providers UI.
+ *
+ * @version ee
+ *
+ * @author Ivica Cardic
+ */
+@Component
+@Primary
+@ConditionalOnEEVersion
+public class CatalogChatModel implements ChatModel {
+
+    private final AiProviderFacade aiProviderFacade;
+    private final CatalogChatModelFactory catalogChatModelFactory;
+    private final Cache<String, ChatModel> delegateCache = Caffeine.newBuilder()
+        .maximumSize(100)
+        .expireAfterWrite(Duration.ofHours(1))
+        .build();
+
+    @SuppressFBWarnings("EI")
+    public CatalogChatModel(AiProviderFacade aiProviderFacade, CatalogChatModelFactory catalogChatModelFactory) {
+        this.aiProviderFacade = aiProviderFacade;
+        this.catalogChatModelFactory = catalogChatModelFactory;
+    }
+
+    @Override
+    public ChatResponse call(Prompt prompt) {
+        return resolveDelegate().call(prompt);
+    }
+
+    @Override
+    public Flux<ChatResponse> stream(Prompt prompt) {
+        return resolveDelegate().stream(prompt);
+    }
+
+    private ChatModel resolveDelegate() {
+        Environment environment = EnvironmentContext.getCurrentEnvironment();
+
+        int ordinal = environment.ordinal();
+
+        AiDefaultModelWithApiKeyDTO defaultModel = aiProviderFacade.getAiDefaultChatModelApiKey(ordinal);
+
+        if (defaultModel == null) {
+            throw new IllegalStateException(
+                "No chat provider is activated for environment " + environment + ". Activate the Anthropic or OpenAI " +
+                    "provider in the AI Providers UI (or set bytechef.ai.provider.anthropic.api-key / " +
+                    "bytechef.ai.provider.openai.api-key) so the copilot can generate.");
+        }
+
+        Provider provider = defaultModel.provider();
+        String model = defaultModel.model();
+        String apiKey = defaultModel.apiKey();
+        String url = defaultModel.url();
+
+        String cacheKey = ordinal + ":" + provider.getKey() + ":" + model + ":" + apiKey + ":" + url;
+
+        return delegateCache.get(cacheKey,
+            key -> catalogChatModelFactory.createChatModel(provider, model, apiKey, url));
+    }
+}
diff --git a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/main/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogChatModelFactory.java b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/main/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogChatModelFactory.java
index d9cd37c8a02..f6ecfcfd9ed 100644
--- a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/main/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogChatModelFactory.java
+++ b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/main/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogChatModelFactory.java
@@ -8,20 +8,23 @@
 package com.bytechef.ee.platform.ai.agent.catalog;
 
 import static com.bytechef.component.ai.llm.constant.LLMConstants.MODEL;
+import static com.bytechef.component.ai.llm.ollama.constant.OllamaConstants.URL;
 import static com.bytechef.component.definition.Authorization.TOKEN;
 
-import com.bytechef.component.ai.llm.Provider;
 import com.bytechef.component.ai.llm.anthropic.action.AnthropicChatAction;
 import com.bytechef.component.ai.llm.deepseek.action.DeepSeekChatAction;
 import com.bytechef.component.ai.llm.gemini.action.GeminiChatAction;
 import com.bytechef.component.ai.llm.groq.action.GroqChatAction;
 import com.bytechef.component.ai.llm.mistral.action.MistralChatAction;
 import com.bytechef.component.ai.llm.nvidia.action.NvidiaChatAction;
+import com.bytechef.component.ai.llm.ollama.action.OllamaChatAction;
 import com.bytechef.component.ai.llm.openai.action.OpenAiChatAction;
 import com.bytechef.component.ai.llm.perplexity.action.PerplexityChatAction;
 import com.bytechef.component.definition.Parameters;
+import com.bytechef.platform.ai.llm.Provider;
 import com.bytechef.platform.annotation.ConditionalOnEEVersion;
 import com.bytechef.platform.component.definition.ParametersFactory;
+import java.util.HashMap;
 import java.util.Map;
 import org.jspecify.annotations.Nullable;
 import org.springframework.ai.chat.model.ChatModel;
@@ -39,7 +42,9 @@
 @ConditionalOnEEVersion
 public class CatalogChatModelFactory {
 
-    public @Nullable ChatModel createChatModel(Provider provider, String model, String apiKey) {
+    public @Nullable ChatModel createChatModel(
+        Provider provider, String model, @Nullable String apiKey, @Nullable String url) {
+
         com.bytechef.component.ai.llm.ChatModel chatModelFactory = resolveFactory(provider);
 
         if (chatModelFactory == null) {
@@ -47,21 +52,36 @@ public class CatalogChatModelFactory {
         }
 
         Parameters inputParameters = ParametersFactory.create(Map.of(MODEL, model));
-        Parameters connectionParameters = ParametersFactory.create(Map.of(TOKEN, apiKey));
+        Parameters connectionParameters = ParametersFactory.create(createConnectionParameters(apiKey, url));
 
         return chatModelFactory.createChatModel(inputParameters, connectionParameters, false);
     }
 
+    private static Map<String, Object> createConnectionParameters(@Nullable String apiKey, @Nullable String url) {
+        Map<String, Object> connectionParameters = new HashMap<>();
+
+        if (apiKey != null) {
+            connectionParameters.put(TOKEN, apiKey);
+        }
+
+        if (url != null && !url.isBlank()) {
+            connectionParameters.put(URL, url);
+        }
+
+        return connectionParameters;
+    }
+
     private static com.bytechef.component.ai.llm.@Nullable ChatModel resolveFactory(Provider provider) {
         return switch (provider) {
-            case OPEN_AI -> OpenAiChatAction.CHAT_MODEL;
             case ANTHROPIC -> AnthropicChatAction.CHAT_MODEL;
-            case MISTRAL -> MistralChatAction.CHAT_MODEL;
-            case VERTEX_GEMINI -> GeminiChatAction.CHAT_MODEL;
+            case DEEPSEEK -> DeepSeekChatAction.CHAT_MODEL;
             case GROQ -> GroqChatAction.CHAT_MODEL;
-            case PERPLEXITY -> PerplexityChatAction.CHAT_MODEL;
+            case MISTRAL -> MistralChatAction.CHAT_MODEL;
             case NVIDIA -> NvidiaChatAction.CHAT_MODEL;
-            case DEEPSEEK -> DeepSeekChatAction.CHAT_MODEL;
+            case OLLAMA -> OllamaChatAction.CHAT_MODEL;
+            case OPEN_AI -> OpenAiChatAction.CHAT_MODEL;
+            case PERPLEXITY -> PerplexityChatAction.CHAT_MODEL;
+            case VERTEX_GEMINI -> GeminiChatAction.CHAT_MODEL;
             // AZURE_OPEN_AI and HUGGING_FACE need extra connection params not stored in the catalog.
             default -> null;
         };
diff --git a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/main/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogEmbeddingModel.java b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/main/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogEmbeddingModel.java
index ead9dbf2dd2..d264ee06aa7 100644
--- a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/main/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogEmbeddingModel.java
+++ b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/main/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogEmbeddingModel.java
@@ -7,8 +7,9 @@
 
 package com.bytechef.ee.platform.ai.agent.catalog;
 
-import com.bytechef.component.ai.llm.Provider;
-import com.bytechef.config.ApplicationProperties;
+import com.bytechef.ee.platform.configuration.dto.AiDefaultModelWithApiKeyDTO;
+import com.bytechef.ee.platform.configuration.facade.AiProviderFacade;
+import com.bytechef.platform.ai.llm.Provider;
 import com.bytechef.platform.annotation.ConditionalOnEEVersion;
 import com.bytechef.platform.configuration.context.EnvironmentContext;
 import com.bytechef.platform.configuration.domain.Environment;
@@ -49,9 +50,8 @@ public class CatalogEmbeddingModel implements EmbeddingModel {
     private static final int MAX_CACHED_DELEGATES = 256;
     private static final Duration DELEGATE_CACHE_TTL = Duration.ofHours(1);
 
-    private final ProviderApiKeyResolver providerApiKeyResolver;
+    private final AiProviderFacade aiProviderFacade;
     private final CatalogEmbeddingModelFactory catalogEmbeddingModelFactory;
-    private final ApplicationProperties applicationProperties;
     private final Cache<String, EmbeddingModel> delegateCache = Caffeine.newBuilder()
         .maximumSize(MAX_CACHED_DELEGATES)
         .expireAfterAccess(DELEGATE_CACHE_TTL)
@@ -59,12 +59,10 @@ public class CatalogEmbeddingModel implements EmbeddingModel {
 
     @SuppressFBWarnings("EI")
     public CatalogEmbeddingModel(
-        ProviderApiKeyResolver providerApiKeyResolver, CatalogEmbeddingModelFactory catalogEmbeddingModelFactory,
-        ApplicationProperties applicationProperties) {
+        AiProviderFacade aiProviderFacade, CatalogEmbeddingModelFactory catalogEmbeddingModelFactory) {
 
-        this.providerApiKeyResolver = providerApiKeyResolver;
+        this.aiProviderFacade = aiProviderFacade;
         this.catalogEmbeddingModelFactory = catalogEmbeddingModelFactory;
-        this.applicationProperties = applicationProperties;
     }
 
     @Override
@@ -100,24 +98,24 @@ public int dimensions() {
     private EmbeddingModel resolveDelegate() {
         Environment environment = EnvironmentContext.getCurrentEnvironment();
 
-        String model = applicationProperties.getAi()
-            .getProvider()
-            .getEmbedding()
-            .getOpenAi()
-            .getOptions()
-            .getModel();
+        int ordinal = environment.ordinal();
 
-        String apiKey = providerApiKeyResolver.resolve(Provider.OPEN_AI, environment.ordinal());
+        AiDefaultModelWithApiKeyDTO defaultModel = aiProviderFacade.getAiDefaultEmbeddingModelApiKey(ordinal);
 
-        if (apiKey == null || apiKey.isBlank()) {
+        if (defaultModel == null) {
             throw new IllegalStateException(
                 "No embedding provider is activated for environment " + environment + ". Activate the OpenAI " +
                     "provider in the UI (or set bytechef.ai.provider.openai.api-key) so the Knowledge Base can embed " +
                     "documents.");
         }
 
+        Provider provider = defaultModel.provider();
+        String model = defaultModel.model();
+        String apiKey = defaultModel.apiKey();
+        String url = defaultModel.url();
+
         return delegateCache.get(
-            environment.ordinal() + ":" + apiKey,
-            ignoredKey -> catalogEmbeddingModelFactory.createEmbeddingModel(Provider.OPEN_AI, model, apiKey));
+            ordinal + ":" + provider.getKey() + ":" + model + ":" + apiKey + ":" + url,
+            ignoredKey -> catalogEmbeddingModelFactory.createEmbeddingModel(provider, model, apiKey, url));
     }
 }
diff --git a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/main/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogEmbeddingModelFactory.java b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/main/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogEmbeddingModelFactory.java
index 36400569ad2..d905a570642 100644
--- a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/main/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogEmbeddingModelFactory.java
+++ b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/main/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogEmbeddingModelFactory.java
@@ -8,14 +8,17 @@
 package com.bytechef.ee.platform.ai.agent.catalog;
 
 import static com.bytechef.component.ai.llm.constant.LLMConstants.MODEL;
+import static com.bytechef.component.ai.llm.ollama.constant.OllamaConstants.URL;
 import static com.bytechef.component.definition.Authorization.TOKEN;
 
-import com.bytechef.component.ai.llm.Provider;
+import com.bytechef.component.ai.llm.ollama.cluster.OllamaEmbedding;
 import com.bytechef.component.ai.llm.openai.cluster.OpenAiEmbedding;
 import com.bytechef.component.definition.Parameters;
+import com.bytechef.platform.ai.llm.Provider;
 import com.bytechef.platform.annotation.ConditionalOnEEVersion;
 import com.bytechef.platform.component.definition.ParametersFactory;
 import com.bytechef.platform.component.definition.ai.vectorstore.EmbeddingFunction;
+import java.util.HashMap;
 import java.util.Map;
 import org.jspecify.annotations.Nullable;
 import org.springframework.ai.embedding.EmbeddingModel;
@@ -34,7 +37,9 @@
 @ConditionalOnEEVersion
 public class CatalogEmbeddingModelFactory {
 
-    public @Nullable EmbeddingModel createEmbeddingModel(Provider provider, String model, String apiKey) {
+    public @Nullable EmbeddingModel createEmbeddingModel(
+        Provider provider, String model, @Nullable String apiKey, @Nullable String url) {
+
         EmbeddingFunction embeddingFunction = resolveFactory(provider);
 
         if (embeddingFunction == null) {
@@ -42,17 +47,28 @@ public class CatalogEmbeddingModelFactory {
         }
 
         Parameters inputParameters = ParametersFactory.create(Map.of(MODEL, model));
-        Parameters connectionParameters = ParametersFactory.create(Map.of(TOKEN, apiKey));
+        Parameters connectionParameters = ParametersFactory.create(createConnectionParameters(apiKey, url));
 
         return embeddingFunction.apply(inputParameters, connectionParameters);
     }
 
-    private static @Nullable EmbeddingFunction resolveFactory(Provider provider) {
-        if (!provider.isEmbeddingSupported()) {
-            return null;
+    private static Map<String, Object> createConnectionParameters(@Nullable String apiKey, @Nullable String url) {
+        Map<String, Object> connectionParameters = new HashMap<>();
+
+        if (apiKey != null) {
+            connectionParameters.put(TOKEN, apiKey);
         }
 
+        if (url != null && !url.isBlank()) {
+            connectionParameters.put(URL, url);
+        }
+
+        return connectionParameters;
+    }
+
+    private static @Nullable EmbeddingFunction resolveFactory(Provider provider) {
         return switch (provider) {
+            case OLLAMA -> OllamaEmbedding.EMBEDDING_MODEL;
             case OPEN_AI -> OpenAiEmbedding.EMBEDDING_MODEL;
             default -> null;
         };
diff --git a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/main/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogEmbeddingProviderStatusProvider.java b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/main/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogEmbeddingProviderStatusProvider.java
index 634e93da2d4..df9f09f1ada 100644
--- a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/main/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogEmbeddingProviderStatusProvider.java
+++ b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/main/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogEmbeddingProviderStatusProvider.java
@@ -7,16 +7,16 @@
 
 package com.bytechef.ee.platform.ai.agent.catalog;
 
-import com.bytechef.component.ai.llm.Provider;
+import com.bytechef.ee.platform.configuration.facade.AiProviderFacade;
 import com.bytechef.platform.annotation.ConditionalOnEEVersion;
 import com.bytechef.platform.configuration.ai.EmbeddingProviderStatusProvider;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.springframework.stereotype.Component;
 
 /**
- * EE {@link EmbeddingProviderStatusProvider}: embeddings are active for an environment when the OpenAI API key resolves
- * (from the activated provider property, falling back to static config) — the same predicate the runtime embedding
- * model uses.
+ * EE {@link EmbeddingProviderStatusProvider}: embeddings are active for an environment when a default embedding
+ * provider is activated and its API key resolves — the same predicate the runtime embedding model uses to build its
+ * delegate.
  *
  * @version ee
  *
@@ -26,17 +26,15 @@
 @ConditionalOnEEVersion
 public class CatalogEmbeddingProviderStatusProvider implements EmbeddingProviderStatusProvider {
 
-    private final ProviderApiKeyResolver providerApiKeyResolver;
+    private final AiProviderFacade aiProviderFacade;
 
     @SuppressFBWarnings("EI")
-    public CatalogEmbeddingProviderStatusProvider(ProviderApiKeyResolver providerApiKeyResolver) {
-        this.providerApiKeyResolver = providerApiKeyResolver;
+    public CatalogEmbeddingProviderStatusProvider(AiProviderFacade aiProviderFacade) {
+        this.aiProviderFacade = aiProviderFacade;
     }
 
     @Override
     public boolean isEmbeddingActive(int environment) {
-        String apiKey = providerApiKeyResolver.resolve(Provider.OPEN_AI, environment);
-
-        return apiKey != null && !apiKey.isBlank();
+        return aiProviderFacade.getAiDefaultEmbeddingModelApiKey(environment) != null;
     }
 }
diff --git a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/main/java/com/bytechef/ee/platform/ai/agent/catalog/ProviderApiKeyResolver.java b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/main/java/com/bytechef/ee/platform/ai/agent/catalog/ProviderApiKeyResolver.java
deleted file mode 100644
index e062f370735..00000000000
--- a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/main/java/com/bytechef/ee/platform/ai/agent/catalog/ProviderApiKeyResolver.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.platform.ai.agent.catalog;
-
-import com.bytechef.component.ai.llm.Provider;
-import com.bytechef.config.ApplicationProperties;
-import com.bytechef.platform.annotation.ConditionalOnEEVersion;
-import com.bytechef.platform.configuration.domain.Property;
-import com.bytechef.platform.configuration.domain.Property.Scope;
-import com.bytechef.platform.configuration.service.PropertyService;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.Optional;
-import org.jspecify.annotations.Nullable;
-import org.springframework.stereotype.Component;
-
-/**
- * Resolves a catalog provider's API key for an environment: the UI-activated platform property
- * ({@link Property#isEnabled()}) wins, falling back to the statically-configured key. Shared by the chat client
- * resolver and the embedding model so the two cannot diverge.
- *
- * @version ee
- *
- * @author Ivica Cardic
- */
-@Component
-@ConditionalOnEEVersion
-public class ProviderApiKeyResolver {
-
-    private final PropertyService propertyService;
-    private final ApplicationProperties applicationProperties;
-
-    @SuppressFBWarnings("EI")
-    public ProviderApiKeyResolver(PropertyService propertyService, ApplicationProperties applicationProperties) {
-        this.propertyService = propertyService;
-        this.applicationProperties = applicationProperties;
-    }
-
-    public @Nullable String resolve(Provider provider, int environment) {
-        Optional<Property> property = propertyService.fetchProperty(
-            provider.getKey(), Scope.PLATFORM, null, (long) environment);
-
-        return property
-            .filter(Property::isEnabled)
-            .map(enabledProperty -> enabledProperty.get("apiKey"))
-            .map(Object::toString)
-            .filter(apiKey -> !apiKey.isBlank())
-            .orElseGet(() -> configApiKey(provider));
-    }
-
-    private @Nullable String configApiKey(Provider provider) {
-        ApplicationProperties.Ai.Provider configProvider = applicationProperties.getAi()
-            .getProvider();
-
-        return switch (provider) {
-            case OPEN_AI -> configProvider.getOpenAi()
-                .getApiKey();
-            case ANTHROPIC -> configProvider.getAnthropic()
-                .getApiKey();
-            case MISTRAL -> configProvider.getMistral()
-                .getApiKey();
-            case VERTEX_GEMINI -> configProvider.getVertexGemini()
-                .getApiKey();
-            case GROQ -> configProvider.getGroq()
-                .getApiKey();
-            case PERPLEXITY -> configProvider.getPerplexity()
-                .getApiKey();
-            case NVIDIA -> configProvider.getNvidia()
-                .getApiKey();
-            case DEEPSEEK -> configProvider.getDeepSeek()
-                .getApiKey();
-            default -> null;
-        };
-    }
-}
diff --git a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/test/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogChatClientResolverTest.java b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/test/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogChatClientResolverTest.java
index 596de010002..d30684318b0 100644
--- a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/test/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogChatClientResolverTest.java
+++ b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/test/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogChatClientResolverTest.java
@@ -11,7 +11,8 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import com.bytechef.component.ai.llm.Provider;
+import com.bytechef.ee.platform.configuration.facade.AiProviderFacade;
+import com.bytechef.platform.ai.llm.Provider;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -21,10 +22,12 @@
  */
 class CatalogChatClientResolverTest {
 
+    private static final String OPEN_AI_KEY = Provider.OPEN_AI.getKey();
+
     private final CatalogChatModelFactory catalogChatModelFactory = mock(CatalogChatModelFactory.class);
-    private final ProviderApiKeyResolver providerApiKeyResolver = mock(ProviderApiKeyResolver.class);
+    private final AiProviderFacade aiProviderFacade = mock(AiProviderFacade.class);
     private final CatalogChatClientResolver resolver =
-        new CatalogChatClientResolverImpl(catalogChatModelFactory, providerApiKeyResolver);
+        new CatalogChatClientResolverImpl(catalogChatModelFactory, aiProviderFacade);
 
     @Test
     void testResolveReturnsNullForUnknownProviderKey() {
@@ -33,34 +36,34 @@ void testResolveReturnsNullForUnknownProviderKey() {
 
     @Test
     void testResolveReturnsNullForOutOfRangeEnvironment() {
-        // The range check short-circuits before any providerApiKeyResolver lookup, so no stubbing is needed (and a
-        // forged or out-of-range ordinal can never drive platform-API-key selection — fail closed).
-        assertThat(resolver.resolve("ai.provider.openAi", "gpt-4o", 99)).isNull();
-        assertThat(resolver.resolve("ai.provider.openAi", "gpt-4o", -1)).isNull();
+        // The range check short-circuits before any API-key lookup, so no stubbing is needed (and a forged or
+        // out-of-range ordinal can never drive platform-API-key selection — fail closed).
+        assertThat(resolver.resolve(OPEN_AI_KEY, "gpt-4o", 99)).isNull();
+        assertThat(resolver.resolve(OPEN_AI_KEY, "gpt-4o", -1)).isNull();
     }
 
     @Test
-    void testResolveReturnsNullWhenResolverReturnsNull() {
-        when(providerApiKeyResolver.resolve(Provider.OPEN_AI, 1)).thenReturn(null);
+    void testResolveReturnsNullWhenNoApiKey() {
+        when(aiProviderFacade.getApiKey(OPEN_AI_KEY, 1)).thenReturn(null);
 
-        assertThat(resolver.resolve("ai.provider.openAi", "gpt-4o", 1)).isNull();
+        assertThat(resolver.resolve(OPEN_AI_KEY, "gpt-4o", 1)).isNull();
     }
 
     @Test
-    void testResolveBuildsClientWhenResolverReturnsKey() {
-        when(providerApiKeyResolver.resolve(Provider.OPEN_AI, 1)).thenReturn("sk-test");
-        when(catalogChatModelFactory.createChatModel(Provider.OPEN_AI, "gpt-4o", "sk-test"))
+    void testResolveBuildsClientWhenApiKeyResolves() {
+        when(aiProviderFacade.getApiKey(OPEN_AI_KEY, 1)).thenReturn("sk-test");
+        when(catalogChatModelFactory.createChatModel(Provider.OPEN_AI, "gpt-4o", "sk-test", null))
             .thenReturn(mock(org.springframework.ai.chat.model.ChatModel.class));
 
-        assertThat(resolver.resolve("ai.provider.openAi", "gpt-4o", 1)).isNotNull();
+        assertThat(resolver.resolve(OPEN_AI_KEY, "gpt-4o", 1)).isNotNull();
     }
 
     @Test
-    void testResolveBuildsClientWhenResolverReturnsFallbackKey() {
-        when(providerApiKeyResolver.resolve(Provider.OPEN_AI, 1)).thenReturn("sk-config");
-        when(catalogChatModelFactory.createChatModel(Provider.OPEN_AI, "gpt-4o", "sk-config"))
+    void testResolveBuildsClientWhenApiKeyIsConfigFallback() {
+        when(aiProviderFacade.getApiKey(OPEN_AI_KEY, 1)).thenReturn("sk-config");
+        when(catalogChatModelFactory.createChatModel(Provider.OPEN_AI, "gpt-4o", "sk-config", null))
             .thenReturn(mock(org.springframework.ai.chat.model.ChatModel.class));
 
-        assertThat(resolver.resolve("ai.provider.openAi", "gpt-4o", 1)).isNotNull();
+        assertThat(resolver.resolve(OPEN_AI_KEY, "gpt-4o", 1)).isNotNull();
     }
 }
diff --git a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/test/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogChatModelFactoryTest.java b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/test/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogChatModelFactoryTest.java
index 6a38d03f6ca..e088a0ea282 100644
--- a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/test/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogChatModelFactoryTest.java
+++ b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/test/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogChatModelFactoryTest.java
@@ -9,7 +9,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.bytechef.component.ai.llm.Provider;
+import com.bytechef.platform.ai.llm.Provider;
 import com.bytechef.test.extension.ObjectMapperSetupExtension;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -27,7 +27,7 @@ class CatalogChatModelFactoryTest {
     @Test
     void testCreateChatModelForOpenAiReturnsModel() {
         org.springframework.ai.chat.model.ChatModel chatModel =
-            factory.createChatModel(Provider.OPEN_AI, "gpt-4o", "sk-test-key");
+            factory.createChatModel(Provider.OPEN_AI, "gpt-4o", "sk-test-key", null);
 
         assertThat(chatModel).isNotNull();
     }
@@ -36,8 +36,17 @@ void testCreateChatModelForOpenAiReturnsModel() {
     void testCreateChatModelForCatalogOnlyConnectionProviderReturnsNull() {
         // Azure needs a deployment endpoint the catalog doesn't store; v1 returns null -> caller falls back.
         org.springframework.ai.chat.model.ChatModel chatModel =
-            factory.createChatModel(Provider.AZURE_OPEN_AI, "gpt-4o", "sk-test-key");
+            factory.createChatModel(Provider.AZURE_OPEN_AI, "gpt-4o", "sk-test-key", null);
 
         assertThat(chatModel).isNull();
     }
+
+    @Test
+    void testCreateChatModelForOllamaWithCustomUrlReturnsModel() {
+        // Ollama needs no API key and accepts a custom base URL threaded through the connection parameters.
+        org.springframework.ai.chat.model.ChatModel chatModel =
+            factory.createChatModel(Provider.OLLAMA, "llama3", null, "http://remote-host:11434");
+
+        assertThat(chatModel).isNotNull();
+    }
 }
diff --git a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/test/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogChatModelTest.java b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/test/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogChatModelTest.java
new file mode 100644
index 00000000000..824f67c34a3
--- /dev/null
+++ b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/test/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogChatModelTest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the ByteChef Enterprise license (the "Enterprise License");
+ * you may not use this file except in compliance with the Enterprise License.
+ */
+
+package com.bytechef.ee.platform.ai.agent.catalog;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.bytechef.ee.platform.configuration.dto.AiDefaultModelWithApiKeyDTO;
+import com.bytechef.ee.platform.configuration.facade.AiProviderFacade;
+import com.bytechef.platform.ai.llm.Provider;
+import com.bytechef.platform.configuration.context.EnvironmentContext;
+import com.bytechef.platform.configuration.domain.Environment;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.ai.chat.model.ChatModel;
+import org.springframework.ai.chat.model.ChatResponse;
+import org.springframework.ai.chat.prompt.Prompt;
+
+/**
+ * @version ee
+ *
+ * @author Ivica Cardic
+ */
+class CatalogChatModelTest {
+
+    private static final String ANTHROPIC_MODEL = "claude-sonnet-4-5";
+    private static final AiDefaultModelWithApiKeyDTO ANTHROPIC_DEFAULT_MODEL =
+        new AiDefaultModelWithApiKeyDTO(Provider.ANTHROPIC, ANTHROPIC_MODEL, "sk-anthropic", null);
+
+    private final AiProviderFacade aiProviderFacade = mock(AiProviderFacade.class);
+    private final CatalogChatModelFactory catalogChatModelFactory = mock(CatalogChatModelFactory.class);
+
+    private final CatalogChatModel catalogChatModel = new CatalogChatModel(
+        aiProviderFacade, catalogChatModelFactory);
+
+    @AfterEach
+    void tearDown() {
+        EnvironmentContext.clear();
+    }
+
+    @Test
+    void testDelegatesCallToDefaultProviderWhenModelResolved() {
+        ChatModel delegate = mock(ChatModel.class);
+        Prompt prompt = new Prompt("hello");
+        ChatResponse response = mock(ChatResponse.class);
+
+        when(delegate.call(prompt)).thenReturn(response);
+        when(aiProviderFacade.getAiDefaultChatModelApiKey(Environment.PRODUCTION.ordinal()))
+            .thenReturn(ANTHROPIC_DEFAULT_MODEL);
+        when(catalogChatModelFactory.createChatModel(Provider.ANTHROPIC, ANTHROPIC_MODEL, "sk-anthropic", null))
+            .thenReturn(delegate);
+
+        assertThat(catalogChatModel.call(prompt)).isSameAs(response);
+    }
+
+    @Test
+    void testThrowsActionableErrorWhenNoProviderActivated() {
+        when(aiProviderFacade.getAiDefaultChatModelApiKey(Environment.PRODUCTION.ordinal()))
+            .thenReturn(null);
+
+        assertThatThrownBy(() -> catalogChatModel.call(new Prompt("hello")))
+            .isInstanceOf(IllegalStateException.class)
+            .hasMessageContaining("No chat provider is activated")
+            .hasMessageContaining("PRODUCTION")
+            .hasMessageContaining("bytechef.ai.provider.anthropic.api-key");
+    }
+
+    @Test
+    void testReadsEnvironmentFromContext() {
+        ChatModel delegate = mock(ChatModel.class);
+        Prompt prompt = new Prompt("hello");
+
+        EnvironmentContext.set(Environment.STAGING);
+
+        when(delegate.call(prompt)).thenReturn(mock(ChatResponse.class));
+        when(aiProviderFacade.getAiDefaultChatModelApiKey(Environment.STAGING.ordinal()))
+            .thenReturn(ANTHROPIC_DEFAULT_MODEL);
+        when(catalogChatModelFactory.createChatModel(Provider.ANTHROPIC, ANTHROPIC_MODEL, "sk-anthropic", null))
+            .thenReturn(delegate);
+
+        catalogChatModel.call(prompt);
+
+        verify(aiProviderFacade).getAiDefaultChatModelApiKey(Environment.STAGING.ordinal());
+    }
+
+    @Test
+    void testCachesDelegatePerEnvironmentAndKey() {
+        ChatModel delegate = mock(ChatModel.class);
+
+        when(delegate.call(org.mockito.ArgumentMatchers.any(Prompt.class)))
+            .thenReturn(mock(ChatResponse.class));
+        when(aiProviderFacade.getAiDefaultChatModelApiKey(Environment.PRODUCTION.ordinal()))
+            .thenReturn(ANTHROPIC_DEFAULT_MODEL);
+        when(catalogChatModelFactory.createChatModel(Provider.ANTHROPIC, ANTHROPIC_MODEL, "sk-anthropic", null))
+            .thenReturn(delegate);
+
+        catalogChatModel.call(new Prompt("a"));
+        catalogChatModel.call(new Prompt("b"));
+
+        verify(catalogChatModelFactory, times(1))
+            .createChatModel(Provider.ANTHROPIC, ANTHROPIC_MODEL, "sk-anthropic", null);
+    }
+}
diff --git a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/test/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogEmbeddingModelFactoryTest.java b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/test/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogEmbeddingModelFactoryTest.java
index 5bf6d296a88..4b1b3abdac5 100644
--- a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/test/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogEmbeddingModelFactoryTest.java
+++ b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/test/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogEmbeddingModelFactoryTest.java
@@ -9,7 +9,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.bytechef.component.ai.llm.Provider;
+import com.bytechef.platform.ai.llm.Provider;
 import com.bytechef.test.extension.ObjectMapperSetupExtension;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -28,21 +28,30 @@ class CatalogEmbeddingModelFactoryTest {
     @Test
     void testBuildsOpenAiEmbeddingModel() {
         EmbeddingModel embeddingModel = factory.createEmbeddingModel(
-            Provider.OPEN_AI, "text-embedding-3-small", "sk-test");
+            Provider.OPEN_AI, "text-embedding-3-small", "sk-test", null);
 
         assertThat(embeddingModel).isNotNull();
     }
 
     @Test
     void testReturnsNullForProviderWithoutEmbeddingSupport() {
-        assertThat(factory.createEmbeddingModel(Provider.ANTHROPIC, "irrelevant", "sk-test")).isNull();
+        assertThat(factory.createEmbeddingModel(Provider.ANTHROPIC, "irrelevant", "sk-test", null)).isNull();
+    }
+
+    @Test
+    void testBuildsOllamaEmbeddingModelWithCustomUrl() {
+        // Ollama needs no API key and accepts a custom base URL threaded through the connection parameters.
+        EmbeddingModel embeddingModel = factory.createEmbeddingModel(
+            Provider.OLLAMA, "nomic-embed-text", null, "http://remote-host:11434");
+
+        assertThat(embeddingModel).isNotNull();
     }
 
     @Test
     void testEmbeddingSupportMatchesProviderCapability() {
         for (Provider provider : Provider.values()) {
             EmbeddingModel embeddingModel = factory.createEmbeddingModel(
-                provider, "text-embedding-3-small", "sk-test");
+                provider, "text-embedding-3-small", "sk-test", null);
 
             assertThat(embeddingModel != null)
                 .as("Provider %s: factory builds an embedding model iff Provider.isEmbeddingSupported()", provider)
diff --git a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/test/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogEmbeddingModelTest.java b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/test/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogEmbeddingModelTest.java
index 84331126ea3..9a28cddfc08 100644
--- a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/test/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogEmbeddingModelTest.java
+++ b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/test/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogEmbeddingModelTest.java
@@ -9,14 +9,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import com.bytechef.component.ai.llm.Provider;
-import com.bytechef.config.ApplicationProperties;
+import com.bytechef.ee.platform.configuration.dto.AiDefaultModelWithApiKeyDTO;
+import com.bytechef.ee.platform.configuration.facade.AiProviderFacade;
+import com.bytechef.platform.ai.llm.Provider;
 import com.bytechef.platform.configuration.context.EnvironmentContext;
 import com.bytechef.platform.configuration.domain.Environment;
 import org.junit.jupiter.api.AfterEach;
@@ -31,13 +31,15 @@
  */
 class CatalogEmbeddingModelTest {
 
-    private final ProviderApiKeyResolver providerApiKeyResolver = mock(ProviderApiKeyResolver.class);
+    private static final AiDefaultModelWithApiKeyDTO OPEN_AI_DEFAULT_MODEL =
+        new AiDefaultModelWithApiKeyDTO(Provider.OPEN_AI, "text-embedding-3-small", "sk-test", null);
+
+    private final AiProviderFacade aiProviderFacade = mock(AiProviderFacade.class);
     private final CatalogEmbeddingModelFactory catalogEmbeddingModelFactory =
         mock(CatalogEmbeddingModelFactory.class);
-    private final ApplicationProperties applicationProperties = mock(ApplicationProperties.class, RETURNS_DEEP_STUBS);
 
     private final CatalogEmbeddingModel catalogEmbeddingModel = new CatalogEmbeddingModel(
-        providerApiKeyResolver, catalogEmbeddingModelFactory, applicationProperties);
+        aiProviderFacade, catalogEmbeddingModelFactory);
 
     @AfterEach
     void tearDown() {
@@ -45,18 +47,18 @@ void tearDown() {
     }
 
     @Test
-    void testDelegatesEmbedWhenKeyResolved() {
-        stubModelName();
+    void testDelegatesEmbedWhenModelResolved() {
         EmbeddingModel delegate = mock(EmbeddingModel.class);
         Document document = new Document("hello");
 
         when(delegate.embed(document)).thenReturn(new float[] {
             0.1f
         });
-        when(providerApiKeyResolver.resolve(Provider.OPEN_AI, Environment.PRODUCTION.ordinal()))
-            .thenReturn("sk-test");
-        when(catalogEmbeddingModelFactory.createEmbeddingModel(Provider.OPEN_AI, "text-embedding-3-small", "sk-test"))
-            .thenReturn(delegate);
+        when(aiProviderFacade.getAiDefaultEmbeddingModelApiKey(Environment.PRODUCTION.ordinal()))
+            .thenReturn(OPEN_AI_DEFAULT_MODEL);
+        when(catalogEmbeddingModelFactory.createEmbeddingModel(Provider.OPEN_AI, "text-embedding-3-small", "sk-test",
+            null))
+                .thenReturn(delegate);
 
         float[] result = catalogEmbeddingModel.embed(document);
 
@@ -64,10 +66,8 @@ void testDelegatesEmbedWhenKeyResolved() {
     }
 
     @Test
-    void testThrowsActionableErrorWhenNoKey() {
-        stubModelName();
-
-        when(providerApiKeyResolver.resolve(Provider.OPEN_AI, Environment.PRODUCTION.ordinal()))
+    void testThrowsActionableErrorWhenNoProviderActivated() {
+        when(aiProviderFacade.getAiDefaultEmbeddingModelApiKey(Environment.PRODUCTION.ordinal()))
             .thenReturn(null);
 
         assertThatThrownBy(() -> catalogEmbeddingModel.embed(new Document("hello")))
@@ -79,7 +79,6 @@ void testThrowsActionableErrorWhenNoKey() {
 
     @Test
     void testReadsEnvironmentFromContext() {
-        stubModelName();
         EmbeddingModel delegate = mock(EmbeddingModel.class);
         Document document = new Document("hello");
 
@@ -88,43 +87,34 @@ void testReadsEnvironmentFromContext() {
         when(delegate.embed(document)).thenReturn(new float[] {
             0.2f
         });
-        when(providerApiKeyResolver.resolve(Provider.OPEN_AI, Environment.STAGING.ordinal()))
-            .thenReturn("sk-staging");
+        when(aiProviderFacade.getAiDefaultEmbeddingModelApiKey(Environment.STAGING.ordinal()))
+            .thenReturn(OPEN_AI_DEFAULT_MODEL);
         when(catalogEmbeddingModelFactory.createEmbeddingModel(
-            Provider.OPEN_AI, "text-embedding-3-small", "sk-staging"))
+            Provider.OPEN_AI, "text-embedding-3-small", "sk-test", null))
                 .thenReturn(delegate);
 
         catalogEmbeddingModel.embed(document);
 
-        verify(providerApiKeyResolver).resolve(Provider.OPEN_AI, Environment.STAGING.ordinal());
+        verify(aiProviderFacade).getAiDefaultEmbeddingModelApiKey(Environment.STAGING.ordinal());
     }
 
     @Test
     void testCachesDelegatePerEnvironmentAndKey() {
-        stubModelName();
         EmbeddingModel delegate = mock(EmbeddingModel.class);
 
         when(delegate.embed(org.mockito.ArgumentMatchers.any(Document.class))).thenReturn(new float[] {
             0.3f
         });
-        when(providerApiKeyResolver.resolve(Provider.OPEN_AI, Environment.PRODUCTION.ordinal()))
-            .thenReturn("sk-test");
-        when(catalogEmbeddingModelFactory.createEmbeddingModel(Provider.OPEN_AI, "text-embedding-3-small", "sk-test"))
-            .thenReturn(delegate);
+        when(aiProviderFacade.getAiDefaultEmbeddingModelApiKey(Environment.PRODUCTION.ordinal()))
+            .thenReturn(OPEN_AI_DEFAULT_MODEL);
+        when(catalogEmbeddingModelFactory.createEmbeddingModel(Provider.OPEN_AI, "text-embedding-3-small", "sk-test",
+            null))
+                .thenReturn(delegate);
 
         catalogEmbeddingModel.embed(new Document("a"));
         catalogEmbeddingModel.embed(new Document("b"));
 
         verify(catalogEmbeddingModelFactory, times(1))
-            .createEmbeddingModel(Provider.OPEN_AI, "text-embedding-3-small", "sk-test");
-    }
-
-    private void stubModelName() {
-        when(applicationProperties.getAi()
-            .getProvider()
-            .getEmbedding()
-            .getOpenAi()
-            .getOptions()
-            .getModel()).thenReturn("text-embedding-3-small");
+            .createEmbeddingModel(Provider.OPEN_AI, "text-embedding-3-small", "sk-test", null);
     }
 }
diff --git a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/test/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogEmbeddingProviderStatusProviderTest.java b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/test/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogEmbeddingProviderStatusProviderTest.java
index 7401a151d75..b1d5791c585 100644
--- a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/test/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogEmbeddingProviderStatusProviderTest.java
+++ b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/test/java/com/bytechef/ee/platform/ai/agent/catalog/CatalogEmbeddingProviderStatusProviderTest.java
@@ -11,7 +11,9 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import com.bytechef.component.ai.llm.Provider;
+import com.bytechef.ee.platform.configuration.dto.AiDefaultModelWithApiKeyDTO;
+import com.bytechef.ee.platform.configuration.facade.AiProviderFacade;
+import com.bytechef.platform.ai.llm.Provider;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -21,27 +23,23 @@
  */
 class CatalogEmbeddingProviderStatusProviderTest {
 
-    private final ProviderApiKeyResolver providerApiKeyResolver = mock(ProviderApiKeyResolver.class);
+    private static final AiDefaultModelWithApiKeyDTO OPEN_AI_DEFAULT_MODEL =
+        new AiDefaultModelWithApiKeyDTO(Provider.OPEN_AI, "text-embedding-3-small", "sk-test", null);
+
+    private final AiProviderFacade aiProviderFacade = mock(AiProviderFacade.class);
     private final CatalogEmbeddingProviderStatusProvider statusProvider =
-        new CatalogEmbeddingProviderStatusProvider(providerApiKeyResolver);
+        new CatalogEmbeddingProviderStatusProvider(aiProviderFacade);
 
     @Test
-    void testActiveWhenKeyResolves() {
-        when(providerApiKeyResolver.resolve(Provider.OPEN_AI, 2)).thenReturn("sk-test");
+    void testActiveWhenDefaultModelResolves() {
+        when(aiProviderFacade.getAiDefaultEmbeddingModelApiKey(2)).thenReturn(OPEN_AI_DEFAULT_MODEL);
 
         assertThat(statusProvider.isEmbeddingActive(2)).isTrue();
     }
 
     @Test
-    void testInactiveWhenNoKey() {
-        when(providerApiKeyResolver.resolve(Provider.OPEN_AI, 2)).thenReturn(null);
-
-        assertThat(statusProvider.isEmbeddingActive(2)).isFalse();
-    }
-
-    @Test
-    void testInactiveWhenBlankKey() {
-        when(providerApiKeyResolver.resolve(Provider.OPEN_AI, 2)).thenReturn("   ");
+    void testInactiveWhenNoDefaultModel() {
+        when(aiProviderFacade.getAiDefaultEmbeddingModelApiKey(2)).thenReturn(null);
 
         assertThat(statusProvider.isEmbeddingActive(2)).isFalse();
     }
diff --git a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/test/java/com/bytechef/ee/platform/ai/agent/catalog/ProviderApiKeyResolverTest.java b/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/test/java/com/bytechef/ee/platform/ai/agent/catalog/ProviderApiKeyResolverTest.java
deleted file mode 100644
index e85c841ccec..00000000000
--- a/server/ee/libs/platform/platform-ai/platform-ai-agent/platform-ai-agent-service/src/test/java/com/bytechef/ee/platform/ai/agent/catalog/ProviderApiKeyResolverTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.platform.ai.agent.catalog;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.ai.llm.Provider;
-import com.bytechef.config.ApplicationProperties;
-import com.bytechef.platform.configuration.domain.Property;
-import com.bytechef.platform.configuration.domain.Property.Scope;
-import com.bytechef.platform.configuration.service.PropertyService;
-import java.util.Optional;
-import org.junit.jupiter.api.Test;
-
-/**
- * @version ee
- *
- * @author Ivica Cardic
- */
-class ProviderApiKeyResolverTest {
-
-    private final PropertyService propertyService = mock(PropertyService.class);
-    private final ApplicationProperties applicationProperties = mock(ApplicationProperties.class, RETURNS_DEEP_STUBS);
-    private final ProviderApiKeyResolver resolver =
-        new ProviderApiKeyResolver(propertyService, applicationProperties);
-
-    @Test
-    void testReturnsEnabledPropertyApiKey() {
-        Property property = mock(Property.class);
-
-        when(property.isEnabled()).thenReturn(true);
-        when(property.get("apiKey")).thenReturn("sk-from-ui");
-        when(propertyService.fetchProperty(Provider.OPEN_AI.getKey(), Scope.PLATFORM, null, 2L))
-            .thenReturn(Optional.of(property));
-
-        assertThat(resolver.resolve(Provider.OPEN_AI, 2)).isEqualTo("sk-from-ui");
-    }
-
-    @Test
-    void testFallsBackToConfigWhenNoEnabledProperty() {
-        when(propertyService.fetchProperty(Provider.OPEN_AI.getKey(), Scope.PLATFORM, null, 2L))
-            .thenReturn(Optional.empty());
-        when(applicationProperties.getAi()
-            .getProvider()
-            .getOpenAi()
-            .getApiKey()).thenReturn("sk-from-config");
-
-        assertThat(resolver.resolve(Provider.OPEN_AI, 2)).isEqualTo("sk-from-config");
-    }
-
-    @Test
-    void testFallsBackToConfigWhenPropertyDisabled() {
-        Property property = mock(Property.class);
-
-        when(property.isEnabled()).thenReturn(false);
-        when(propertyService.fetchProperty(Provider.OPEN_AI.getKey(), Scope.PLATFORM, null, 2L))
-            .thenReturn(Optional.of(property));
-        when(applicationProperties.getAi()
-            .getProvider()
-            .getOpenAi()
-            .getApiKey()).thenReturn("sk-from-config");
-
-        assertThat(resolver.resolve(Provider.OPEN_AI, 2)).isEqualTo("sk-from-config");
-    }
-
-    @Test
-    void testReturnsNullWhenNeitherPresent() {
-        when(propertyService.fetchProperty(Provider.OPEN_AI.getKey(), Scope.PLATFORM, null, 2L))
-            .thenReturn(Optional.empty());
-        when(applicationProperties.getAi()
-            .getProvider()
-            .getOpenAi()
-            .getApiKey()).thenReturn(null);
-
-        assertThat(resolver.resolve(Provider.OPEN_AI, 2)).isNull();
-    }
-}
diff --git a/server/ee/libs/platform/platform-configuration/platform-configuration-api/build.gradle.kts b/server/ee/libs/platform/platform-configuration/platform-configuration-api/build.gradle.kts
new file mode 100644
index 00000000000..e8905f9c667
--- /dev/null
+++ b/server/ee/libs/platform/platform-configuration/platform-configuration-api/build.gradle.kts
@@ -0,0 +1,3 @@
+dependencies {
+    api(project(":server:libs:platform:platform-ai:platform-ai-api"))
+}
diff --git a/server/ee/libs/platform/platform-configuration/platform-configuration-api/src/main/java/com/bytechef/ee/platform/configuration/dto/AiDefaultModelWithApiKeyDTO.java b/server/ee/libs/platform/platform-configuration/platform-configuration-api/src/main/java/com/bytechef/ee/platform/configuration/dto/AiDefaultModelWithApiKeyDTO.java
new file mode 100644
index 00000000000..077bc70d602
--- /dev/null
+++ b/server/ee/libs/platform/platform-configuration/platform-configuration-api/src/main/java/com/bytechef/ee/platform/configuration/dto/AiDefaultModelWithApiKeyDTO.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the ByteChef Enterprise license (the "Enterprise License");
+ * you may not use this file except in compliance with the Enterprise License.
+ */
+
+package com.bytechef.ee.platform.configuration.dto;
+
+import com.bytechef.platform.ai.llm.Provider;
+
+/**
+ * @version ee
+ *
+ * @author Ivica Cardic
+ */
+public record AiDefaultModelWithApiKeyDTO(Provider provider, String model, String apiKey, String url) {
+}
diff --git a/server/ee/libs/platform/platform-configuration/platform-configuration-api/src/main/java/com/bytechef/ee/platform/configuration/dto/AiProviderDTO.java b/server/ee/libs/platform/platform-configuration/platform-configuration-api/src/main/java/com/bytechef/ee/platform/configuration/dto/AiProviderDTO.java
index 36dbfc7fd58..aeb3b58ff58 100644
--- a/server/ee/libs/platform/platform-configuration/platform-configuration-api/src/main/java/com/bytechef/ee/platform/configuration/dto/AiProviderDTO.java
+++ b/server/ee/libs/platform/platform-configuration/platform-configuration-api/src/main/java/com/bytechef/ee/platform/configuration/dto/AiProviderDTO.java
@@ -15,6 +15,6 @@
  * @author Ivica Cardic
  */
 @SuppressFBWarnings("EI")
-public record AiProviderDTO(int id, String name, String icon, String apiKey, boolean enabled,
+public record AiProviderDTO(int id, String name, String icon, String apiKey, String url, boolean enabled,
     boolean supportsEmbeddings) {
 }
diff --git a/server/ee/libs/platform/platform-configuration/platform-configuration-api/src/main/java/com/bytechef/ee/platform/configuration/facade/AiProviderFacade.java b/server/ee/libs/platform/platform-configuration/platform-configuration-api/src/main/java/com/bytechef/ee/platform/configuration/facade/AiProviderFacade.java
index 3aacb600247..82cd1b9d2f5 100644
--- a/server/ee/libs/platform/platform-configuration/platform-configuration-api/src/main/java/com/bytechef/ee/platform/configuration/facade/AiProviderFacade.java
+++ b/server/ee/libs/platform/platform-configuration/platform-configuration-api/src/main/java/com/bytechef/ee/platform/configuration/facade/AiProviderFacade.java
@@ -8,6 +8,7 @@
 package com.bytechef.ee.platform.configuration.facade;
 
 import com.bytechef.ee.platform.configuration.dto.AiDefaultModelDTO;
+import com.bytechef.ee.platform.configuration.dto.AiDefaultModelWithApiKeyDTO;
 import com.bytechef.ee.platform.configuration.dto.AiProviderCatalogItemDTO;
 import com.bytechef.ee.platform.configuration.dto.AiProviderDTO;
 import java.util.List;
@@ -23,11 +24,21 @@ public interface AiProviderFacade {
 
     AiDefaultModelDTO getAiDefaultChatModel(int environmentId);
 
+    AiDefaultModelWithApiKeyDTO getAiDefaultChatModelApiKey(int environmentId);
+
+    AiDefaultModelDTO getAiDefaultEmbeddingModel(int environmentId);
+
+    AiDefaultModelWithApiKeyDTO getAiDefaultEmbeddingModelApiKey(int environmentId);
+
     List<AiProviderCatalogItemDTO> getAiChatProviderCatalog(int environment);
 
     List<AiProviderDTO> getAiProviders(int environment);
 
+    String getApiKey(String provider, int environment);
+
+    String getUrl(String provider, int environment);
+
     void updateAiProvider(int id, boolean enabled, int environment);
 
-    void updateAiProvider(int id, String apiKey, int environment);
+    void updateAiProvider(int id, String apiKey, String url, int environment);
 }
diff --git a/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/AiProviderApi.java b/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/AiProviderApi.java
index bfef6815cc2..da85bb2ebd9 100644
--- a/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/AiProviderApi.java
+++ b/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/AiProviderApi.java
@@ -137,7 +137,7 @@ default ResponseEntity<List<AiProviderModel>> getAiProviders(
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
                 if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
-                    String exampleString = "[ { \"apiKey\" : \"apiKey\", \"supportsEmbeddings\" : true, \"name\" : \"name\", \"icon\" : \"icon\", \"id\" : 0, \"enabled\" : true }, { \"apiKey\" : \"apiKey\", \"supportsEmbeddings\" : true, \"name\" : \"name\", \"icon\" : \"icon\", \"id\" : 0, \"enabled\" : true } ]";
+                    String exampleString = "[ { \"apiKey\" : \"apiKey\", \"supportsEmbeddings\" : true, \"name\" : \"name\", \"icon\" : \"icon\", \"id\" : 0, \"url\" : \"url\", \"enabled\" : true }, { \"apiKey\" : \"apiKey\", \"supportsEmbeddings\" : true, \"name\" : \"name\", \"icon\" : \"icon\", \"id\" : 0, \"url\" : \"url\", \"enabled\" : true } ]";
                     ApiUtil.setExampleResponse(request, "application/json", exampleString);
                     break;
                 }
diff --git a/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/model/AiProviderModel.java b/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/model/AiProviderModel.java
index c928d2a1c0e..bc5a9bad20e 100644
--- a/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/model/AiProviderModel.java
+++ b/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/model/AiProviderModel.java
@@ -33,6 +33,8 @@ public class AiProviderModel {
 
   private @Nullable String apiKey;
 
+  private @Nullable String url;
+
   private @Nullable Boolean enabled;
 
   private @Nullable Boolean supportsEmbeddings;
@@ -132,6 +134,27 @@ public void setApiKey(@Nullable String apiKey) {
     this.apiKey = apiKey;
   }
 
+  public AiProviderModel url(@Nullable String url) {
+    this.url = url;
+    return this;
+  }
+
+  /**
+   * The base URL of an AI provider (used by Ollama; blank defaults to localhost).
+   * @return url
+   */
+  
+  @Schema(name = "url", description = "The base URL of an AI provider (used by Ollama; blank defaults to localhost).", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("url")
+  public @Nullable String getUrl() {
+    return url;
+  }
+
+  @JsonProperty("url")
+  public void setUrl(@Nullable String url) {
+    this.url = url;
+  }
+
   public AiProviderModel enabled(@Nullable Boolean enabled) {
     this.enabled = enabled;
     return this;
@@ -187,13 +210,14 @@ public boolean equals(Object o) {
         Objects.equals(this.name, aiProvider.name) &&
         Objects.equals(this.icon, aiProvider.icon) &&
         Objects.equals(this.apiKey, aiProvider.apiKey) &&
+        Objects.equals(this.url, aiProvider.url) &&
         Objects.equals(this.enabled, aiProvider.enabled) &&
         Objects.equals(this.supportsEmbeddings, aiProvider.supportsEmbeddings);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, name, icon, apiKey, enabled, supportsEmbeddings);
+    return Objects.hash(id, name, icon, apiKey, url, enabled, supportsEmbeddings);
   }
 
   @Override
@@ -204,6 +228,7 @@ public String toString() {
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
     sb.append("    icon: ").append(toIndentedString(icon)).append("\n");
     sb.append("    apiKey: ").append(toIndentedString(apiKey)).append("\n");
+    sb.append("    url: ").append(toIndentedString(url)).append("\n");
     sb.append("    enabled: ").append(toIndentedString(enabled)).append("\n");
     sb.append("    supportsEmbeddings: ").append(toIndentedString(supportsEmbeddings)).append("\n");
     sb.append("}");
diff --git a/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/model/UpdateAiProviderRequestModel.java b/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/model/UpdateAiProviderRequestModel.java
index f107f3bcd4b..bdb66ee59bc 100644
--- a/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/model/UpdateAiProviderRequestModel.java
+++ b/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/model/UpdateAiProviderRequestModel.java
@@ -26,6 +26,8 @@ public class UpdateAiProviderRequestModel {
 
   private @Nullable String apiKey;
 
+  private @Nullable String url;
+
   public UpdateAiProviderRequestModel apiKey(@Nullable String apiKey) {
     this.apiKey = apiKey;
     return this;
@@ -47,6 +49,27 @@ public void setApiKey(@Nullable String apiKey) {
     this.apiKey = apiKey;
   }
 
+  public UpdateAiProviderRequestModel url(@Nullable String url) {
+    this.url = url;
+    return this;
+  }
+
+  /**
+   * The base URL of an AI provider (used by Ollama; blank defaults to localhost).
+   * @return url
+   */
+  
+  @Schema(name = "url", description = "The base URL of an AI provider (used by Ollama; blank defaults to localhost).", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("url")
+  public @Nullable String getUrl() {
+    return url;
+  }
+
+  @JsonProperty("url")
+  public void setUrl(@Nullable String url) {
+    this.url = url;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -56,12 +79,13 @@ public boolean equals(Object o) {
       return false;
     }
     UpdateAiProviderRequestModel updateAiProviderRequest = (UpdateAiProviderRequestModel) o;
-    return Objects.equals(this.apiKey, updateAiProviderRequest.apiKey);
+    return Objects.equals(this.apiKey, updateAiProviderRequest.apiKey) &&
+        Objects.equals(this.url, updateAiProviderRequest.url);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(apiKey);
+    return Objects.hash(apiKey, url);
   }
 
   @Override
@@ -69,6 +93,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class UpdateAiProviderRequestModel {\n");
     sb.append("    apiKey: ").append(toIndentedString(apiKey)).append("\n");
+    sb.append("    url: ").append(toIndentedString(url)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/server/ee/libs/platform/platform-configuration/platform-configuration-rest/openapi.yaml b/server/ee/libs/platform/platform-configuration/platform-configuration-rest/openapi.yaml
index f7057b9d10d..cec8f500180 100644
--- a/server/ee/libs/platform/platform-configuration/platform-configuration-rest/openapi.yaml
+++ b/server/ee/libs/platform/platform-configuration/platform-configuration-rest/openapi.yaml
@@ -85,6 +85,9 @@ paths:
                 apiKey:
                   type: string
                   description: "The API key of an AI provider."
+                url:
+                  type: string
+                  description: "The base URL of an AI provider (used by Ollama; blank defaults to localhost)."
         required: true
       responses:
         "204":
@@ -187,6 +190,9 @@ components:
         apiKey:
           description: "The API key of an AI provider."
           type: "string"
+        url:
+          description: "The base URL of an AI provider (used by Ollama; blank defaults to localhost)."
+          type: "string"
         enabled:
           description: "The enabled status of an AI provider."
           type: "boolean"
diff --git a/server/ee/libs/platform/platform-configuration/platform-configuration-rest/src/main/java/com/bytechef/ee/platform/configuration/web/rest/AiProviderApiController.java b/server/ee/libs/platform/platform-configuration/platform-configuration-rest/src/main/java/com/bytechef/ee/platform/configuration/web/rest/AiProviderApiController.java
index 52879df5e02..d4c47bcf617 100644
--- a/server/ee/libs/platform/platform-configuration/platform-configuration-rest/src/main/java/com/bytechef/ee/platform/configuration/web/rest/AiProviderApiController.java
+++ b/server/ee/libs/platform/platform-configuration/platform-configuration-rest/src/main/java/com/bytechef/ee/platform/configuration/web/rest/AiProviderApiController.java
@@ -80,7 +80,8 @@ public ResponseEntity<Void> enableAiProvider(Integer id, Boolean enable, Integer
     public ResponseEntity<Void> updateAiProvider(
         Integer id, Integer environment, UpdateAiProviderRequestModel updateAiProviderRequestModel) {
 
-        aiProviderFacade.updateAiProvider(id, updateAiProviderRequestModel.getApiKey(), environment);
+        aiProviderFacade.updateAiProvider(
+            id, updateAiProviderRequestModel.getApiKey(), updateAiProviderRequestModel.getUrl(), environment);
 
         return ResponseEntity.noContent()
             .build();
diff --git a/server/ee/libs/platform/platform-configuration/platform-configuration-service/src/main/java/com/bytechef/ee/platform/configuration/facade/AiProviderFacadeImpl.java b/server/ee/libs/platform/platform-configuration/platform-configuration-service/src/main/java/com/bytechef/ee/platform/configuration/facade/AiProviderFacadeImpl.java
index 597ec5f58f6..b73a6e0e627 100644
--- a/server/ee/libs/platform/platform-configuration/platform-configuration-service/src/main/java/com/bytechef/ee/platform/configuration/facade/AiProviderFacadeImpl.java
+++ b/server/ee/libs/platform/platform-configuration/platform-configuration-service/src/main/java/com/bytechef/ee/platform/configuration/facade/AiProviderFacadeImpl.java
@@ -7,11 +7,12 @@
 
 package com.bytechef.ee.platform.configuration.facade;
 
-import com.bytechef.component.ai.llm.Provider;
 import com.bytechef.config.ApplicationProperties;
 import com.bytechef.ee.platform.configuration.dto.AiDefaultModelDTO;
+import com.bytechef.ee.platform.configuration.dto.AiDefaultModelWithApiKeyDTO;
 import com.bytechef.ee.platform.configuration.dto.AiProviderCatalogItemDTO;
 import com.bytechef.ee.platform.configuration.dto.AiProviderDTO;
+import com.bytechef.platform.ai.llm.Provider;
 import com.bytechef.platform.annotation.ConditionalOnEEVersion;
 import com.bytechef.platform.component.domain.ActionDefinition;
 import com.bytechef.platform.component.domain.ComponentDefinition;
@@ -23,10 +24,10 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -116,7 +117,36 @@ public AiDefaultModelDTO getAiDefaultChatModel(int environmentId) {
             .map(aiProviderDTO -> getProvider(aiProviderDTO.id()))
             .filter(Provider.CHAT_PROVIDERS::contains)
             .map(provider -> {
-                String model = resolveDefaultModel(provider);
+                String model = resolveDefaultChatModel(provider);
+
+                if (model == null || model.isBlank()) {
+                    return null;
+                }
+
+                return new AiDefaultModelDTO(provider.getKey(), model);
+            })
+            .filter(Objects::nonNull)
+            .findFirst()
+            .orElse(null);
+    }
+
+    @Override
+    @Transactional(readOnly = true)
+    public AiDefaultModelWithApiKeyDTO getAiDefaultChatModelApiKey(int environmentId) {
+        return resolveWithApiKey(getAiDefaultChatModel(environmentId), environmentId);
+    }
+
+    @Override
+    @Transactional(readOnly = true)
+    public AiDefaultModelDTO getAiDefaultEmbeddingModel(int environmentId) {
+        return getAiProviders(environmentId)
+            .stream()
+            .filter(AiProviderDTO::enabled)
+            .filter(AiProviderDTO::supportsEmbeddings)
+            .map(aiProviderDTO -> {
+                Provider provider = getProvider(aiProviderDTO.id());
+
+                String model = resolveDefaultEmbeddingModel(provider);
 
                 if (model == null || model.isBlank()) {
                     return null;
@@ -129,6 +159,24 @@ public AiDefaultModelDTO getAiDefaultChatModel(int environmentId) {
             .orElse(null);
     }
 
+    @Override
+    @Transactional(readOnly = true)
+    public AiDefaultModelWithApiKeyDTO getAiDefaultEmbeddingModelApiKey(int environmentId) {
+        return resolveWithApiKey(getAiDefaultEmbeddingModel(environmentId), environmentId);
+    }
+
+    @Override
+    @Transactional(readOnly = true)
+    public String getApiKey(String provider, int environment) {
+        return resolveApiKey(Provider.valueOfKey(provider), environment);
+    }
+
+    @Override
+    @Transactional(readOnly = true)
+    public String getUrl(String provider, int environment) {
+        return resolveUrl(Provider.valueOfKey(provider), environment);
+    }
+
     @Override
     @Transactional(readOnly = true)
     public List<AiProviderDTO> getAiProviders(int environment) {
@@ -169,10 +217,16 @@ public List<AiProviderDTO> getAiProviders(int environment) {
                     apiKey = getConfigApiKey(provider);
                 }
 
+                String url = property != null ? (String) property.get("url") : null;
+
+                if (url == null || url.isBlank()) {
+                    url = getConfigUrl(provider);
+                }
+
                 boolean enabled = property != null ? property.isEnabled() : hasConfigApiKey(provider);
 
                 return new AiProviderDTO(
-                    provider.getId(), provider.getLabel(), componentDefinition.getIcon(), apiKey, enabled,
+                    provider.getId(), provider.getLabel(), componentDefinition.getIcon(), apiKey, url, enabled,
                     provider.isEmbeddingSupported());
             })
             .filter(Objects::nonNull)
@@ -187,10 +241,20 @@ public void updateAiProvider(int id, boolean enabled, int environment) {
     }
 
     @Override
-    public void updateAiProvider(int id, String apiKey, int environment) {
+    public void updateAiProvider(int id, String apiKey, String url, int environment) {
         Provider provider = getProvider(id);
 
-        propertyService.save(provider.getKey(), Map.of("apiKey", apiKey), Scope.PLATFORM, null, (long) environment);
+        Map<String, Object> values = new HashMap<>();
+
+        if (apiKey != null) {
+            values.put("apiKey", apiKey);
+        }
+
+        if (url != null && !url.isBlank()) {
+            values.put("url", url);
+        }
+
+        propertyService.save(provider.getKey(), values, Scope.PLATFORM, null, (long) environment);
     }
 
     private static List<AiProviderCatalogItemDTO.Model> extractModelOptions(ActionDefinition actionDefinition) {
@@ -223,7 +287,7 @@ private static List<AiProviderCatalogItemDTO.Model> readChatModels(ComponentDefi
             .orElse(List.of());
     }
 
-    private String resolveDefaultModel(Provider provider) {
+    private String resolveDefaultChatModel(Provider provider) {
         ApplicationProperties.Ai.Provider.Chat chat = applicationProperties.getAi()
             .getProvider()
             .getChat();
@@ -239,6 +303,58 @@ private String resolveDefaultModel(Provider provider) {
         };
     }
 
+    private String resolveDefaultEmbeddingModel(Provider provider) {
+        ApplicationProperties.Ai.Provider.Embedding embedding = applicationProperties.getAi()
+            .getProvider()
+            .getEmbedding();
+
+        return switch (provider) {
+            case OLLAMA -> embedding.getOllama()
+                .getOptions()
+                .getModel();
+            case OPEN_AI -> embedding.getOpenAi()
+                .getOptions()
+                .getModel();
+            default -> null;
+        };
+    }
+
+    private String resolveApiKey(Provider provider, int environment) {
+        return propertyService.fetchProperty(provider.getKey(), Scope.PLATFORM, null, (long) environment)
+            .filter(Property::isEnabled)
+            .map(property -> property.get("apiKey"))
+            .map(Object::toString)
+            .filter(apiKey -> !apiKey.isBlank())
+            .orElseGet(() -> getConfigApiKey(provider));
+    }
+
+    private String resolveUrl(Provider provider, int environment) {
+        return propertyService.fetchProperty(provider.getKey(), Scope.PLATFORM, null, (long) environment)
+            .filter(Property::isEnabled)
+            .map(property -> property.get("url"))
+            .map(Object::toString)
+            .filter(url -> !url.isBlank())
+            .orElseGet(() -> getConfigUrl(provider));
+    }
+
+    private AiDefaultModelWithApiKeyDTO resolveWithApiKey(AiDefaultModelDTO defaultModel, int environment) {
+        if (defaultModel == null) {
+            return null;
+        }
+
+        Provider provider = Provider.valueOfKey(defaultModel.provider());
+
+        String apiKey = resolveApiKey(provider, environment);
+
+        if ((apiKey == null || apiKey.isBlank()) && provider.requiresApiKey()) {
+            return null;
+        }
+
+        String url = resolveUrl(provider, environment);
+
+        return new AiDefaultModelWithApiKeyDTO(provider, defaultModel.model(), apiKey, url);
+    }
+
     private String getConfigApiKey(Provider provider) {
         ApplicationProperties.Ai.Provider configProvider = applicationProperties.getAi()
             .getProvider();
@@ -266,6 +382,17 @@ private String getConfigApiKey(Provider provider) {
         };
     }
 
+    private String getConfigUrl(Provider provider) {
+        ApplicationProperties.Ai.Provider configProvider = applicationProperties.getAi()
+            .getProvider();
+
+        return switch (provider) {
+            case OLLAMA -> configProvider.getOllama()
+                .getUrl();
+            default -> null;
+        };
+    }
+
     private boolean hasConfigApiKey(Provider provider) {
         String apiKey = getConfigApiKey(provider);
 
diff --git a/server/ee/libs/platform/platform-configuration/platform-configuration-service/src/test/java/com/bytechef/ee/platform/configuration/facade/AiProviderFacadeDefaultModelTest.java b/server/ee/libs/platform/platform-configuration/platform-configuration-service/src/test/java/com/bytechef/ee/platform/configuration/facade/AiProviderFacadeDefaultModelTest.java
index 49784f8e266..0ca26a1e0c9 100644
--- a/server/ee/libs/platform/platform-configuration/platform-configuration-service/src/test/java/com/bytechef/ee/platform/configuration/facade/AiProviderFacadeDefaultModelTest.java
+++ b/server/ee/libs/platform/platform-configuration/platform-configuration-service/src/test/java/com/bytechef/ee/platform/configuration/facade/AiProviderFacadeDefaultModelTest.java
@@ -15,11 +15,15 @@
 
 import com.bytechef.config.ApplicationProperties;
 import com.bytechef.ee.platform.configuration.dto.AiDefaultModelDTO;
+import com.bytechef.ee.platform.configuration.dto.AiDefaultModelWithApiKeyDTO;
+import com.bytechef.platform.ai.llm.Provider;
 import com.bytechef.platform.component.domain.ComponentDefinition;
 import com.bytechef.platform.component.service.ComponentDefinitionService;
+import com.bytechef.platform.configuration.domain.Property;
 import com.bytechef.platform.configuration.domain.Property.Scope;
 import com.bytechef.platform.configuration.service.PropertyService;
 import java.util.List;
+import java.util.Optional;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -128,6 +132,122 @@ void testReturnsNullWhenResolvedProviderHasNoConfiguredModel() {
         assertThat(result).isNull();
     }
 
+    @Test
+    void testReturnsOpenAiEmbeddingModelWhenEnabled() {
+        stubProviderComponentsWithNoStoredProperties();
+
+        when(applicationProperties.getAi()
+            .getProvider()
+            .getOpenAi()
+            .getApiKey()).thenReturn("sk-openai");
+        when(applicationProperties.getAi()
+            .getProvider()
+            .getEmbedding()
+            .getOpenAi()
+            .getOptions()
+            .getModel()).thenReturn("text-embedding-3-small");
+
+        AiDefaultModelDTO result = facade.getAiDefaultEmbeddingModel(ENVIRONMENT);
+
+        assertThat(result).isNotNull();
+        assertThat(result.provider()).isEqualTo("ai.provider.openAi");
+        assertThat(result.model()).isEqualTo("text-embedding-3-small");
+    }
+
+    @Test
+    void testReturnsNullEmbeddingModelWhenNoProviderEnabled() {
+        stubProviderComponentsWithNoStoredProperties();
+
+        AiDefaultModelDTO result = facade.getAiDefaultEmbeddingModel(ENVIRONMENT);
+
+        assertThat(result).isNull();
+    }
+
+    @Test
+    void testGetApiKeyReturnsStoredKeyWhenEnabled() {
+        Property property = mock(Property.class);
+
+        when(property.isEnabled()).thenReturn(true);
+        when(property.get("apiKey")).thenReturn("sk-stored");
+        when(propertyService.fetchProperty("ai.provider.openAi", Scope.PLATFORM, null, (long) ENVIRONMENT))
+            .thenReturn(Optional.of(property));
+
+        String apiKey = facade.getApiKey("ai.provider.openAi", ENVIRONMENT);
+
+        assertThat(apiKey).isEqualTo("sk-stored");
+    }
+
+    @Test
+    void testGetApiKeyFallsBackToConfigKeyWhenNoStoredProperty() {
+        when(propertyService.fetchProperty("ai.provider.openAi", Scope.PLATFORM, null, (long) ENVIRONMENT))
+            .thenReturn(Optional.empty());
+        when(applicationProperties.getAi()
+            .getProvider()
+            .getOpenAi()
+            .getApiKey()).thenReturn("sk-openai");
+
+        String apiKey = facade.getApiKey("ai.provider.openAi", ENVIRONMENT);
+
+        assertThat(apiKey).isEqualTo("sk-openai");
+    }
+
+    @Test
+    void testReturnsChatModelApiKeyWhenActivated() {
+        stubProviderComponentsWithNoStoredProperties();
+
+        when(applicationProperties.getAi()
+            .getProvider()
+            .getAnthropic()
+            .getApiKey()).thenReturn("sk-anthropic");
+        when(applicationProperties.getAi()
+            .getProvider()
+            .getChat()
+            .getAnthropic()
+            .getOptions()
+            .getModel()).thenReturn("claude-sonnet-4-6");
+        when(propertyService.fetchProperty("ai.provider.anthropic", Scope.PLATFORM, null, (long) ENVIRONMENT))
+            .thenReturn(Optional.empty());
+
+        AiDefaultModelWithApiKeyDTO result = facade.getAiDefaultChatModelApiKey(ENVIRONMENT);
+
+        assertThat(result).isNotNull();
+        assertThat(result.provider()).isEqualTo(Provider.ANTHROPIC);
+        assertThat(result.model()).isEqualTo("claude-sonnet-4-6");
+        assertThat(result.apiKey()).isEqualTo("sk-anthropic");
+    }
+
+    @Test
+    void testReturnsNullChatModelApiKeyWhenNoProviderActivated() {
+        stubProviderComponentsWithNoStoredProperties();
+
+        assertThat(facade.getAiDefaultChatModelApiKey(ENVIRONMENT)).isNull();
+    }
+
+    @Test
+    void testReturnsEmbeddingModelApiKeyWhenActivated() {
+        stubProviderComponentsWithNoStoredProperties();
+
+        when(applicationProperties.getAi()
+            .getProvider()
+            .getOpenAi()
+            .getApiKey()).thenReturn("sk-openai");
+        when(applicationProperties.getAi()
+            .getProvider()
+            .getEmbedding()
+            .getOpenAi()
+            .getOptions()
+            .getModel()).thenReturn("text-embedding-3-small");
+        when(propertyService.fetchProperty("ai.provider.openAi", Scope.PLATFORM, null, (long) ENVIRONMENT))
+            .thenReturn(Optional.empty());
+
+        AiDefaultModelWithApiKeyDTO result = facade.getAiDefaultEmbeddingModelApiKey(ENVIRONMENT);
+
+        assertThat(result).isNotNull();
+        assertThat(result.provider()).isEqualTo(Provider.OPEN_AI);
+        assertThat(result.model()).isEqualTo("text-embedding-3-small");
+        assertThat(result.apiKey()).isEqualTo("sk-openai");
+    }
+
     private void stubProviderComponentsWithNoStoredProperties() {
         ComponentDefinition anthropicDefinition = mockComponentDefinition("anthropic");
         ComponentDefinition openAiDefinition = mockComponentDefinition("openAi");
diff --git a/server/ee/libs/platform/platform-configuration/platform-configuration-service/src/test/java/com/bytechef/ee/platform/configuration/facade/AiProviderFacadeProvidersTest.java b/server/ee/libs/platform/platform-configuration/platform-configuration-service/src/test/java/com/bytechef/ee/platform/configuration/facade/AiProviderFacadeProvidersTest.java
index 84563d72ef8..5083751c290 100644
--- a/server/ee/libs/platform/platform-configuration/platform-configuration-service/src/test/java/com/bytechef/ee/platform/configuration/facade/AiProviderFacadeProvidersTest.java
+++ b/server/ee/libs/platform/platform-configuration/platform-configuration-service/src/test/java/com/bytechef/ee/platform/configuration/facade/AiProviderFacadeProvidersTest.java
@@ -13,15 +13,16 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import com.bytechef.component.ai.llm.Provider;
 import com.bytechef.config.ApplicationProperties;
 import com.bytechef.ee.platform.configuration.dto.AiProviderDTO;
+import com.bytechef.platform.ai.llm.Provider;
 import com.bytechef.platform.component.domain.ComponentDefinition;
 import com.bytechef.platform.component.service.ComponentDefinitionService;
 import com.bytechef.platform.configuration.domain.Property;
 import com.bytechef.platform.configuration.domain.Property.Scope;
 import com.bytechef.platform.configuration.service.PropertyService;
 import java.util.List;
+import java.util.Optional;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -125,6 +126,52 @@ void testGetAiProvidersLeavesProviderDisabledWithoutStoredOrConfigKey() {
         assertThat(openAi.enabled()).isFalse();
     }
 
+    @Test
+    void testGetUrlPrefersStoredUrlOverConfig() {
+        Property property = mock(Property.class);
+
+        when(property.isEnabled()).thenReturn(true);
+        when(property.get("url")).thenReturn("http://stored-host:11434");
+
+        when(propertyService.fetchProperty(
+            ArgumentMatchers.eq(Provider.OLLAMA.getKey()),
+            ArgumentMatchers.eq(Scope.PLATFORM),
+            ArgumentMatchers.isNull(),
+            ArgumentMatchers.eq((long) ENVIRONMENT)))
+                .thenReturn(Optional.of(property));
+
+        assertThat(facade.getUrl(Provider.OLLAMA.getKey(), ENVIRONMENT)).isEqualTo("http://stored-host:11434");
+    }
+
+    @Test
+    void testGetUrlFallsBackToConfigUrl() {
+        when(propertyService.fetchProperty(
+            ArgumentMatchers.eq(Provider.OLLAMA.getKey()),
+            ArgumentMatchers.eq(Scope.PLATFORM),
+            ArgumentMatchers.isNull(),
+            ArgumentMatchers.eq((long) ENVIRONMENT)))
+                .thenReturn(Optional.empty());
+
+        when(applicationProperties.getAi()
+            .getProvider()
+            .getOllama()
+            .getUrl()).thenReturn("http://config-host:11434");
+
+        assertThat(facade.getUrl(Provider.OLLAMA.getKey(), ENVIRONMENT)).isEqualTo("http://config-host:11434");
+    }
+
+    @Test
+    void testGetUrlReturnsNullWhenNoStoredOrConfigUrl() {
+        when(propertyService.fetchProperty(
+            ArgumentMatchers.eq(Provider.OLLAMA.getKey()),
+            ArgumentMatchers.eq(Scope.PLATFORM),
+            ArgumentMatchers.isNull(),
+            ArgumentMatchers.eq((long) ENVIRONMENT)))
+                .thenReturn(Optional.empty());
+
+        assertThat(facade.getUrl(Provider.OLLAMA.getKey(), ENVIRONMENT)).isNull();
+    }
+
     private AiProviderDTO findProvider(Provider provider) {
         return facade.getAiProviders(ENVIRONMENT)
             .stream()
diff --git a/server/ee/libs/platform/platform-configuration/platform-configuration-service/src/test/java/com/bytechef/ee/platform/configuration/facade/AiProviderFacadeTest.java b/server/ee/libs/platform/platform-configuration/platform-configuration-service/src/test/java/com/bytechef/ee/platform/configuration/facade/AiProviderFacadeTest.java
index 6e116fb6009..cf46d45623d 100644
--- a/server/ee/libs/platform/platform-configuration/platform-configuration-service/src/test/java/com/bytechef/ee/platform/configuration/facade/AiProviderFacadeTest.java
+++ b/server/ee/libs/platform/platform-configuration/platform-configuration-service/src/test/java/com/bytechef/ee/platform/configuration/facade/AiProviderFacadeTest.java
@@ -13,9 +13,9 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import com.bytechef.component.ai.llm.Provider;
 import com.bytechef.config.ApplicationProperties;
 import com.bytechef.ee.platform.configuration.dto.AiProviderDTO;
+import com.bytechef.platform.ai.llm.Provider;
 import com.bytechef.platform.component.domain.ComponentDefinition;
 import com.bytechef.platform.component.service.ComponentDefinitionService;
 import com.bytechef.platform.configuration.domain.Property.Scope;
@@ -55,7 +55,7 @@ void setUp() {
     }
 
     @Test
-    void testOnlyOpenAiSupportsEmbeddings() {
+    void testEmbeddingProvidersSupportEmbeddings() {
         List<ComponentDefinition> componentDefinitions = buildComponentDefinitionsForAllProviders();
 
         when(componentDefinitionService.getComponentDefinitions()).thenReturn(componentDefinitions);
@@ -68,15 +68,16 @@ void testOnlyOpenAiSupportsEmbeddings() {
 
         List<AiProviderDTO> providers = facade.getAiProviders(ENVIRONMENT);
 
-        AiProviderDTO openAi = providers.stream()
-            .filter(provider -> provider.id() == Provider.OPEN_AI.getId())
-            .findFirst()
-            .orElseThrow();
+        for (AiProviderDTO provider : providers) {
+            Provider matchingProvider = Arrays.stream(Provider.values())
+                .filter(curProvider -> curProvider.getId() == provider.id())
+                .findFirst()
+                .orElseThrow();
 
-        assertThat(openAi.supportsEmbeddings()).isTrue();
-        assertThat(providers.stream()
-            .filter(provider -> provider.id() != Provider.OPEN_AI.getId())
-            .allMatch(provider -> !provider.supportsEmbeddings())).isTrue();
+            assertThat(provider.supportsEmbeddings())
+                .as("Provider %s supports embeddings iff in Provider.EMBEDDING_PROVIDERS", matchingProvider)
+                .isEqualTo(Provider.EMBEDDING_PROVIDERS.contains(matchingProvider));
+        }
     }
 
     private List<ComponentDefinition> buildComponentDefinitionsForAllProviders() {
diff --git a/server/libs/config/ai-model-config/build.gradle.kts b/server/libs/config/ai-model-config/build.gradle.kts
index ed334906e47..1a83af42129 100644
--- a/server/libs/config/ai-model-config/build.gradle.kts
+++ b/server/libs/config/ai-model-config/build.gradle.kts
@@ -3,7 +3,9 @@ dependencies {
     implementation("com.openai:openai-java-client-okhttp")
     implementation("org.springframework:spring-context")
     implementation("org.springframework.ai:spring-ai-anthropic")
+    implementation("org.springframework.ai:spring-ai-ollama")
     implementation("org.springframework.ai:spring-ai-openai")
     implementation("org.springframework.boot:spring-boot-autoconfigure")
     implementation(project(":server:libs:config:app-config"))
+    implementation(project(":server:libs:platform:platform-api"))
 }
diff --git a/server/libs/config/ai-model-config/src/main/java/com/bytechef/ai/model/config/AiModelConfiguration.java b/server/libs/config/ai-model-config/src/main/java/com/bytechef/ai/model/config/AiModelConfiguration.java
index 35704972ae9..80ed7435c6b 100644
--- a/server/libs/config/ai-model-config/src/main/java/com/bytechef/ai/model/config/AiModelConfiguration.java
+++ b/server/libs/config/ai-model-config/src/main/java/com/bytechef/ai/model/config/AiModelConfiguration.java
@@ -16,141 +16,40 @@
 
 package com.bytechef.ai.model.config;
 
-import com.anthropic.client.okhttp.AnthropicOkHttpClient;
-import com.anthropic.client.okhttp.AnthropicOkHttpClientAsync;
 import com.bytechef.config.ApplicationProperties;
-import com.bytechef.config.ApplicationProperties.Ai.Provider.Anthropic;
 import com.bytechef.config.ApplicationProperties.Ai.Provider.OpenAi;
+import com.bytechef.platform.annotation.ConditionalOnCEVersion;
 import com.openai.client.okhttp.OpenAIOkHttpClient;
-import com.openai.client.okhttp.OpenAIOkHttpClientAsync;
-import io.micrometer.observation.ObservationRegistry;
 import java.time.Duration;
-import org.springframework.ai.anthropic.AnthropicCacheOptions;
-import org.springframework.ai.anthropic.AnthropicCacheStrategy;
-import org.springframework.ai.anthropic.AnthropicChatModel;
-import org.springframework.ai.anthropic.AnthropicChatOptions;
-import org.springframework.ai.chat.observation.ChatModelObservationConvention;
 import org.springframework.ai.document.MetadataMode;
-import org.springframework.ai.model.tool.ToolCallingManager;
-import org.springframework.ai.openai.OpenAiChatModel;
-import org.springframework.ai.openai.OpenAiChatOptions;
+import org.springframework.ai.embedding.EmbeddingModel;
+import org.springframework.ai.ollama.OllamaEmbeddingModel;
+import org.springframework.ai.ollama.api.OllamaApi;
+import org.springframework.ai.ollama.api.OllamaEmbeddingOptions;
 import org.springframework.ai.openai.OpenAiEmbeddingModel;
 import org.springframework.ai.openai.OpenAiEmbeddingOptions;
-import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
 
 /**
  * @author Ivica Cardic
  */
 @Configuration
+@ConditionalOnCEVersion
 class AiModelConfiguration {
 
-    private final ApplicationProperties.Ai ai;
-    private final String anthropicApiKey;
     private final String openAiApiKey;
 
     AiModelConfiguration(ApplicationProperties applicationProperties) {
-        this.ai = applicationProperties.getAi();
-
-        ApplicationProperties.Ai.Provider provider = ai.getProvider();
-
-        Anthropic anthropic = provider.getAnthropic();
-
-        this.anthropicApiKey = anthropic.getApiKey();
-
-        OpenAi openAi = provider.getOpenAi();
+        OpenAi openAi = applicationProperties.getAi()
+            .getProvider()
+            .getOpenAi();
 
         this.openAiApiKey = openAi.getApiKey();
     }
 
-    @Bean
-    @Primary
-    @ConditionalOnProperty(prefix = "bytechef.ai.provider.anthropic", name = "api-key")
-    AnthropicChatModel anthropicChatModel(
-        ObjectProvider<ObservationRegistry> observationRegistryProvider,
-        ObjectProvider<ChatModelObservationConvention> observationConvention, ToolCallingManager toolCallingManager) {
-
-        ApplicationProperties.Ai.Provider.Chat.Anthropic.Options anthropicChatOptions = ai.getProvider()
-            .getChat()
-            .getAnthropic()
-            .getOptions();
-
-        var chatModel = AnthropicChatModel.builder()
-            .anthropicClient(
-                AnthropicOkHttpClient.builder()
-                    .apiKey(anthropicApiKey)
-                    .build())
-            .anthropicClientAsync(
-                AnthropicOkHttpClientAsync.builder()
-                    .apiKey(anthropicApiKey)
-                    .build())
-            .options(
-                AnthropicChatOptions.builder()
-                    .model(anthropicChatOptions.getModel())
-                    .temperature(anthropicChatOptions.getTemperature())
-                    .cacheOptions(
-                        AnthropicCacheOptions.builder()
-                            .strategy(AnthropicCacheStrategy.CONVERSATION_HISTORY)
-                            .build())
-                    .maxTokens(64000)
-                    .build())
-            .observationRegistry(observationRegistryProvider.getIfUnique(() -> ObservationRegistry.NOOP))
-            .toolCallingManager(toolCallingManager)
-            .build();
-
-        observationConvention.ifAvailable(chatModel::setObservationConvention);
-
-        return chatModel;
-    }
-
-    @Bean
-    @ConditionalOnProperty(prefix = "bytechef.ai.provider.openai", name = "api-key")
-    OpenAiChatModel openAiChatModel(
-        ObjectProvider<ObservationRegistry> observationRegistry,
-        ObjectProvider<ChatModelObservationConvention> observationConvention,
-        ToolCallingManager toolCallingManager) {
-
-        ApplicationProperties.Ai.Provider.Chat.OpenAi.Options openAiChatOptions = ai.getProvider()
-            .getChat()
-            .getOpenAi()
-            .getOptions();
-
-        var chatModel = OpenAiChatModel.builder()
-            .openAiClient(
-                OpenAIOkHttpClient.builder()
-                    .apiKey(openAiApiKey)
-                    .timeout(Duration.ofSeconds(60))
-                    .build())
-            .openAiClientAsync(
-                OpenAIOkHttpClientAsync.builder()
-                    .apiKey(openAiApiKey)
-                    .timeout(Duration.ofSeconds(60))
-                    .build())
-            .options(
-                OpenAiChatOptions.builder()
-                    .model(openAiChatOptions.getModel())
-                    .temperature(openAiChatOptions.getTemperature())
-                    .reasoningEffort(
-                        openAiChatOptions.getReasoningEffect()
-                            .name()
-                            .toLowerCase())
-                    .verbosity(
-                        openAiChatOptions.getVerbosity()
-                            .name()
-                            .toLowerCase())
-                    .build())
-            .toolCallingManager(toolCallingManager)
-            .observationRegistry(observationRegistry.getIfUnique(() -> ObservationRegistry.NOOP))
-            .build();
-
-        observationConvention.ifAvailable(chatModel::setObservationConvention);
-
-        return chatModel;
-    }
-
     @Bean
     @ConditionalOnProperty(prefix = "bytechef.ai.provider.openai", name = "api-key")
     OpenAiEmbeddingModel openAiEmbeddingModel(ApplicationProperties applicationProperties) {
@@ -170,4 +69,25 @@ OpenAiEmbeddingModel openAiEmbeddingModel(ApplicationProperties applicationPrope
                 .model(options.getModel())
                 .build());
     }
+
+    @Bean
+    @ConditionalOnMissingBean(EmbeddingModel.class)
+    @ConditionalOnProperty(prefix = "bytechef.ai.provider.embedding.ollama.options", name = "model")
+    OllamaEmbeddingModel ollamaEmbeddingModel(ApplicationProperties applicationProperties) {
+        ApplicationProperties.Ai.Provider.Embedding.Ollama.Options options = applicationProperties.getAi()
+            .getProvider()
+            .getEmbedding()
+            .getOllama()
+            .getOptions();
+
+        return OllamaEmbeddingModel.builder()
+            .ollamaApi(
+                OllamaApi.builder()
+                    .build())
+            .options(
+                OllamaEmbeddingOptions.builder()
+                    .model(options.getModel())
+                    .build())
+            .build();
+    }
 }
diff --git a/server/libs/config/app-config/src/main/java/com/bytechef/config/ApplicationProperties.java b/server/libs/config/app-config/src/main/java/com/bytechef/config/ApplicationProperties.java
index 0da798c9eea..0c4211c3876 100644
--- a/server/libs/config/app-config/src/main/java/com/bytechef/config/ApplicationProperties.java
+++ b/server/libs/config/app-config/src/main/java/com/bytechef/config/ApplicationProperties.java
@@ -801,6 +801,11 @@ public static class Copilot {
              */
             private boolean enabled;
 
+            /**
+             * Copilot documentation configuration
+             */
+            private Docs docs = new Docs();
+
             public boolean isEnabled() {
                 return enabled;
             }
@@ -808,6 +813,70 @@ public boolean isEnabled() {
             public void setEnabled(boolean enabled) {
                 this.enabled = enabled;
             }
+
+            public Docs getDocs() {
+                return docs;
+            }
+
+            public void setDocs(Docs docs) {
+                this.docs = docs;
+            }
+
+            /**
+             * Copilot documentation configuration.
+             */
+            public static class Docs {
+
+                /**
+                 * Copilot documentation embedding configuration
+                 */
+                private Embedding embedding = new Embedding();
+
+                public Embedding getEmbedding() {
+                    return embedding;
+                }
+
+                public void setEmbedding(Embedding embedding) {
+                    this.embedding = embedding;
+                }
+
+                /**
+                 * Copilot documentation embedding configuration.
+                 */
+                public static class Embedding {
+
+                    public enum Provider {
+                        OLLAMA, OPENAI
+                    }
+
+                    /**
+                     * The embedding provider key (e.g. openAi).
+                     */
+                    private Provider provider;
+
+                    /**
+                     * The API key used to authenticate with the Copilot documentation embedding provider. Applies only
+                     * to the OpenAI provider; Ollama runs locally and does not require a key.
+                     */
+                    private String apiKey;
+
+                    public Provider getProvider() {
+                        return provider;
+                    }
+
+                    public String getApiKey() {
+                        return apiKey;
+                    }
+
+                    public void setProvider(Provider provider) {
+                        this.provider = provider;
+                    }
+
+                    public void setApiKey(String apiKey) {
+                        this.apiKey = apiKey;
+                    }
+                }
+            }
         }
 
         /**
@@ -1501,13 +1570,28 @@ public static class Ollama {
                  */
                 private String apiKey;
 
+                /**
+                 * Base URL of the Ollama server (e.g. http://localhost:11434). Serves as the fallback for both chat and
+                 * embedding models when no per-environment URL is configured in the AI Providers catalog. When blank,
+                 * the Ollama client defaults to http://localhost:11434.
+                 */
+                private String url;
+
                 public String getApiKey() {
                     return apiKey;
                 }
 
+                public String getUrl() {
+                    return url;
+                }
+
                 public void setApiKey(String apiKey) {
                     this.apiKey = apiKey;
                 }
+
+                public void setUrl(String url) {
+                    this.url = url;
+                }
             }
 
             /**
@@ -1748,11 +1832,24 @@ public void setVerbosity(Setting setting) {
              */
             public static class Embedding {
 
+                /**
+                 * Ollama embedding model configuration
+                 */
+                private Ollama ollama = new Ollama();
+
                 /**
                  * OpenAI embedding model configuration
                  */
                 private OpenAi openAi = new OpenAi();
 
+                public Ollama getOllama() {
+                    return ollama;
+                }
+
+                public void setOllama(Ollama ollama) {
+                    this.ollama = ollama;
+                }
+
                 public OpenAi getOpenAi() {
                     return openAi;
                 }
@@ -1761,6 +1858,44 @@ public void setOpenAi(OpenAi openAi) {
                     this.openAi = openAi;
                 }
 
+                /**
+                 * Ollama embedding model configuration.
+                 */
+                public static class Ollama {
+
+                    /**
+                     * Embedding model options
+                     */
+                    private Options options = new Options();
+
+                    public Options getOptions() {
+                        return options;
+                    }
+
+                    public void setOptions(Options options) {
+                        this.options = options;
+                    }
+
+                    /**
+                     * Ollama embedding model options.
+                     */
+                    public static class Options {
+
+                        /**
+                         * Embedding model name (e.g., qwen3-embedding:8b)
+                         */
+                        private String model;
+
+                        public String getModel() {
+                            return model;
+                        }
+
+                        public void setModel(String model) {
+                            this.model = model;
+                        }
+                    }
+                }
+
                 /**
                  * OpenAI embedding model configuration.
                  */
diff --git a/server/libs/modules/components/ai/llm/build.gradle.kts b/server/libs/modules/components/ai/llm/build.gradle.kts
index 48c75eedaa9..6efdde1f59a 100644
--- a/server/libs/modules/components/ai/llm/build.gradle.kts
+++ b/server/libs/modules/components/ai/llm/build.gradle.kts
@@ -3,11 +3,11 @@ version="1.0"
 dependencies {
     api("org.springframework.ai:spring-ai-client-chat")
     api("org.springframework.boot:spring-boot")
+    api(project(":server:libs:platform:platform-ai:platform-ai-api"))
 
-    implementation(project(":server:libs:core:commons:commons-util"))
-    implementation(project(":server:libs:platform:platform-ai:platform-ai-api"))
     implementation("org.springframework.ai:spring-ai-retry")
     implementation("org.springframework.boot:spring-boot-http-client")
+    implementation(project(":server:libs:core:commons:commons-util"))
 }
 
 subprojects {
diff --git a/server/libs/modules/components/ai/llm/ollama/src/main/java/com/bytechef/component/ai/llm/ollama/OllamaComponentHandler.java b/server/libs/modules/components/ai/llm/ollama/src/main/java/com/bytechef/component/ai/llm/ollama/OllamaComponentHandler.java
index 38c8d8e36c6..39c2a4f8d8a 100644
--- a/server/libs/modules/components/ai/llm/ollama/src/main/java/com/bytechef/component/ai/llm/ollama/OllamaComponentHandler.java
+++ b/server/libs/modules/components/ai/llm/ollama/src/main/java/com/bytechef/component/ai/llm/ollama/OllamaComponentHandler.java
@@ -21,6 +21,7 @@
 import com.bytechef.component.ComponentHandler;
 import com.bytechef.component.ai.llm.ollama.action.OllamaChatAction;
 import com.bytechef.component.ai.llm.ollama.cluster.OllamaChatModel;
+import com.bytechef.component.ai.llm.ollama.cluster.OllamaEmbedding;
 import com.bytechef.component.ai.llm.ollama.connection.OllamaConnection;
 import com.bytechef.component.definition.ComponentCategory;
 import com.bytechef.component.definition.ComponentDefinition;
@@ -42,7 +43,9 @@ public class OllamaComponentHandler implements ComponentHandler {
         .categories(ComponentCategory.ARTIFICIAL_INTELLIGENCE)
         .connection(OllamaConnection.CONNECTION_DEFINITION)
         .actions(OllamaChatAction.ACTION_DEFINITION)
-        .clusterElements(OllamaChatModel.CLUSTER_ELEMENT_DEFINITION);
+        .clusterElements(
+            OllamaChatModel.CLUSTER_ELEMENT_DEFINITION,
+            OllamaEmbedding.CLUSTER_ELEMENT_DEFINITION);
 
     @Override
     public ComponentDefinition getDefinition() {
diff --git a/server/libs/modules/components/ai/llm/ollama/src/main/java/com/bytechef/component/ai/llm/ollama/action/OllamaChatAction.java b/server/libs/modules/components/ai/llm/ollama/src/main/java/com/bytechef/component/ai/llm/ollama/action/OllamaChatAction.java
index 4ccbc0647b2..830738f0b21 100644
--- a/server/libs/modules/components/ai/llm/ollama/src/main/java/com/bytechef/component/ai/llm/ollama/action/OllamaChatAction.java
+++ b/server/libs/modules/components/ai/llm/ollama/src/main/java/com/bytechef/component/ai/llm/ollama/action/OllamaChatAction.java
@@ -197,12 +197,16 @@ public class OllamaChatAction {
                 .useNUMA(inputParameters.getBoolean(USE_NUMA))
                 .vocabOnly(inputParameters.getBoolean(VOCAB_ONLY));
 
-            Map<String, ?> response = inputParameters.getRequiredMap(RESPONSE);
+            // The response format is absent when the model is built outside the ask action (e.g. the AI Providers
+            // catalog), so read it optionally rather than requiring it.
+            Map<String, ?> response = inputParameters.getMap(RESPONSE);
 
-            Object responseFormat = response.get(RESPONSE_FORMAT);
+            if (response != null) {
+                Object responseFormat = response.get(RESPONSE_FORMAT);
 
-            if (!responseFormat.equals(ChatModel.ResponseFormat.TEXT.name())) {
-                ollamaChatOptionsBuilder.outputSchema((String) response.get(RESPONSE_SCHEMA));
+                if (responseFormat != null && !responseFormat.equals(ChatModel.ResponseFormat.TEXT.name())) {
+                    ollamaChatOptionsBuilder.outputSchema((String) response.get(RESPONSE_SCHEMA));
+                }
             }
 
             return OllamaChatModel.builder()
diff --git a/server/libs/modules/components/ai/llm/ollama/src/main/java/com/bytechef/component/ai/llm/ollama/cluster/OllamaEmbedding.java b/server/libs/modules/components/ai/llm/ollama/src/main/java/com/bytechef/component/ai/llm/ollama/cluster/OllamaEmbedding.java
new file mode 100644
index 00000000000..dce08a94658
--- /dev/null
+++ b/server/libs/modules/components/ai/llm/ollama/src/main/java/com/bytechef/component/ai/llm/ollama/cluster/OllamaEmbedding.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.bytechef.component.ai.llm.ollama.cluster;
+
+import static com.bytechef.component.ai.llm.constant.LLMConstants.MODEL;
+import static com.bytechef.component.ai.llm.ollama.constant.OllamaConstants.EMBEDDING_MODEL_PROPERTY;
+import static com.bytechef.component.ai.llm.ollama.constant.OllamaConstants.URL;
+import static com.bytechef.platform.component.definition.ai.vectorstore.EmbeddingFunction.EMBEDDING;
+
+import com.bytechef.component.definition.ClusterElementDefinition;
+import com.bytechef.component.definition.ComponentDsl;
+import com.bytechef.component.definition.Parameters;
+import com.bytechef.platform.component.definition.ai.vectorstore.EmbeddingFunction;
+import org.springframework.ai.embedding.EmbeddingModel;
+import org.springframework.ai.ollama.OllamaEmbeddingModel;
+import org.springframework.ai.ollama.api.OllamaApi;
+import org.springframework.ai.ollama.api.OllamaEmbeddingOptions;
+
+/**
+ * @author Ivica Cardic
+ */
+public class OllamaEmbedding {
+
+    public static final EmbeddingFunction EMBEDDING_MODEL = OllamaEmbedding::apply;
+
+    public static final ClusterElementDefinition<?> CLUSTER_ELEMENT_DEFINITION =
+        ComponentDsl.<EmbeddingFunction>clusterElement("embedding")
+            .title("Ollama Embedding")
+            .description("Ollama embedding.")
+            .type(EMBEDDING)
+            .object(() -> EMBEDDING_MODEL)
+            .properties(EMBEDDING_MODEL_PROPERTY);
+
+    protected static EmbeddingModel apply(Parameters inputParameters, Parameters connectionParameters) {
+        String url = connectionParameters.getString(URL);
+
+        OllamaApi ollamaApi = (url == null || url.isEmpty())
+            ? OllamaApi.builder()
+                .build()
+            : OllamaApi.builder()
+                .baseUrl(url)
+                .build();
+
+        return OllamaEmbeddingModel.builder()
+            .ollamaApi(ollamaApi)
+            .options(
+                OllamaEmbeddingOptions.builder()
+                    .model(inputParameters.getRequiredString(MODEL))
+                    .build())
+            .build();
+    }
+}
diff --git a/server/libs/modules/components/ai/llm/ollama/src/main/java/com/bytechef/component/ai/llm/ollama/constant/OllamaConstants.java b/server/libs/modules/components/ai/llm/ollama/src/main/java/com/bytechef/component/ai/llm/ollama/constant/OllamaConstants.java
index 1a9dd9e9613..d30fa291b40 100644
--- a/server/libs/modules/components/ai/llm/ollama/src/main/java/com/bytechef/component/ai/llm/ollama/constant/OllamaConstants.java
+++ b/server/libs/modules/components/ai/llm/ollama/src/main/java/com/bytechef/component/ai/llm/ollama/constant/OllamaConstants.java
@@ -189,6 +189,15 @@ public final class OllamaConstants {
             ModelUtils.getEnumOptions(
                 Arrays.stream(OllamaModel.values())
                     .collect(Collectors.toMap(OllamaModel::getName, OllamaModel::getName))));
+    public static final ModifiableStringProperty EMBEDDING_MODEL_PROPERTY = string(MODEL)
+        .label("Model")
+        .description("ID of the model to use.")
+        .required(true)
+        .options(
+            ModelUtils.getEnumOptions(
+                Arrays.stream(OllamaModel.values())
+                    .filter(OllamaConstants::isEmbeddingModel)
+                    .collect(Collectors.toMap(OllamaModel::getName, OllamaModel::getName))));
     public static final ModifiableIntegerProperty MAX_TOKENS_PROPERTY = integer(MAX_TOKENS)
         .label("Num predict")
         .description(
@@ -197,4 +206,10 @@ public final class OllamaConstants {
 
     private OllamaConstants() {
     }
+
+    private static boolean isEmbeddingModel(OllamaModel ollamaModel) {
+        String name = ollamaModel.getName();
+
+        return name.contains("embed");
+    }
 }
diff --git a/server/libs/modules/components/ai/llm/ollama/src/test/resources/definition/ollama_v1.json b/server/libs/modules/components/ai/llm/ollama/src/test/resources/definition/ollama_v1.json
index 13a22efd683..36afb746a7d 100644
--- a/server/libs/modules/components/ai/llm/ollama/src/test/resources/definition/ollama_v1.json
+++ b/server/libs/modules/components/ai/llm/ollama/src/test/resources/definition/ollama_v1.json
@@ -1975,6 +1975,57 @@
       "required": true
     },
     "workflowNodeDescription": null
+  }, {
+    "name": "embedding",
+    "description": "Ollama embedding.",
+    "element": { },
+    "help": null,
+    "outputDefinition": null,
+    "processErrorResponse": null,
+    "properties": [ {
+      "advancedOption": null,
+      "controlType": "SELECT",
+      "defaultValue": null,
+      "description": "ID of the model to use.",
+      "displayCondition": null,
+      "exampleValue": null,
+      "expressionEnabled": null,
+      "hidden": null,
+      "label": "Model",
+      "languageId": null,
+      "maxLength": null,
+      "metadata": { },
+      "minLength": null,
+      "name": "model",
+      "options": [ {
+        "description": null,
+        "label": "mxbai-embed-large",
+        "value": "mxbai-embed-large"
+      }, {
+        "description": null,
+        "label": "nomic-embed-text",
+        "value": "nomic-embed-text"
+      }, {
+        "description": null,
+        "label": "qwen3-embedding:8b",
+        "value": "qwen3-embedding:8b"
+      } ],
+      "optionsDataSource": null,
+      "optionsLoadedDynamically": null,
+      "placeholder": null,
+      "regex": null,
+      "required": true,
+      "type": "STRING"
+    } ],
+    "title": "Ollama Embedding",
+    "type": {
+      "name": "EMBEDDING",
+      "key": "embedding",
+      "label": "Embedding",
+      "multipleElements": false,
+      "required": true
+    },
+    "workflowNodeDescription": null
   } ],
   "componentCategories": [ {
     "name": "artificial-intelligence",
@@ -2046,4 +2097,4 @@
   "triggers": null,
   "unifiedApi": null,
   "version": 1
-}
\ No newline at end of file
+}
diff --git a/server/libs/modules/components/ai/universal/universal-image/src/main/java/com/bytechef/component/ai/universal/image/action/GenerateImageAction.java b/server/libs/modules/components/ai/universal/universal-image/src/main/java/com/bytechef/component/ai/universal/image/action/GenerateImageAction.java
index b1688df8500..c0b55177596 100644
--- a/server/libs/modules/components/ai/universal/universal-image/src/main/java/com/bytechef/component/ai/universal/image/action/GenerateImageAction.java
+++ b/server/libs/modules/components/ai/universal/universal-image/src/main/java/com/bytechef/component/ai/universal/image/action/GenerateImageAction.java
@@ -16,9 +16,6 @@
 
 package com.bytechef.component.ai.universal.image.action;
 
-import static com.bytechef.component.ai.llm.Provider.AZURE_OPEN_AI;
-import static com.bytechef.component.ai.llm.Provider.OPEN_AI;
-import static com.bytechef.component.ai.llm.Provider.STABILITY;
 import static com.bytechef.component.ai.llm.constant.LLMConstants.CONTENT;
 import static com.bytechef.component.ai.llm.constant.LLMConstants.IMAGE_MESSAGES;
 import static com.bytechef.component.ai.llm.constant.LLMConstants.IMAGE_N_PROPERTY;
@@ -39,13 +36,16 @@
 import static com.bytechef.component.definition.ComponentDsl.outputSchema;
 import static com.bytechef.component.definition.ComponentDsl.string;
 import static com.bytechef.component.definition.Property.ControlType.TEXT_AREA;
+import static com.bytechef.platform.ai.llm.Provider.AZURE_OPEN_AI;
+import static com.bytechef.platform.ai.llm.Provider.OPEN_AI;
+import static com.bytechef.platform.ai.llm.Provider.STABILITY;
 
-import com.bytechef.component.ai.llm.Provider;
 import com.bytechef.component.ai.llm.openai.definition.Size;
 import com.bytechef.component.ai.universal.image.action.definition.AiImageActionDefinition;
 import com.bytechef.component.ai.universal.image.constant.AiImageConstants;
 import com.bytechef.component.definition.Parameters;
 import com.bytechef.config.ApplicationProperties;
+import com.bytechef.platform.ai.llm.Provider;
 import com.bytechef.platform.component.definition.ParametersFactory;
 import com.bytechef.platform.configuration.service.PropertyService;
 import java.util.HashMap;
diff --git a/server/libs/modules/components/ai/universal/universal-image/src/main/java/com/bytechef/component/ai/universal/image/action/definition/AiImageActionDefinition.java b/server/libs/modules/components/ai/universal/universal-image/src/main/java/com/bytechef/component/ai/universal/image/action/definition/AiImageActionDefinition.java
index 507a7c246ff..5df0f0bbb6d 100644
--- a/server/libs/modules/components/ai/universal/universal-image/src/main/java/com/bytechef/component/ai/universal/image/action/definition/AiImageActionDefinition.java
+++ b/server/libs/modules/components/ai/universal/universal-image/src/main/java/com/bytechef/component/ai/universal/image/action/definition/AiImageActionDefinition.java
@@ -16,14 +16,13 @@
 
 package com.bytechef.component.ai.universal.image.action.definition;
 
-import static com.bytechef.component.ai.llm.Provider.AZURE_OPEN_AI;
-import static com.bytechef.component.ai.llm.Provider.OPEN_AI;
-import static com.bytechef.component.ai.llm.Provider.STABILITY;
 import static com.bytechef.component.ai.llm.constant.LLMConstants.PROVIDER;
 import static com.bytechef.component.definition.Authorization.TOKEN;
+import static com.bytechef.platform.ai.llm.Provider.AZURE_OPEN_AI;
+import static com.bytechef.platform.ai.llm.Provider.OPEN_AI;
+import static com.bytechef.platform.ai.llm.Provider.STABILITY;
 
 import com.bytechef.component.ai.llm.ImageModel;
-import com.bytechef.component.ai.llm.Provider;
 import com.bytechef.component.ai.llm.azure.openai.action.AzureOpenAiCreateImageAction;
 import com.bytechef.component.ai.llm.openai.action.OpenAiCreateImageAction;
 import com.bytechef.component.ai.llm.stability.action.StabilityCreateImageAction;
@@ -32,6 +31,7 @@
 import com.bytechef.component.definition.ActionDefinition;
 import com.bytechef.component.definition.Parameters;
 import com.bytechef.config.ApplicationProperties;
+import com.bytechef.platform.ai.llm.Provider;
 import com.bytechef.platform.component.definition.AbstractActionDefinitionWrapper;
 import com.bytechef.platform.component.definition.ActionContextAware;
 import com.bytechef.platform.component.definition.ParametersFactory;
diff --git a/server/libs/modules/components/ai/universal/universal-image/src/main/java/com/bytechef/component/ai/universal/image/constant/AiImageConstants.java b/server/libs/modules/components/ai/universal/universal-image/src/main/java/com/bytechef/component/ai/universal/image/constant/AiImageConstants.java
index 0dd6236f4d0..548e81b3e14 100644
--- a/server/libs/modules/components/ai/universal/universal-image/src/main/java/com/bytechef/component/ai/universal/image/constant/AiImageConstants.java
+++ b/server/libs/modules/components/ai/universal/universal-image/src/main/java/com/bytechef/component/ai/universal/image/constant/AiImageConstants.java
@@ -16,12 +16,12 @@
 
 package com.bytechef.component.ai.universal.image.constant;
 
-import static com.bytechef.component.ai.llm.Provider.AZURE_OPEN_AI;
-import static com.bytechef.component.ai.llm.Provider.OPEN_AI;
-import static com.bytechef.component.ai.llm.Provider.STABILITY;
 import static com.bytechef.component.ai.llm.constant.LLMConstants.MODEL;
 import static com.bytechef.component.ai.llm.constant.LLMConstants.PROVIDER;
 import static com.bytechef.component.definition.ComponentDsl.string;
+import static com.bytechef.platform.ai.llm.Provider.AZURE_OPEN_AI;
+import static com.bytechef.platform.ai.llm.Provider.OPEN_AI;
+import static com.bytechef.platform.ai.llm.Provider.STABILITY;
 
 import com.bytechef.component.ai.universal.image.util.AiImageUtils;
 import com.bytechef.component.definition.ActionDefinition;
diff --git a/server/libs/modules/components/ai/universal/universal-image/src/main/java/com/bytechef/component/ai/universal/image/util/AiImageUtils.java b/server/libs/modules/components/ai/universal/universal-image/src/main/java/com/bytechef/component/ai/universal/image/util/AiImageUtils.java
index e206389813f..0a9b1f47bd3 100644
--- a/server/libs/modules/components/ai/universal/universal-image/src/main/java/com/bytechef/component/ai/universal/image/util/AiImageUtils.java
+++ b/server/libs/modules/components/ai/universal/universal-image/src/main/java/com/bytechef/component/ai/universal/image/util/AiImageUtils.java
@@ -16,19 +16,19 @@
 
 package com.bytechef.component.ai.universal.image.util;
 
-import static com.bytechef.component.ai.llm.Provider.AZURE_OPEN_AI;
-import static com.bytechef.component.ai.llm.Provider.OPEN_AI;
-import static com.bytechef.component.ai.llm.Provider.STABILITY;
 import static com.bytechef.component.ai.llm.constant.LLMConstants.PROVIDER;
 import static com.bytechef.component.definition.ComponentDsl.option;
+import static com.bytechef.platform.ai.llm.Provider.AZURE_OPEN_AI;
+import static com.bytechef.platform.ai.llm.Provider.OPEN_AI;
+import static com.bytechef.platform.ai.llm.Provider.STABILITY;
 
-import com.bytechef.component.ai.llm.Provider;
 import com.bytechef.component.ai.llm.azure.openai.constant.AzureOpenAiConstants;
 import com.bytechef.component.ai.llm.openai.constant.OpenAiConstants;
 import com.bytechef.component.definition.ActionContext;
 import com.bytechef.component.definition.Option;
 import com.bytechef.component.definition.Parameters;
 import com.bytechef.config.ApplicationProperties.Ai;
+import com.bytechef.platform.ai.llm.Provider;
 import com.bytechef.platform.configuration.domain.Property;
 import com.bytechef.platform.configuration.domain.Property.Scope;
 import com.bytechef.platform.configuration.service.PropertyService;
diff --git a/server/libs/modules/components/ai/universal/universal-text/src/main/java/com/bytechef/component/ai/universal/text/action/definition/AiTextActionDefinition.java b/server/libs/modules/components/ai/universal/universal-text/src/main/java/com/bytechef/component/ai/universal/text/action/definition/AiTextActionDefinition.java
index def08d7cd88..ae092f00c66 100644
--- a/server/libs/modules/components/ai/universal/universal-text/src/main/java/com/bytechef/component/ai/universal/text/action/definition/AiTextActionDefinition.java
+++ b/server/libs/modules/components/ai/universal/universal-text/src/main/java/com/bytechef/component/ai/universal/text/action/definition/AiTextActionDefinition.java
@@ -16,21 +16,20 @@
 
 package com.bytechef.component.ai.universal.text.action.definition;
 
-import static com.bytechef.component.ai.llm.Provider.ANTHROPIC;
-import static com.bytechef.component.ai.llm.Provider.AZURE_OPEN_AI;
-import static com.bytechef.component.ai.llm.Provider.DEEPSEEK;
-import static com.bytechef.component.ai.llm.Provider.GROQ;
-import static com.bytechef.component.ai.llm.Provider.MISTRAL;
-import static com.bytechef.component.ai.llm.Provider.NVIDIA;
-import static com.bytechef.component.ai.llm.Provider.OLLAMA;
-import static com.bytechef.component.ai.llm.Provider.OPEN_AI;
-import static com.bytechef.component.ai.llm.Provider.PERPLEXITY;
-import static com.bytechef.component.ai.llm.Provider.VERTEX_GEMINI;
 import static com.bytechef.component.ai.llm.constant.LLMConstants.PROVIDER;
 import static com.bytechef.component.definition.Authorization.TOKEN;
+import static com.bytechef.platform.ai.llm.Provider.ANTHROPIC;
+import static com.bytechef.platform.ai.llm.Provider.AZURE_OPEN_AI;
+import static com.bytechef.platform.ai.llm.Provider.DEEPSEEK;
+import static com.bytechef.platform.ai.llm.Provider.GROQ;
+import static com.bytechef.platform.ai.llm.Provider.MISTRAL;
+import static com.bytechef.platform.ai.llm.Provider.NVIDIA;
+import static com.bytechef.platform.ai.llm.Provider.OLLAMA;
+import static com.bytechef.platform.ai.llm.Provider.OPEN_AI;
+import static com.bytechef.platform.ai.llm.Provider.PERPLEXITY;
+import static com.bytechef.platform.ai.llm.Provider.VERTEX_GEMINI;
 
 import com.bytechef.component.ai.llm.ChatModel;
-import com.bytechef.component.ai.llm.Provider;
 import com.bytechef.component.ai.llm.anthropic.action.AnthropicChatAction;
 import com.bytechef.component.ai.llm.azure.openai.action.AzureOpenAiChatAction;
 import com.bytechef.component.ai.llm.deepseek.action.DeepSeekChatAction;
@@ -55,6 +54,7 @@
 import com.bytechef.config.ApplicationProperties.Ai.Provider.OpenAi;
 import com.bytechef.config.ApplicationProperties.Ai.Provider.Perplexity;
 import com.bytechef.config.ApplicationProperties.Ai.Provider.VertexGemini;
+import com.bytechef.platform.ai.llm.Provider;
 import com.bytechef.platform.component.definition.AbstractActionDefinitionWrapper;
 import com.bytechef.platform.component.definition.ActionContextAware;
 import com.bytechef.platform.component.definition.ParametersFactory;
diff --git a/server/libs/modules/components/ai/universal/universal-text/src/main/java/com/bytechef/component/ai/universal/text/constant/AiTextConstants.java b/server/libs/modules/components/ai/universal/universal-text/src/main/java/com/bytechef/component/ai/universal/text/constant/AiTextConstants.java
index f0ae23d7747..d0394fea4fe 100644
--- a/server/libs/modules/components/ai/universal/universal-text/src/main/java/com/bytechef/component/ai/universal/text/constant/AiTextConstants.java
+++ b/server/libs/modules/components/ai/universal/universal-text/src/main/java/com/bytechef/component/ai/universal/text/constant/AiTextConstants.java
@@ -16,20 +16,20 @@
 
 package com.bytechef.component.ai.universal.text.constant;
 
-import static com.bytechef.component.ai.llm.Provider.ANTHROPIC;
-import static com.bytechef.component.ai.llm.Provider.AZURE_OPEN_AI;
-import static com.bytechef.component.ai.llm.Provider.DEEPSEEK;
-import static com.bytechef.component.ai.llm.Provider.GROQ;
-import static com.bytechef.component.ai.llm.Provider.MISTRAL;
-import static com.bytechef.component.ai.llm.Provider.NVIDIA;
-import static com.bytechef.component.ai.llm.Provider.OLLAMA;
-import static com.bytechef.component.ai.llm.Provider.OPEN_AI;
-import static com.bytechef.component.ai.llm.Provider.PERPLEXITY;
-import static com.bytechef.component.ai.llm.Provider.VERTEX_GEMINI;
 import static com.bytechef.component.ai.llm.constant.LLMConstants.MODEL;
 import static com.bytechef.component.ai.llm.constant.LLMConstants.PROVIDER;
 import static com.bytechef.component.definition.ComponentDsl.string;
 import static com.bytechef.config.ApplicationProperties.Ai;
+import static com.bytechef.platform.ai.llm.Provider.ANTHROPIC;
+import static com.bytechef.platform.ai.llm.Provider.AZURE_OPEN_AI;
+import static com.bytechef.platform.ai.llm.Provider.DEEPSEEK;
+import static com.bytechef.platform.ai.llm.Provider.GROQ;
+import static com.bytechef.platform.ai.llm.Provider.MISTRAL;
+import static com.bytechef.platform.ai.llm.Provider.NVIDIA;
+import static com.bytechef.platform.ai.llm.Provider.OLLAMA;
+import static com.bytechef.platform.ai.llm.Provider.OPEN_AI;
+import static com.bytechef.platform.ai.llm.Provider.PERPLEXITY;
+import static com.bytechef.platform.ai.llm.Provider.VERTEX_GEMINI;
 
 import com.bytechef.component.ai.universal.text.util.AiTextUtils;
 import com.bytechef.component.definition.ActionDefinition.OptionsFunction;
diff --git a/server/libs/modules/components/ai/universal/universal-text/src/main/java/com/bytechef/component/ai/universal/text/util/AiTextUtils.java b/server/libs/modules/components/ai/universal/universal-text/src/main/java/com/bytechef/component/ai/universal/text/util/AiTextUtils.java
index 0d73a8b42ff..f7b0c7a75b4 100644
--- a/server/libs/modules/components/ai/universal/universal-text/src/main/java/com/bytechef/component/ai/universal/text/util/AiTextUtils.java
+++ b/server/libs/modules/components/ai/universal/universal-text/src/main/java/com/bytechef/component/ai/universal/text/util/AiTextUtils.java
@@ -16,20 +16,19 @@
 
 package com.bytechef.component.ai.universal.text.util;
 
-import static com.bytechef.component.ai.llm.Provider.ANTHROPIC;
-import static com.bytechef.component.ai.llm.Provider.AZURE_OPEN_AI;
-import static com.bytechef.component.ai.llm.Provider.DEEPSEEK;
-import static com.bytechef.component.ai.llm.Provider.GROQ;
-import static com.bytechef.component.ai.llm.Provider.MISTRAL;
-import static com.bytechef.component.ai.llm.Provider.NVIDIA;
-import static com.bytechef.component.ai.llm.Provider.OLLAMA;
-import static com.bytechef.component.ai.llm.Provider.OPEN_AI;
-import static com.bytechef.component.ai.llm.Provider.PERPLEXITY;
-import static com.bytechef.component.ai.llm.Provider.VERTEX_GEMINI;
 import static com.bytechef.component.ai.llm.constant.LLMConstants.PROVIDER;
 import static com.bytechef.component.definition.ComponentDsl.option;
+import static com.bytechef.platform.ai.llm.Provider.ANTHROPIC;
+import static com.bytechef.platform.ai.llm.Provider.AZURE_OPEN_AI;
+import static com.bytechef.platform.ai.llm.Provider.DEEPSEEK;
+import static com.bytechef.platform.ai.llm.Provider.GROQ;
+import static com.bytechef.platform.ai.llm.Provider.MISTRAL;
+import static com.bytechef.platform.ai.llm.Provider.NVIDIA;
+import static com.bytechef.platform.ai.llm.Provider.OLLAMA;
+import static com.bytechef.platform.ai.llm.Provider.OPEN_AI;
+import static com.bytechef.platform.ai.llm.Provider.PERPLEXITY;
+import static com.bytechef.platform.ai.llm.Provider.VERTEX_GEMINI;
 
-import com.bytechef.component.ai.llm.Provider;
 import com.bytechef.component.ai.llm.anthropic.constant.AnthropicConstants;
 import com.bytechef.component.ai.llm.gemini.constant.GeminiConstants;
 import com.bytechef.component.ai.llm.mistral.constant.MistralConstants;
@@ -40,6 +39,7 @@
 import com.bytechef.config.ApplicationProperties.Ai;
 import com.bytechef.config.ApplicationProperties.Ai.Provider.Anthropic;
 import com.bytechef.config.ApplicationProperties.Ai.Provider.VertexGemini;
+import com.bytechef.platform.ai.llm.Provider;
 import com.bytechef.platform.configuration.domain.Property;
 import com.bytechef.platform.configuration.domain.Property.Scope;
 import com.bytechef.platform.configuration.service.PropertyService;
diff --git a/server/libs/modules/components/ai/llm/src/main/java/com/bytechef/component/ai/llm/Provider.java b/server/libs/platform/platform-ai/platform-ai-api/src/main/java/com/bytechef/platform/ai/llm/Provider.java
similarity index 80%
rename from server/libs/modules/components/ai/llm/src/main/java/com/bytechef/component/ai/llm/Provider.java
rename to server/libs/platform/platform-ai/platform-ai-api/src/main/java/com/bytechef/platform/ai/llm/Provider.java
index dffe67f9ffb..1c9fe30b7c6 100644
--- a/server/libs/modules/components/ai/llm/src/main/java/com/bytechef/component/ai/llm/Provider.java
+++ b/server/libs/platform/platform-ai/platform-ai-api/src/main/java/com/bytechef/platform/ai/llm/Provider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bytechef.component.ai.llm;
+package com.bytechef.platform.ai.llm;
 
 import java.util.EnumSet;
 import java.util.Set;
@@ -46,6 +46,10 @@ public enum Provider {
     DEEPSEEK(17, "deepseek", "ai.provider.deepseek", "DeepSeek"),
     OLLAMA(18, "ollama", "ai.provider.ollama", "Ollama");
 
+    public static final Set<Provider> EMBEDDING_PROVIDERS = EnumSet.of(
+        OLLAMA,
+        OPEN_AI);
+
     public static final Set<Provider> CHAT_PROVIDERS = EnumSet.of(
         ANTHROPIC,
         DEEPSEEK,
@@ -57,7 +61,8 @@ public enum Provider {
         PERPLEXITY,
         VERTEX_GEMINI);
 
-    private static final Set<Provider> EMBEDDING_SUPPORTED_PROVIDERS = Set.of(OPEN_AI);
+    // Providers that authenticate against a self-hosted server rather than an API key.
+    public static final Set<Provider> KEYLESS_PROVIDERS = EnumSet.of(OLLAMA);
 
     private final int id;
     private final String label;
@@ -72,7 +77,11 @@ public enum Provider {
     }
 
     public boolean isEmbeddingSupported() {
-        return EMBEDDING_SUPPORTED_PROVIDERS.contains(this);
+        return EMBEDDING_PROVIDERS.contains(this);
+    }
+
+    public boolean requiresApiKey() {
+        return !KEYLESS_PROVIDERS.contains(this);
     }
 
     public int getId() {
@@ -90,4 +99,14 @@ public String getKey() {
     public String getName() {
         return name;
     }
+
+    public static Provider valueOfKey(String key) {
+        for (Provider provider : values()) {
+            if (provider.key.equals(key)) {
+                return provider;
+            }
+        }
+
+        throw new IllegalArgumentException("No provider found for key: " + key);
+    }
 }
diff --git a/server/libs/platform/platform-ai/platform-ai-tool/src/main/resources/instruction_workflow_build.txt b/server/libs/platform/platform-ai/platform-ai-tool/src/main/resources/instruction_workflow_build.txt
index 4f2474363fa..5a66eac52c2 100644
--- a/server/libs/platform/platform-ai/platform-ai-tool/src/main/resources/instruction_workflow_build.txt
+++ b/server/libs/platform/platform-ai/platform-ai-tool/src/main/resources/instruction_workflow_build.txt
@@ -1,7 +1,7 @@
 The workflow needs to be in JSON format similar to:
 %s
 
-- Every workflow must only have one trigger, but as many actions or task dispatchers as needed
+- A workflow can have one or more triggers, plus as many actions or task dispatchers as needed
 
 Output properties:
 Some tasks have output properties that you get with getTaskOutputProperty() tool. Output property is a response to the task.
diff --git a/server/libs/platform/platform-configuration/platform-configuration-api/src/main/java/com/bytechef/platform/configuration/context/EnvironmentContext.java b/server/libs/platform/platform-configuration/platform-configuration-api/src/main/java/com/bytechef/platform/configuration/context/EnvironmentContext.java
index a93bc7983b7..870fda7dc56 100644
--- a/server/libs/platform/platform-configuration/platform-configuration-api/src/main/java/com/bytechef/platform/configuration/context/EnvironmentContext.java
+++ b/server/libs/platform/platform-configuration/platform-configuration-api/src/main/java/com/bytechef/platform/configuration/context/EnvironmentContext.java
@@ -17,6 +17,7 @@
 package com.bytechef.platform.configuration.context;
 
 import com.bytechef.platform.configuration.domain.Environment;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -63,6 +64,15 @@ public static Environment getCurrentEnvironment() {
         return environment;
     }
 
+    /**
+     * Returns the environment currently bound to the thread, or {@code null} when none is set. Unlike
+     * {@link #getCurrentEnvironment()}, this does not fall back to {@link Environment#PRODUCTION}, so callers can
+     * capture and later restore the exact prior binding (including "unset").
+     */
+    public static @Nullable Environment fetchCurrentEnvironment() {
+        return CONTEXT.get();
+    }
+
     public static void clear() {
         CONTEXT.remove();
     }
diff --git a/server/libs/platform/platform-workflow/platform-workflow-validator/platform-workflow-validator-service/src/main/java/com/bytechef/platform/workflow/validator/DataPillValidator.java b/server/libs/platform/platform-workflow/platform-workflow-validator/platform-workflow-validator-service/src/main/java/com/bytechef/platform/workflow/validator/DataPillValidator.java
index 5d40b15df3c..65470f1ffe8 100644
--- a/server/libs/platform/platform-workflow/platform-workflow-validator/platform-workflow-validator-service/src/main/java/com/bytechef/platform/workflow/validator/DataPillValidator.java
+++ b/server/libs/platform/platform-workflow/platform-workflow-validator/platform-workflow-validator-service/src/main/java/com/bytechef/platform/workflow/validator/DataPillValidator.java
@@ -60,6 +60,7 @@ public static void validateTaskDataPills(
         TaskValidationContext taskContext = new TaskValidationContext();
 
         taskContext.skipTaskOrderValidation = skipTaskOrderValidation;
+        taskContext.nodeOutputMap = context.getNodeOutputMap();
 
         findDataPillsInNode(
             parametersJsonNode, "", name, context.getTaskOutputs(), context.getTaskNames(),
@@ -485,15 +486,17 @@ private static void validatePropertyReference(
 
         if (referencedTaskType != null) {
             validatePropertyInOutput(
-                dataPillExpression, referencedTaskType, propertyName, fieldPath, taskOutputMap, errors, warnings, text,
-                referencedTaskName, allTasksMap, taskDefinition);
+                dataPillExpression, referencedTaskType, propertyName, fieldPath, taskOutputMap,
+                context.nodeOutputMap.get(referencedTaskName), errors, warnings, text, referencedTaskName, allTasksMap,
+                taskDefinition);
         }
     }
 
     private static void validatePropertyInOutput(
         String dataPillExpression, String referencedTaskType, String propertyName, String fieldPath,
-        Map<String, PropertyInfo> taskOutput, StringBuilder errors, StringBuilder warnings, String text,
-        String referencedTaskName, Map<String, JsonNode> allTasksMap, List<PropertyInfo> taskDefinition) {
+        Map<String, PropertyInfo> taskOutput, @Nullable PropertyInfo nodeOutputInfo, StringBuilder errors,
+        StringBuilder warnings, String text, String referencedTaskName, Map<String, JsonNode> allTasksMap,
+        List<PropertyInfo> taskDefinition) {
 
         // Special handling for loop tasks - they auto-generate 'item' output based on the 'items' parameter
         if (referencedTaskType.startsWith("loop/") && propertyName.startsWith("item")) {
@@ -506,6 +509,21 @@ private static void validatePropertyInOutput(
             return;
         }
 
+        if (nodeOutputInfo != null) {
+            if (PropertyUtils.checkPropertyExists(nodeOutputInfo, propertyName)) {
+                validateTypeCompatibility(
+                    dataPillExpression, referencedTaskType, propertyName, fieldPath, nodeOutputInfo, errors, text,
+                    taskDefinition);
+            } else {
+                StringUtils.appendWithNewline(
+                    "Property '" + dataPillExpression + "' does not exist in the output of '" + referencedTaskType +
+                        "'",
+                    errors);
+            }
+
+            return;
+        }
+
         PropertyInfo outputInfo = taskOutput.get(referencedTaskType);
         if (outputInfo != null) {
             boolean propertyExists = PropertyUtils.checkPropertyExists(outputInfo, propertyName);
@@ -562,5 +580,6 @@ private static void validateTypeCompatibility(
     private static class TaskValidationContext {
         boolean stopProcessing = false;
         boolean skipTaskOrderValidation = false;
+        Map<String, PropertyInfo> nodeOutputMap = Map.of();
     }
 }
diff --git a/server/libs/platform/platform-workflow/platform-workflow-validator/platform-workflow-validator-service/src/main/java/com/bytechef/platform/workflow/validator/ValidationContext.java b/server/libs/platform/platform-workflow/platform-workflow-validator/platform-workflow-validator-service/src/main/java/com/bytechef/platform/workflow/validator/ValidationContext.java
index 6e3fe0dc50b..ecaff90f383 100644
--- a/server/libs/platform/platform-workflow/platform-workflow-validator/platform-workflow-validator-service/src/main/java/com/bytechef/platform/workflow/validator/ValidationContext.java
+++ b/server/libs/platform/platform-workflow/platform-workflow-validator/platform-workflow-validator-service/src/main/java/com/bytechef/platform/workflow/validator/ValidationContext.java
@@ -34,6 +34,7 @@ class ValidationContext {
     private final List<JsonNode> taskJsonNodes;
     private final Map<String, List<PropertyInfo>> taskDefinitionMap;
     private final Map<String, PropertyInfo> taskOutputMap;
+    private final Map<String, PropertyInfo> nodeOutputMap;
     private final Map<String, List<String>> clusterTypesProviderMap;
     private final StringBuilder errors;
     private final StringBuilder warnings;
@@ -43,12 +44,13 @@ class ValidationContext {
 
     private ValidationContext(
         List<JsonNode> taskJsonNodes, Map<String, List<PropertyInfo>> taskDefinitionMap,
-        Map<String, PropertyInfo> taskOutputMap, Map<String, List<String>> clusterTypesProviderMap,
-        StringBuilder errors, StringBuilder warnings) {
+        Map<String, PropertyInfo> taskOutputMap, Map<String, PropertyInfo> nodeOutputMap,
+        Map<String, List<String>> clusterTypesProviderMap, StringBuilder errors, StringBuilder warnings) {
 
         this.taskJsonNodes = taskJsonNodes;
         this.taskDefinitionMap = taskDefinitionMap;
         this.taskOutputMap = taskOutputMap;
+        this.nodeOutputMap = nodeOutputMap;
         this.clusterTypesProviderMap = clusterTypesProviderMap;
         this.errors = errors;
         this.warnings = warnings;
@@ -61,8 +63,16 @@ public static ValidationContext of(
         Map<String, PropertyInfo> taskOutputMap, Map<String, List<String>> clusterTypesProviderMap,
         StringBuilder errors, StringBuilder warnings) {
 
-        return new ValidationContext(taskJsonNodes, taskDefinitionMap, taskOutputMap, clusterTypesProviderMap, errors,
-            warnings);
+        return of(taskJsonNodes, taskDefinitionMap, taskOutputMap, Map.of(), clusterTypesProviderMap, errors, warnings);
+    }
+
+    public static ValidationContext of(
+        List<JsonNode> taskJsonNodes, Map<String, List<PropertyInfo>> taskDefinitionMap,
+        Map<String, PropertyInfo> taskOutputMap, Map<String, PropertyInfo> nodeOutputMap,
+        Map<String, List<String>> clusterTypesProviderMap, StringBuilder errors, StringBuilder warnings) {
+
+        return new ValidationContext(taskJsonNodes, taskDefinitionMap, taskOutputMap, nodeOutputMap,
+            clusterTypesProviderMap, errors, warnings);
     }
 
     private void buildTaskMaps() {
@@ -96,6 +106,10 @@ public Map<String, PropertyInfo> getTaskOutputs() {
         return new HashMap<>(taskOutputMap);
     }
 
+    public Map<String, PropertyInfo> getNodeOutputMap() {
+        return nodeOutputMap;
+    }
+
     public StringBuilder getErrors() {
         return errors;
     }
diff --git a/server/libs/platform/platform-workflow/platform-workflow-validator/platform-workflow-validator-service/src/main/java/com/bytechef/platform/workflow/validator/WorkflowValidator.java b/server/libs/platform/platform-workflow/platform-workflow-validator/platform-workflow-validator-service/src/main/java/com/bytechef/platform/workflow/validator/WorkflowValidator.java
index e0f7cd3ef04..72bbd34c8cf 100644
--- a/server/libs/platform/platform-workflow/platform-workflow-validator/platform-workflow-validator-service/src/main/java/com/bytechef/platform/workflow/validator/WorkflowValidator.java
+++ b/server/libs/platform/platform-workflow/platform-workflow-validator/platform-workflow-validator-service/src/main/java/com/bytechef/platform/workflow/validator/WorkflowValidator.java
@@ -81,6 +81,22 @@ public static void validateWorkflow(
         Map<String, PropertyInfo> taskOutputMap, Map<String, List<String>> clusterTypesMap,
         StringBuilder errors, StringBuilder warnings) {
 
+        validateWorkflow(
+            workflow, taskDefinitionProvider, taskOutputProvider, clusterTypesProvider, taskDefinitionMap,
+            taskOutputMap, Map.of(), clusterTypesMap, errors, warnings);
+    }
+
+    /**
+     * Same as {@link #validateWorkflow}, plus a config-aware per-node output map (node name to the schema the node
+     * produces for its configured input parameters) used to hard-fail references that don't exist in a dynamic output's
+     * config-resolved shape.
+     */
+    public static void validateWorkflow(
+        String workflow, TaskDefinitionProvider taskDefinitionProvider, TaskOutputProvider taskOutputProvider,
+        @Nullable ClusterTypesProvider clusterTypesProvider, Map<String, List<PropertyInfo>> taskDefinitionMap,
+        Map<String, PropertyInfo> taskOutputMap, Map<String, PropertyInfo> nodeOutputMap,
+        Map<String, List<String>> clusterTypesMap, StringBuilder errors, StringBuilder warnings) {
+
         try {
             validateWorkflowStructure(workflow, errors);
 
@@ -94,12 +110,13 @@ public static void validateWorkflow(
             List<JsonNode> taskJsonNodes = new ArrayList<>();
 
             processTriggers(
-                taskDefinitionProvider, taskOutputProvider, taskDefinitionMap, taskOutputMap, errors, warnings,
+                taskDefinitionProvider, taskOutputProvider, taskDefinitionMap, taskOutputMap, warnings,
                 workflowJsonNode, taskJsonNodes);
             processTasks(
                 taskDefinitionProvider, taskOutputProvider, clusterTypesProvider, taskDefinitionMap,
                 taskOutputMap, clusterTypesMap, workflowJsonNode, taskJsonNodes, errors, warnings);
-            validateWorkflowTasks(taskJsonNodes, taskDefinitionMap, taskOutputMap, clusterTypesMap, errors, warnings);
+            validateWorkflowTasks(
+                taskJsonNodes, taskDefinitionMap, taskOutputMap, nodeOutputMap, clusterTypesMap, errors, warnings);
         } catch (Exception e) {
             errors.append("Failed to validate workflow: ");
             errors.append(e.getMessage()
@@ -121,8 +138,17 @@ public static void validateWorkflowTasks(
         Map<String, PropertyInfo> taskOutput, Map<String, List<String>> clusterTypesProviderMap, StringBuilder errors,
         StringBuilder warnings) {
 
+        validateWorkflowTasks(
+            taskJsonNodes, taskDefinitionMap, taskOutput, Map.of(), clusterTypesProviderMap, errors, warnings);
+    }
+
+    public static void validateWorkflowTasks(
+        List<JsonNode> taskJsonNodes, Map<String, List<PropertyInfo>> taskDefinitionMap,
+        Map<String, PropertyInfo> taskOutput, Map<String, PropertyInfo> nodeOutputMap,
+        Map<String, List<String>> clusterTypesProviderMap, StringBuilder errors, StringBuilder warnings) {
+
         ValidationContext context = ValidationContext.of(
-            taskJsonNodes, taskDefinitionMap, taskOutput, clusterTypesProviderMap, errors, warnings);
+            taskJsonNodes, taskDefinitionMap, taskOutput, nodeOutputMap, clusterTypesProviderMap, errors, warnings);
 
         TaskValidator.validateAllTasks(context);
     }
@@ -432,7 +458,7 @@ private static void processTasks(
     private static void processTriggers(
         TaskDefinitionProvider taskDefinitionProvider, TaskOutputProvider taskOutputProvider,
         Map<String, List<PropertyInfo>> taskDefinitionPropertyInfosMap,
-        Map<String, @Nullable PropertyInfo> taskOutputPropertyInfoMap, StringBuilder errors, StringBuilder warnings,
+        Map<String, @Nullable PropertyInfo> taskOutputPropertyInfoMap, StringBuilder warnings,
         JsonNode workflowJsonNode, List<JsonNode> taskJsonNodes) {
 
         JsonNode triggersJsonNode = workflowJsonNode.get("triggers");
@@ -441,20 +467,16 @@ private static void processTriggers(
             Iterator<JsonNode> iterator = triggersJsonNode.iterator();
 
             iterator.forEachRemaining(triggerJsonNode -> {
-                if (taskJsonNodes.isEmpty()) {
-                    taskJsonNodes.add(triggerJsonNode);
+                taskJsonNodes.add(triggerJsonNode);
 
-                    JsonNode typeJsonNode = triggerJsonNode.get("type");
+                JsonNode typeJsonNode = triggerJsonNode.get("type");
 
-                    String type = typeJsonNode.asString();
+                String type = typeJsonNode.asString();
 
-                    taskDefinitionPropertyInfosMap.putIfAbsent(
-                        type, taskDefinitionProvider.getTaskProperties(type, "trigger"));
-                    taskOutputPropertyInfoMap.putIfAbsent(
-                        type, taskOutputProvider.getTaskOutputProperty(type, "trigger", warnings));
-                } else {
-                    errors.append("There can only be one trigger in the workflow");
-                }
+                taskDefinitionPropertyInfosMap.putIfAbsent(
+                    type, taskDefinitionProvider.getTaskProperties(type, "trigger"));
+                taskOutputPropertyInfoMap.putIfAbsent(
+                    type, taskOutputProvider.getTaskOutputProperty(type, "trigger", warnings));
             });
         }
     }
@@ -634,13 +656,11 @@ private static void validateWorkflowTriggerFields(JsonNode workflowJsonNode, Str
 
             if (!triggersJsonNode.isArray()) {
                 StringUtils.appendWithNewline("Field 'triggers' must be an array", errors);
-            } else if (triggersJsonNode.size() > 1) {
-                StringUtils.appendWithNewline("Field 'triggers' must contain one or less objects", errors);
             } else {
-                JsonNode jsonNode = triggersJsonNode.get(0);
-
-                if (triggersJsonNode.size() == 1 && !jsonNode.isObject()) {
-                    StringUtils.appendWithNewline("Trigger must be an object", errors);
+                for (JsonNode triggerJsonNode : triggersJsonNode) {
+                    if (!triggerJsonNode.isObject()) {
+                        StringUtils.appendWithNewline("Trigger must be an object", errors);
+                    }
                 }
             }
         }
diff --git a/server/libs/platform/platform-workflow/platform-workflow-validator/platform-workflow-validator-service/src/main/java/com/bytechef/platform/workflow/validator/WorkflowValidatorFacadeImpl.java b/server/libs/platform/platform-workflow/platform-workflow-validator/platform-workflow-validator-service/src/main/java/com/bytechef/platform/workflow/validator/WorkflowValidatorFacadeImpl.java
index 40fbfc20e0b..ec394b68590 100644
--- a/server/libs/platform/platform-workflow/platform-workflow-validator/platform-workflow-validator-service/src/main/java/com/bytechef/platform/workflow/validator/WorkflowValidatorFacadeImpl.java
+++ b/server/libs/platform/platform-workflow/platform-workflow-validator/platform-workflow-validator-service/src/main/java/com/bytechef/platform/workflow/validator/WorkflowValidatorFacadeImpl.java
@@ -19,6 +19,7 @@
 import com.bytechef.atlas.configuration.domain.Workflow;
 import com.bytechef.atlas.configuration.service.WorkflowService;
 import com.bytechef.commons.util.CollectionUtils;
+import com.bytechef.commons.util.JsonUtils;
 import com.bytechef.component.definition.ClusterElementDefinition;
 import com.bytechef.platform.component.domain.ActionDefinition;
 import com.bytechef.platform.component.domain.ArrayProperty;
@@ -27,6 +28,8 @@
 import com.bytechef.platform.component.domain.ObjectProperty;
 import com.bytechef.platform.component.domain.Property;
 import com.bytechef.platform.component.domain.TriggerDefinition;
+import com.bytechef.platform.component.facade.ActionDefinitionFacade;
+import com.bytechef.platform.component.facade.TriggerDefinitionFacade;
 import com.bytechef.platform.component.service.ActionDefinitionService;
 import com.bytechef.platform.component.service.ClusterElementDefinitionService;
 import com.bytechef.platform.component.service.ComponentDefinitionService;
@@ -41,10 +44,15 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Stream;
 import org.jspecify.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
+import tools.jackson.core.type.TypeReference;
+import tools.jackson.databind.JsonNode;
 
 /**
  * @author Marko Kriskovic
@@ -52,26 +60,32 @@
 @Service
 public class WorkflowValidatorFacadeImpl implements WorkflowValidatorFacade {
 
+    private static final Logger log = LoggerFactory.getLogger(WorkflowValidatorFacadeImpl.class);
+
+    private final ActionDefinitionFacade actionDefinitionFacade;
     private final ActionDefinitionService actionDefinitionService;
     private final ClusterElementDefinitionService clusterElementDefinitionService;
     private final ComponentDefinitionService componentDefinitionService;
     private final TaskDispatcherDefinitionService taskDispatcherDefinitionService;
+    private final TriggerDefinitionFacade triggerDefinitionFacade;
     private final TriggerDefinitionService triggerDefinitionService;
     private final WorkflowService workflowService;
 
     @SuppressFBWarnings("EI2")
     public WorkflowValidatorFacadeImpl(
-        ActionDefinitionService actionDefinitionService,
+        ActionDefinitionFacade actionDefinitionFacade, ActionDefinitionService actionDefinitionService,
         ClusterElementDefinitionService clusterElementDefinitionService,
         ComponentDefinitionService componentDefinitionService,
         TaskDispatcherDefinitionService taskDispatcherDefinitionService,
-        TriggerDefinitionService triggerDefinitionService,
+        TriggerDefinitionFacade triggerDefinitionFacade, TriggerDefinitionService triggerDefinitionService,
         WorkflowService workflowService) {
 
+        this.actionDefinitionFacade = actionDefinitionFacade;
         this.actionDefinitionService = actionDefinitionService;
         this.clusterElementDefinitionService = clusterElementDefinitionService;
         this.componentDefinitionService = componentDefinitionService;
         this.taskDispatcherDefinitionService = taskDispatcherDefinitionService;
+        this.triggerDefinitionFacade = triggerDefinitionFacade;
         this.triggerDefinitionService = triggerDefinitionService;
         this.workflowService = workflowService;
     }
@@ -83,8 +97,7 @@ public WorkflowValidationResult validateWorkflow(String workflow) {
 
         WorkflowValidator.validateWorkflow(
             workflow, this::getTaskProperties, this::getTaskOutputProperty, this::getClusterElementTypes,
-            new HashMap<>(), new HashMap<>(), new HashMap<>(),
-            errors, warnings);
+            new HashMap<>(), new HashMap<>(), buildNodeOutputMap(workflow), new HashMap<>(), errors, warnings);
 
         String errorsString = errors.toString();
 
@@ -207,6 +220,84 @@ private PropertyInfo getTaskOutputProperty(String taskType, String kind, StringB
         }
     }
 
+    private Map<String, PropertyInfo> buildNodeOutputMap(String workflow) {
+        Map<String, PropertyInfo> nodeOutputMap = new HashMap<>();
+
+        try {
+            JsonNode workflowJsonNode = JsonUtils.readTree(workflow);
+
+            addNodeOutputs(workflowJsonNode.get("triggers"), true, nodeOutputMap);
+            addNodeOutputs(workflowJsonNode.get("tasks"), false, nodeOutputMap);
+        } catch (Exception e) {
+            log.debug("Failed to build config-aware node output map; falling back to static validation", e);
+        }
+
+        return nodeOutputMap;
+    }
+
+    private void addNodeOutputs(@Nullable JsonNode nodesJsonNode, boolean trigger, Map<String, PropertyInfo> map) {
+        if (nodesJsonNode == null || !nodesJsonNode.isArray()) {
+            return;
+        }
+
+        for (JsonNode nodeJsonNode : nodesJsonNode) {
+            if (!nodeJsonNode.has("name") || !nodeJsonNode.has("type")) {
+                continue;
+            }
+
+            PropertyInfo outputProperty = resolveDynamicOutput(
+                nodeJsonNode.get("type")
+                    .asString(),
+                trigger, toInputParameters(nodeJsonNode.get("parameters")));
+
+            if (outputProperty != null) {
+                map.put(
+                    nodeJsonNode.get("name")
+                        .asString(),
+                    outputProperty);
+            }
+        }
+    }
+
+    private @Nullable PropertyInfo resolveDynamicOutput(
+        String type, boolean trigger, Map<String, ?> inputParameters) {
+
+        try {
+            WorkflowNodeType workflowNodeType = WorkflowNodeType.ofType(type);
+
+            OutputResponse outputResponse;
+
+            if (trigger) {
+                outputResponse = triggerDefinitionFacade.executeOutput(
+                    workflowNodeType.name(), workflowNodeType.version(),
+                    Objects.requireNonNull(workflowNodeType.operation()), inputParameters, null);
+            } else if (workflowNodeType.operation() != null) {
+                outputResponse = actionDefinitionFacade.executeOutput(
+                    workflowNodeType.name(), workflowNodeType.version(), workflowNodeType.operation(), inputParameters,
+                    Map.of());
+            } else {
+                return null;
+            }
+
+            if (outputResponse != null && outputResponse.outputSchema() != null) {
+                return toPropertyInfo(outputResponse.outputSchema());
+            }
+        } catch (Exception e) {
+            // Best-effort: connection-needed or otherwise unresolvable dynamic output → fall back to the static path.
+            log.debug("Failed to resolve dynamic output for node type '{}'; falling back to the static path", type, e);
+        }
+
+        return null;
+    }
+
+    private static Map<String, ?> toInputParameters(@Nullable JsonNode parametersJsonNode) {
+        if (parametersJsonNode == null || !parametersJsonNode.isObject()) {
+            return Map.of();
+        }
+
+        return JsonUtils.read(JsonUtils.write(parametersJsonNode), new TypeReference<Map<String, Object>>() {});
+    }
+
     @Nullable
     private List<String> getClusterElementTypes(String taskType) {
         WorkflowNodeType workflowNodeType = WorkflowNodeType.ofType(taskType);
diff --git a/server/libs/platform/platform-workflow/platform-workflow-validator/platform-workflow-validator-service/src/test/java/com/bytechef/platform/workflow/validator/WorkflowValidatorConfigAwareOutputTest.java b/server/libs/platform/platform-workflow/platform-workflow-validator/platform-workflow-validator-service/src/test/java/com/bytechef/platform/workflow/validator/WorkflowValidatorConfigAwareOutputTest.java
new file mode 100644
index 00000000000..5f8b2fba901
--- /dev/null
+++ b/server/libs/platform/platform-workflow/platform-workflow-validator/platform-workflow-validator-service/src/test/java/com/bytechef/platform/workflow/validator/WorkflowValidatorConfigAwareOutputTest.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.bytechef.platform.workflow.validator;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import com.bytechef.commons.util.JsonUtils;
+import com.bytechef.platform.workflow.validator.model.PropertyInfo;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import tools.jackson.databind.json.JsonMapper;
+
+/**
+ * @author Ivica Cardic
+ */
+class WorkflowValidatorConfigAwareOutputTest {
+
+    private static final String WORKFLOW = """
+        {
+            "label": "Summarize email",
+            "description": "Summarize a new Gmail email and post to Slack",
+            "triggers": [
+                {
+                    "label": "New Email",
+                    "name": "newEmail_1",
+                    "type": "googleMail/v1/newEmail",
+                    "parameters": {
+                        "format": "FULL"
+                    }
+                }
+            ],
+            "tasks": [
+                {
+                    "label": "Ask",
+                    "name": "openAi_1",
+                    "type": "openAi/v1/ask",
+                    "parameters": {
+                        "userPrompt": "${newEmail_1.bodyPlain}"
+                    }
+                }
+            ]
+        }
+        """;
+
+    private static final Map<String, List<PropertyInfo>> TASK_DEFINITION_MAP = Map.of(
+        "googleMail/v1/newEmail", List.of(
+            new PropertyInfo("format", "STRING", null, false, false, null, null)),
+        "openAi/v1/ask", List.of(
+            new PropertyInfo("userPrompt", "STRING", null, true, true, null, null)));
+
+    private static final WorkflowValidator.TaskDefinitionProvider TASK_DEFINITION_PROVIDER =
+        (taskType, kind) -> TASK_DEFINITION_MAP.get(taskType);
+    private static final WorkflowValidator.TaskOutputProvider EMPTY_TASK_OUTPUT_PROVIDER =
+        (taskType, kind, warnings) -> null;
+    private static final WorkflowValidator.ClusterTypesProvider EMPTY_CLUSTER_TYPES_PROVIDER = taskType -> null;
+
+    @BeforeAll
+    static void beforeAll() {
+        JsonUtils.setObjectMapper(
+            JsonMapper.builder()
+                .build());
+    }
+
+    @Test
+    void testMissingPropertyInConfigResolvedOutputIsError() {
+        // format=FULL output: from/subject present, bodyPlain absent.
+        PropertyInfo fullOutput = output(
+            new PropertyInfo("from", "STRING", null, false, false, null, null),
+            new PropertyInfo("subject", "STRING", null, false, false, null, null));
+
+        StringBuilder errors = new StringBuilder();
+        StringBuilder warnings = new StringBuilder();
+
+        WorkflowValidator.validateWorkflow(
+            WORKFLOW, TASK_DEFINITION_PROVIDER, EMPTY_TASK_OUTPUT_PROVIDER, EMPTY_CLUSTER_TYPES_PROVIDER,
+            new HashMap<>(), new HashMap<>(), Map.of("newEmail_1", fullOutput), new HashMap<>(), errors, warnings);
+
+        assertTrue(
+            errors.toString()
+                .contains("Property 'newEmail_1.bodyPlain' does not exist in the output of 'googleMail/v1/newEmail'"),
+            "Expected a config-aware missing-property error, got: " + errors);
+    }
+
+    @Test
+    void testPresentPropertyInConfigResolvedOutputIsValid() {
+        // A simplified output that does expose bodyPlain.
+        PropertyInfo simpleOutput = output(
+            new PropertyInfo("from", "STRING", null, false, false, null, null),
+            new PropertyInfo("subject", "STRING", null, false, false, null, null),
+            new PropertyInfo("bodyPlain", "STRING", null, false, false, null, null));
+
+        StringBuilder errors = new StringBuilder();
+        StringBuilder warnings = new StringBuilder();
+
+        WorkflowValidator.validateWorkflow(
+            WORKFLOW, TASK_DEFINITION_PROVIDER, EMPTY_TASK_OUTPUT_PROVIDER, EMPTY_CLUSTER_TYPES_PROVIDER,
+            new HashMap<>(), new HashMap<>(), Map.of("newEmail_1", simpleOutput), new HashMap<>(), errors, warnings);
+
+        assertEquals("", errors.toString());
+    }
+
+    private static PropertyInfo output(PropertyInfo... nestedProperties) {
+        return new PropertyInfo("output", "OBJECT", null, false, false, null, null, List.of(nestedProperties));
+    }
+}
diff --git a/server/libs/platform/platform-workflow/platform-workflow-validator/platform-workflow-validator-service/src/test/java/com/bytechef/platform/workflow/validator/WorkflowValidatorTest.java b/server/libs/platform/platform-workflow/platform-workflow-validator/platform-workflow-validator-service/src/test/java/com/bytechef/platform/workflow/validator/WorkflowValidatorTest.java
index e1a4ca844a3..33a16f711e5 100644
--- a/server/libs/platform/platform-workflow/platform-workflow-validator/platform-workflow-validator-service/src/test/java/com/bytechef/platform/workflow/validator/WorkflowValidatorTest.java
+++ b/server/libs/platform/platform-workflow/platform-workflow-validator/platform-workflow-validator-service/src/test/java/com/bytechef/platform/workflow/validator/WorkflowValidatorTest.java
@@ -2743,8 +2743,8 @@ void validateWorkflowStructureNonArrayTriggersAddsError() {
     }
 
     @Test
-    void validateWorkflowStructureMultipleTriggersAddsError() {
-        String invalidWorkflow = """
+    void validateWorkflowStructureMultipleTriggersAllowed() {
+        String workflow = """
             {
                 "label": "workflowName",
                 "description": "workflowDescription",
@@ -2767,9 +2767,9 @@ void validateWorkflowStructureMultipleTriggersAddsError() {
 
         StringBuilder errors = new StringBuilder();
 
-        WorkflowValidator.validateWorkflowStructure(invalidWorkflow, errors);
+        WorkflowValidator.validateWorkflowStructure(workflow, errors);
 
-        assertEquals("Field 'triggers' must contain one or less objects", errors.toString());
+        assertEquals("", errors.toString());
     }
 
     @Test