diff --git a/packages/components/credentials/AWSCredential.credential.ts b/packages/components/credentials/AWSCredential.credential.ts
new file mode 100644
index 00000000..3c9dd3a6
--- /dev/null
+++ b/packages/components/credentials/AWSCredential.credential.ts
@@ -0,0 +1,47 @@
+import { INodeParams, INodeCredential } from '../src/Interface'
+
+class AWSApi implements INodeCredential {
+    label: string
+    name: string
+    version: number
+    description: string
+    optional: boolean
+    inputs: INodeParams[]
+
+    constructor() {
+        this.label = 'AWS security credentials'
+        this.name = 'awsApi'
+        this.version = 1.0
+        this.description =
+            'Your <a target="_blank" href="https://docs.aws.amazon.com/IAM/latest/UserGuide/security-creds.html">AWS security credentials</a>. When unspecified, credentials will be sourced from the runtime environment according to the default AWS SDK behavior.'
+        this.optional = true
+        this.inputs = [
+            {
+                label: 'AWS Access Key',
+                name: 'awsKey',
+                type: 'string',
+                placeholder: '<AWS_ACCESS_KEY_ID>',
+                description: 'The access key for your AWS account.',
+                optional: true
+            },
+            {
+                label: 'AWS Secret Access Key',
+                name: 'awsSecret',
+                type: 'password',
+                placeholder: '<AWS_SECRET_ACCESS_KEY>',
+                description: 'The secret key for your AWS account.',
+                optional: true
+            },
+            {
+                label: 'AWS Session Key',
+                name: 'awsSession',
+                type: 'password',
+                placeholder: '<AWS_SESSION_TOKEN>',
+                description: 'The session key for your AWS account. This is only needed when you are using temporary credentials.',
+                optional: true
+            }
+        ]
+    }
+}
+
+module.exports = { credClass: AWSApi }
diff --git a/packages/components/nodes/chatmodels/AWSBedrock/AWSChatBedrock.ts b/packages/components/nodes/chatmodels/AWSBedrock/AWSChatBedrock.ts
new file mode 100644
index 00000000..f5fa8bba
--- /dev/null
+++ b/packages/components/nodes/chatmodels/AWSBedrock/AWSChatBedrock.ts
@@ -0,0 +1,166 @@
+import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface'
+import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils'
+import { ChatBedrock } from 'langchain/chat_models/bedrock'
+import { BaseBedrockInput } from 'langchain/dist/util/bedrock'
+
+/**
+ * I had to run the following to build the component
+ * and get the icon copied over to the dist directory
+ * Flowise/packages/components > yarn build
+ *
+ * @author Michael Connor <mlconnor@yahoo.com>
+ */
+class AWSChatBedrock_ChatModels implements INode {
+    label: string
+    name: string
+    version: number
+    type: string
+    icon: string
+    category: string
+    description: string
+    baseClasses: string[]
+    credential: INodeParams
+    inputs: INodeParams[]
+
+    constructor() {
+        this.label = 'AWS Bedrock'
+        this.name = 'awsChatBedrock'
+        this.version = 1.1
+        this.type = 'AWSChatBedrock'
+        this.icon = 'awsBedrock.png'
+        this.category = 'Chat Models'
+        this.description = 'Wrapper around AWS Bedrock large language models'
+        this.baseClasses = [this.type, ...getBaseClasses(ChatBedrock)]
+        this.credential = {
+            label: 'AWS Credential',
+            name: 'credential',
+            type: 'credential',
+            credentialNames: ['awsApi'],
+            optional: true
+        }
+        this.inputs = [
+            {
+                label: 'Region',
+                name: 'region',
+                type: 'options',
+                options: [
+                    { label: 'af-south-1', name: 'af-south-1' },
+                    { label: 'ap-east-1', name: 'ap-east-1' },
+                    { label: 'ap-northeast-1', name: 'ap-northeast-1' },
+                    { label: 'ap-northeast-2', name: 'ap-northeast-2' },
+                    { label: 'ap-northeast-3', name: 'ap-northeast-3' },
+                    { label: 'ap-south-1', name: 'ap-south-1' },
+                    { label: 'ap-south-2', name: 'ap-south-2' },
+                    { label: 'ap-southeast-1', name: 'ap-southeast-1' },
+                    { label: 'ap-southeast-2', name: 'ap-southeast-2' },
+                    { label: 'ap-southeast-3', name: 'ap-southeast-3' },
+                    { label: 'ap-southeast-4', name: 'ap-southeast-4' },
+                    { label: 'ap-southeast-5', name: 'ap-southeast-5' },
+                    { label: 'ap-southeast-6', name: 'ap-southeast-6' },
+                    { label: 'ca-central-1', name: 'ca-central-1' },
+                    { label: 'ca-west-1', name: 'ca-west-1' },
+                    { label: 'cn-north-1', name: 'cn-north-1' },
+                    { label: 'cn-northwest-1', name: 'cn-northwest-1' },
+                    { label: 'eu-central-1', name: 'eu-central-1' },
+                    { label: 'eu-central-2', name: 'eu-central-2' },
+                    { label: 'eu-north-1', name: 'eu-north-1' },
+                    { label: 'eu-south-1', name: 'eu-south-1' },
+                    { label: 'eu-south-2', name: 'eu-south-2' },
+                    { label: 'eu-west-1', name: 'eu-west-1' },
+                    { label: 'eu-west-2', name: 'eu-west-2' },
+                    { label: 'eu-west-3', name: 'eu-west-3' },
+                    { label: 'il-central-1', name: 'il-central-1' },
+                    { label: 'me-central-1', name: 'me-central-1' },
+                    { label: 'me-south-1', name: 'me-south-1' },
+                    { label: 'sa-east-1', name: 'sa-east-1' },
+                    { label: 'us-east-1', name: 'us-east-1' },
+                    { label: 'us-east-2', name: 'us-east-2' },
+                    { label: 'us-gov-east-1', name: 'us-gov-east-1' },
+                    { label: 'us-gov-west-1', name: 'us-gov-west-1' },
+                    { label: 'us-west-1', name: 'us-west-1' },
+                    { label: 'us-west-2', name: 'us-west-2' }
+                ],
+                default: 'us-east-1',
+                optional: false
+            },
+            {
+                label: 'Model Name',
+                name: 'model',
+                type: 'options',
+                options: [
+                    { label: 'amazon.titan-tg1-large', name: 'amazon.titan-tg1-large' },
+                    { label: 'amazon.titan-e1t-medium', name: 'amazon.titan-e1t-medium' },
+                    { label: 'stability.stable-diffusion-xl', name: 'stability.stable-diffusion-xl' },
+                    { label: 'ai21.j2-grande-instruct', name: 'ai21.j2-grande-instruct' },
+                    { label: 'ai21.j2-jumbo-instruct', name: 'ai21.j2-jumbo-instruct' },
+                    { label: 'ai21.j2-mid', name: 'ai21.j2-mid' },
+                    { label: 'ai21.j2-ultra', name: 'ai21.j2-ultra' },
+                    { label: 'anthropic.claude-instant-v1', name: 'anthropic.claude-instant-v1' },
+                    { label: 'anthropic.claude-v1', name: 'anthropic.claude-v1' },
+                    { label: 'anthropic.claude-v2', name: 'anthropic.claude-v2' }
+                ],
+                default: 'anthropic.claude-v2',
+                optional: false
+            },
+            {
+                label: 'Temperature',
+                name: 'temperature',
+                type: 'number',
+                step: 0.1,
+                description: 'Temperature parameter may not apply to certain model. Please check available model parameters',
+                optional: true,
+                default: 0.7,
+                additionalParams: false
+            },
+            {
+                label: 'Max Tokens to Sample',
+                name: 'max_tokens_to_sample',
+                type: 'number',
+                step: 10,
+                description: 'Max Tokens parameter may not apply to certain model. Please check available model parameters',
+                optional: false,
+                default: 200,
+                additionalParams: false
+            }
+        ]
+    }
+
+    async init(nodeData: INodeData, _: string, options: ICommonObject): Promise<any> {
+        const iRegion = nodeData.inputs?.region as string
+        const iModel = nodeData.inputs?.model as string
+        const iTemperature = nodeData.inputs?.temperature as string
+        const iMax_tokens_to_sample = nodeData.inputs?.max_tokens_to_sample as string
+
+        const obj: BaseBedrockInput = {
+            region: iRegion,
+            model: iModel,
+            maxTokens: parseInt(iMax_tokens_to_sample, 10),
+            temperature: parseFloat(iTemperature)
+        }
+
+        /**
+         * Long-term credentials specified in LLM configuration are optional.
+         * Bedrock's credential provider falls back to the AWS SDK to fetch
+         * credentials from the running environment.
+         * When specified, we override the default provider with configured values.
+         * @see https://github.com/aws/aws-sdk-js-v3/blob/main/packages/credential-provider-node/README.md
+         */
+        const credentialData = await getCredentialData(nodeData.credential ?? '', options)
+        if (credentialData && Object.keys(credentialData).length !== 0) {
+            const credentialApiKey = getCredentialParam('awsKey', credentialData, nodeData)
+            const credentialApiSecret = getCredentialParam('awsSecret', credentialData, nodeData)
+            const credentialApiSession = getCredentialParam('awsSession', credentialData, nodeData)
+
+            obj.credentials = {
+                accessKeyId: credentialApiKey,
+                secretAccessKey: credentialApiSecret,
+                sessionToken: credentialApiSession
+            }
+        }
+
+        const amazonBedrock = new ChatBedrock(obj)
+        return amazonBedrock
+    }
+}
+
+module.exports = { nodeClass: AWSChatBedrock_ChatModels }
diff --git a/packages/components/nodes/chatmodels/AWSBedrock/awsBedrock.png b/packages/components/nodes/chatmodels/AWSBedrock/awsBedrock.png
new file mode 100644
index 00000000..483bc69a
Binary files /dev/null and b/packages/components/nodes/chatmodels/AWSBedrock/awsBedrock.png differ
diff --git a/packages/components/nodes/llms/AWSBedrock/AWSBedrock.ts b/packages/components/nodes/llms/AWSBedrock/AWSBedrock.ts
new file mode 100644
index 00000000..68ee7ed2
--- /dev/null
+++ b/packages/components/nodes/llms/AWSBedrock/AWSBedrock.ts
@@ -0,0 +1,166 @@
+import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface'
+import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils'
+import { Bedrock } from 'langchain/llms/bedrock'
+import { BaseBedrockInput } from 'langchain/dist/util/bedrock'
+
+/**
+ * I had to run the following to build the component
+ * and get the icon copied over to the dist directory
+ * Flowise/packages/components > yarn build
+ *
+ * @author Michael Connor <mlconnor@yahoo.com>
+ */
+class AWSBedrock_LLMs implements INode {
+    label: string
+    name: string
+    version: number
+    type: string
+    icon: string
+    category: string
+    description: string
+    baseClasses: string[]
+    credential: INodeParams
+    inputs: INodeParams[]
+
+    constructor() {
+        this.label = 'AWS Bedrock'
+        this.name = 'awsBedrock'
+        this.version = 1.2
+        this.type = 'AWSBedrock'
+        this.icon = 'awsBedrock.png'
+        this.category = 'LLMs'
+        this.description = 'Wrapper around AWS Bedrock large language models'
+        this.baseClasses = [this.type, ...getBaseClasses(Bedrock)]
+        this.credential = {
+            label: 'AWS Credential',
+            name: 'credential',
+            type: 'credential',
+            credentialNames: ['awsApi'],
+            optional: true
+        }
+        this.inputs = [
+            {
+                label: 'Region',
+                name: 'region',
+                type: 'options',
+                options: [
+                    { label: 'af-south-1', name: 'af-south-1' },
+                    { label: 'ap-east-1', name: 'ap-east-1' },
+                    { label: 'ap-northeast-1', name: 'ap-northeast-1' },
+                    { label: 'ap-northeast-2', name: 'ap-northeast-2' },
+                    { label: 'ap-northeast-3', name: 'ap-northeast-3' },
+                    { label: 'ap-south-1', name: 'ap-south-1' },
+                    { label: 'ap-south-2', name: 'ap-south-2' },
+                    { label: 'ap-southeast-1', name: 'ap-southeast-1' },
+                    { label: 'ap-southeast-2', name: 'ap-southeast-2' },
+                    { label: 'ap-southeast-3', name: 'ap-southeast-3' },
+                    { label: 'ap-southeast-4', name: 'ap-southeast-4' },
+                    { label: 'ap-southeast-5', name: 'ap-southeast-5' },
+                    { label: 'ap-southeast-6', name: 'ap-southeast-6' },
+                    { label: 'ca-central-1', name: 'ca-central-1' },
+                    { label: 'ca-west-1', name: 'ca-west-1' },
+                    { label: 'cn-north-1', name: 'cn-north-1' },
+                    { label: 'cn-northwest-1', name: 'cn-northwest-1' },
+                    { label: 'eu-central-1', name: 'eu-central-1' },
+                    { label: 'eu-central-2', name: 'eu-central-2' },
+                    { label: 'eu-north-1', name: 'eu-north-1' },
+                    { label: 'eu-south-1', name: 'eu-south-1' },
+                    { label: 'eu-south-2', name: 'eu-south-2' },
+                    { label: 'eu-west-1', name: 'eu-west-1' },
+                    { label: 'eu-west-2', name: 'eu-west-2' },
+                    { label: 'eu-west-3', name: 'eu-west-3' },
+                    { label: 'il-central-1', name: 'il-central-1' },
+                    { label: 'me-central-1', name: 'me-central-1' },
+                    { label: 'me-south-1', name: 'me-south-1' },
+                    { label: 'sa-east-1', name: 'sa-east-1' },
+                    { label: 'us-east-1', name: 'us-east-1' },
+                    { label: 'us-east-2', name: 'us-east-2' },
+                    { label: 'us-gov-east-1', name: 'us-gov-east-1' },
+                    { label: 'us-gov-west-1', name: 'us-gov-west-1' },
+                    { label: 'us-west-1', name: 'us-west-1' },
+                    { label: 'us-west-2', name: 'us-west-2' }
+                ],
+                default: 'us-east-1',
+                optional: false
+            },
+            {
+                label: 'Model Name',
+                name: 'model',
+                type: 'options',
+                options: [
+                    { label: 'amazon.titan-tg1-large', name: 'amazon.titan-tg1-large' },
+                    { label: 'amazon.titan-e1t-medium', name: 'amazon.titan-e1t-medium' },
+                    { label: 'stability.stable-diffusion-xl', name: 'stability.stable-diffusion-xl' },
+                    { label: 'ai21.j2-grande-instruct', name: 'ai21.j2-grande-instruct' },
+                    { label: 'ai21.j2-jumbo-instruct', name: 'ai21.j2-jumbo-instruct' },
+                    { label: 'ai21.j2-mid', name: 'ai21.j2-mid' },
+                    { label: 'ai21.j2-ultra', name: 'ai21.j2-ultra' },
+                    { label: 'anthropic.claude-instant-v1', name: 'anthropic.claude-instant-v1' },
+                    { label: 'anthropic.claude-v1', name: 'anthropic.claude-v1' },
+                    { label: 'anthropic.claude-v2', name: 'anthropic.claude-v2' }
+                ],
+                default: 'anthropic.claude-v2',
+                optional: false
+            },
+            {
+                label: 'Temperature',
+                name: 'temperature',
+                type: 'number',
+                step: 0.1,
+                description: 'Temperature parameter may not apply to certain model. Please check available model parameters',
+                optional: true,
+                default: 0.7,
+                additionalParams: false
+            },
+            {
+                label: 'Max Tokens to Sample',
+                name: 'max_tokens_to_sample',
+                type: 'number',
+                step: 10,
+                description: 'Max Tokens parameter may not apply to certain model. Please check available model parameters',
+                optional: false,
+                default: 200,
+                additionalParams: false
+            }
+        ]
+    }
+
+    async init(nodeData: INodeData, _: string, options: ICommonObject): Promise<any> {
+        const iRegion = nodeData.inputs?.region as string
+        const iModel = nodeData.inputs?.model as string
+        const iTemperature = nodeData.inputs?.temperature as string
+        const iMax_tokens_to_sample = nodeData.inputs?.max_tokens_to_sample as string
+
+        const obj: Partial<BaseBedrockInput> = {
+            model: iModel,
+            region: iRegion,
+            temperature: parseFloat(iTemperature),
+            maxTokens: parseInt(iMax_tokens_to_sample, 10)
+        }
+
+        /**
+         * Long-term credentials specified in LLM configuration are optional.
+         * Bedrock's credential provider falls back to the AWS SDK to fetch
+         * credentials from the running environment.
+         * When specified, we override the default provider with configured values.
+         * @see https://github.com/aws/aws-sdk-js-v3/blob/main/packages/credential-provider-node/README.md
+         */
+        const credentialData = await getCredentialData(nodeData.credential ?? '', options)
+        if (credentialData && Object.keys(credentialData).length !== 0) {
+            const credentialApiKey = getCredentialParam('awsKey', credentialData, nodeData)
+            const credentialApiSecret = getCredentialParam('awsSecret', credentialData, nodeData)
+            const credentialApiSession = getCredentialParam('awsSession', credentialData, nodeData)
+
+            obj.credentials = {
+                accessKeyId: credentialApiKey,
+                secretAccessKey: credentialApiSecret,
+                sessionToken: credentialApiSession
+            }
+        }
+
+        const amazonBedrock = new Bedrock(obj)
+        return amazonBedrock
+    }
+}
+
+module.exports = { nodeClass: AWSBedrock_LLMs }
diff --git a/packages/components/nodes/llms/AWSBedrock/awsBedrock.png b/packages/components/nodes/llms/AWSBedrock/awsBedrock.png
new file mode 100644
index 00000000..483bc69a
Binary files /dev/null and b/packages/components/nodes/llms/AWSBedrock/awsBedrock.png differ
diff --git a/packages/components/package.json b/packages/components/package.json
index 93609106..ba63cb92 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -42,7 +42,7 @@
         "google-auth-library": "^9.0.0",
         "graphql": "^16.6.0",
         "html-to-text": "^9.0.5",
