diff --git a/packages/components/nodes/agents/ConversationalRetrievalAgent/ConversationalRetrievalAgent.ts b/packages/components/nodes/agents/ConversationalRetrievalAgent/ConversationalRetrievalAgent.ts
index 7b71cb5f8..c6354e18d 100644
--- a/packages/components/nodes/agents/ConversationalRetrievalAgent/ConversationalRetrievalAgent.ts
+++ b/packages/components/nodes/agents/ConversationalRetrievalAgent/ConversationalRetrievalAgent.ts
@@ -21,7 +21,7 @@ class ConversationalRetrievalAgent_Agents implements INode {
     constructor() {
         this.label = 'Conversational Retrieval Agent'
         this.name = 'conversationalRetrievalAgent'
-        this.version = 2.0
+        this.version = 3.0
         this.type = 'AgentExecutor'
         this.category = 'Agents'
         this.icon = 'agent.svg'
@@ -42,7 +42,7 @@ class ConversationalRetrievalAgent_Agents implements INode {
             {
                 label: 'OpenAI/Azure Chat Model',
                 name: 'model',
-                type: 'ChatOpenAI | AzureChatOpenAI'
+                type: 'BaseChatModel'
             },
             {
                 label: 'System Message',
diff --git a/packages/components/nodes/agents/OpenAIFunctionAgent/OpenAIFunctionAgent.ts b/packages/components/nodes/agents/OpenAIFunctionAgent/OpenAIFunctionAgent.ts
index ce6f576fc..25a540e87 100644
--- a/packages/components/nodes/agents/OpenAIFunctionAgent/OpenAIFunctionAgent.ts
+++ b/packages/components/nodes/agents/OpenAIFunctionAgent/OpenAIFunctionAgent.ts
@@ -20,7 +20,7 @@ class OpenAIFunctionAgent_Agents implements INode {
     constructor() {
         this.label = 'OpenAI Function Agent'
         this.name = 'openAIFunctionAgent'
-        this.version = 2.0
+        this.version = 3.0
         this.type = 'AgentExecutor'
         this.category = 'Agents'
         this.icon = 'openai.png'
@@ -41,7 +41,7 @@ class OpenAIFunctionAgent_Agents implements INode {
             {
                 label: 'OpenAI/Azure Chat Model',
                 name: 'model',
-                type: 'ChatOpenAI | AzureChatOpenAI'
+                type: 'BaseChatModel'
             },
             {
                 label: 'System Message',
diff --git a/packages/server/marketplaces/chatflows/API Agent OpenAI.json b/packages/server/marketplaces/chatflows/API Agent OpenAI.json
index 4950a6a66..1a07e60db 100644
--- a/packages/server/marketplaces/chatflows/API Agent OpenAI.json	
+++ b/packages/server/marketplaces/chatflows/API Agent OpenAI.json	
@@ -334,7 +334,7 @@
                 "id": "openAIFunctionAgent_0",
                 "label": "OpenAI Function Agent",
                 "name": "openAIFunctionAgent",
-                "version": 2,
+                "version": 3,
                 "type": "AgentExecutor",
                 "baseClasses": ["AgentExecutor", "BaseChain"],
                 "category": "Agents",
@@ -367,8 +367,8 @@
                     {
                         "label": "OpenAI/Azure Chat Model",
                         "name": "model",
-                        "type": "ChatOpenAI | AzureChatOpenAI",
-                        "id": "openAIFunctionAgent_0-input-model-ChatOpenAI | AzureChatOpenAI"
+                        "type": "BaseChatModel",
+                        "id": "openAIFunctionAgent_0-input-model-BaseChatModel"
                     }
                 ],
                 "inputs": {
diff --git a/packages/server/marketplaces/chatflows/Conversational Retrieval Agent.json b/packages/server/marketplaces/chatflows/Conversational Retrieval Agent.json
index 800ae3000..0e9e41bdd 100644
--- a/packages/server/marketplaces/chatflows/Conversational Retrieval Agent.json	
+++ b/packages/server/marketplaces/chatflows/Conversational Retrieval Agent.json	
@@ -98,7 +98,7 @@
             "data": {
                 "id": "conversationalRetrievalAgent_0",
                 "label": "Conversational Retrieval Agent",
-                "version": 2,
+                "version": 3,
                 "name": "conversationalRetrievalAgent",
                 "type": "AgentExecutor",
                 "baseClasses": ["AgentExecutor", "BaseChain", "Runnable"],
@@ -132,8 +132,8 @@
                     {
                         "label": "OpenAI/Azure Chat Model",
                         "name": "model",
-                        "type": "ChatOpenAI | AzureChatOpenAI",
-                        "id": "conversationalRetrievalAgent_0-input-model-ChatOpenAI | AzureChatOpenAI"
+                        "type": "BaseChatModel",
+                        "id": "conversationalRetrievalAgent_0-input-model-BaseChatModel"
                     }
                 ],
                 "inputs": {
@@ -642,9 +642,9 @@
             "source": "chatOpenAI_0",
             "sourceHandle": "chatOpenAI_0-output-chatOpenAI-ChatOpenAI|BaseChatModel|BaseLanguageModel|Runnable",
             "target": "conversationalRetrievalAgent_0",
-            "targetHandle": "conversationalRetrievalAgent_0-input-model-ChatOpenAI",
+            "targetHandle": "conversationalRetrievalAgent_0-input-model-BaseChatModel",
             "type": "buttonedge",
-            "id": "chatOpenAI_0-chatOpenAI_0-output-chatOpenAI-ChatOpenAI|BaseChatModel|BaseLanguageModel|Runnable-conversationalRetrievalAgent_0-conversationalRetrievalAgent_0-input-model-ChatOpenAI",
+            "id": "chatOpenAI_0-chatOpenAI_0-output-chatOpenAI-ChatOpenAI|BaseChatModel|BaseLanguageModel|Runnable-conversationalRetrievalAgent_0-conversationalRetrievalAgent_0-input-model-BaseChatModel",
             "data": {
                 "label": ""
             }
diff --git a/packages/server/marketplaces/chatflows/OpenAI Agent.json b/packages/server/marketplaces/chatflows/OpenAI Agent.json
index bc27a9fe8..931bae0c5 100644
--- a/packages/server/marketplaces/chatflows/OpenAI Agent.json	
+++ b/packages/server/marketplaces/chatflows/OpenAI Agent.json	
@@ -206,7 +206,7 @@
                 "id": "openAIFunctionAgent_0",
                 "label": "OpenAI Function Agent",
                 "name": "openAIFunctionAgent",
-                "version": 2,
+                "version": 3,
                 "type": "AgentExecutor",
                 "baseClasses": ["AgentExecutor", "BaseChain"],
                 "category": "Agents",
@@ -239,8 +239,8 @@
                     {
                         "label": "OpenAI/Azure Chat Model",
                         "name": "model",
-                        "type": "ChatOpenAI | AzureChatOpenAI",
-                        "id": "openAIFunctionAgent_0-input-model-ChatOpenAI | AzureChatOpenAI"
+                        "type": "BaseChatModel",
+                        "id": "openAIFunctionAgent_0-input-model-BaseChatModel"
                     }
                 ],
                 "inputs": {