-        "langchain": "^0.0.152",
+        "langchain": "^0.0.157",
         "langfuse-langchain": "^1.0.14-alpha.0",
         "langsmith": "^0.0.32",
         "linkifyjs": "^4.1.1",
diff --git a/packages/ui/src/views/marketplaces/index.js b/packages/ui/src/views/marketplaces/index.js
index a7836161..49c692db 100644
--- a/packages/ui/src/views/marketplaces/index.js
+++ b/packages/ui/src/views/marketplaces/index.js
@@ -175,19 +175,8 @@ const Marketplace = () => {
                         )}
                     </TabPanel>
                 ))}
-                {!isChatflowsLoading && (!getAllChatflowsMarketplacesApi.data || getAllChatflowsMarketplacesApi.data.length === 0) && (
-                    <Stack sx={{ alignItems: 'center', justifyContent: 'center' }} flexDirection='column'>
-                        <Box sx={{ p: 2, height: 'auto' }}>
-                            <img
-                                style={{ objectFit: 'cover', height: '30vh', width: 'auto' }}
-                                src={WorkflowEmptySVG}
-                                alt='WorkflowEmptySVG'
-                            />
-                        </Box>
-                        <div>No Marketplace Yet</div>
-                    </Stack>
-                )}
-                {!isToolsLoading && (!getAllToolsMarketplacesApi.data || getAllToolsMarketplacesApi.data.length === 0) && (
+                {((!isChatflowsLoading && (!getAllChatflowsMarketplacesApi.data || getAllChatflowsMarketplacesApi.data.length === 0)) ||
+                    (!isToolsLoading && (!getAllToolsMarketplacesApi.data || getAllToolsMarketplacesApi.data.length === 0))) && (
                     <Stack sx={{ alignItems: 'center', justifyContent: 'center' }} flexDirection='column'>
                         <Box sx={{ p: 2, height: 'auto' }}>
                             <img