diff --git a/charts/druid/Chart.yaml b/charts/druid/Chart.yaml
index 45ffcebf..d0024053 100644
--- a/charts/druid/Chart.yaml
+++ b/charts/druid/Chart.yaml
@@ -7,5 +7,5 @@ maintainers:
   - name: Gazza7205
 sources:
   - https://github.com/CAAPIM/apim-charts
-version: 1.0.13
-appVersion: 0.17.0
+version: 1.0.14
+appVersion: 28.0.1
diff --git a/charts/portal/Chart.lock b/charts/portal/Chart.lock
index 6efd356d..e6b4fd96 100644
--- a/charts/portal/Chart.lock
+++ b/charts/portal/Chart.lock
@@ -1,15 +1,15 @@
 dependencies:
 - name: druid
   repository: file://../druid
-  version: 1.0.13
+  version: 1.0.14
 - name: mysql
   repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
-  version: 9.19.1
+  version: 10.3.0
 - name: rabbitmq
   repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
   version: 12.0.3
 - name: ingress-nginx
   repository: https://kubernetes.github.io/ingress-nginx/
-  version: 4.7.2
-digest: sha256:fabdd9a1a279335547e764c767281be489be70ddd02f0d2807e4403e591226eb
-generated: "2024-02-20T14:13:27.1279746+05:30"
+  version: 4.10.0
+digest: sha256:37372a7aae49609a719e1e1d0f9f9c6ba66b41caaeed4892981db2b50289cda4
+generated: "2024-06-20T19:08:34.36457+05:30"
diff --git a/charts/portal/Chart.yaml b/charts/portal/Chart.yaml
index 85d35794..ecfc4cd9 100644
--- a/charts/portal/Chart.yaml
+++ b/charts/portal/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "5.2.3"
+appVersion: "5.3"
 description: CA API Developer Portal
 name: portal
-version: 2.3.8
+version: 2.3.9
 type: application
 home: https://github.com/CAAPIM/apim-charts
 maintainers:
@@ -16,7 +16,7 @@ dependencies:
   condition: portal.analytics.enabled
   repository: "file://../druid"
 - name: mysql
-  version: 9.19.1
+  version: 10.3.0
   repository: "https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami"
   condition: global.setupDemoDatabase
 - name: rabbitmq
@@ -25,5 +25,5 @@ dependencies:
   condition: rabbitmq.enabled
 - name: ingress-nginx
   repository: "https://kubernetes.github.io/ingress-nginx/"
-  version: 4.7.2
+  version: 4.10.0
   condition: ingress.create
diff --git a/charts/portal/README.md b/charts/portal/README.md
index 2afd1e84..10647c8b 100644
--- a/charts/portal/README.md
+++ b/charts/portal/README.md
@@ -3,6 +3,13 @@ The Layer7 API Developer Portal (API Portal) is part of the Layer7 API Managemen
 
 ## Introduction
 This Chart deploys the Layer7 API Developer Portal on a Kubernetes Cluster using the Helm Package Manager.
+## 2.3.9 General Updates
+- This new version of the chart supports API Portal 5.3
+- Upgrade to 2.3.9 is only supported from 2.3.4 chart version as per the Portal version.
+- Ingress-NGINX Subchart is upgraded to version 4.10.0 to support K8s 1.29 version.
+- DB container(for testing) upgraded to support 8.0.37 MySQL version.
+- If the RMQ container fails to start, scale-down the RMQ statefulset, delete the RMQ volume and try again.
+- Refer release notes for more info https://techdocs.broadcom.com/us/en/ca-enterprise-software/layer7-api-management/api-developer-portal/5-3/release-notes-api-developer-portal.html
 ## 2.3.8 General Updates
 - This new version of the chart supports API Portal 5.2.3
 ## 2.3.7 General Updates
@@ -77,7 +84,7 @@ This Chart deploys the Layer7 API Developer Portal on a Kubernetes Cluster using
 Solutions & Patches](https://techdocs.broadcom.com/us/product-content/recommended-reading/technical-document-index/ca-api-developer-portal-solutions-and-patches.html) page.
 
 ### Production
-- A dedicated MySQL 8.0.31/8.0.33/8.0.34 server [See TechDocs for more information](https://techdocs.broadcom.com/us/en/ca-enterprise-software/layer7-api-management/api-developer-portal/5-2/install-configure-and-upgrade/install-portal-on-docker-swarm/configure-an-external-database.html)
+- A dedicated MySQL 8.0.31/8.0.33/8.0.34/8.0.37 server [See TechDocs for more information](https://techdocs.broadcom.com/us/en/ca-enterprise-software/layer7-api-management/api-developer-portal/5-3/install-configure-and-upgrade/install-portal-on-docker-swarm/configure-an-external-database.html)
 - 3 Worker nodes with at least 4vcpu and 32GB ram - High Availability with analytics
 - Access to a DNS Server
 - Signed SSL Server Certificate
@@ -433,18 +440,18 @@ This section describes configurable parameters in **values.yaml**, there is also
 ### Database Node Pool Configurations
 
 #### Common configurations across multiple containers
-| Parameter                                                              | Description                                                                                                                                    | Default       | Container                                                                           |
-|------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|---------------|-------------------------------------------------------------------------------------|
-| `<container>.additionalEnv.DATABASE_POOL_MINPOOLSIZE`                  | Minimum number of Connections a pool will maintain at any given time                                                                           | `5`           | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress`, `pssg` |
-| `<container>.additionalEnv.DATABASE_POOL_MAXPOOLSIZE`                  | Maximum number of Connections a pool will maintain at any given time                                                                           | `30`          | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress`, `pssg` |
-| `<container>.additionalEnv.DATABASE_POOL_CHECKOUTTIMEOUT`              | The number of milliseconds a client calling getConnection() will wait for a Connection to be checked-in or acquired when the pool is exhausted | `30000 (ms)`  | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress`, `pssg` |
-| `<container>.additionalEnv.DATABASE_POOL_MAXSTATEMENTSPERCONNECTION`   | The number of PreparedStatements to be cached for a single pooled Connection                                                                   | `50`          | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress`, `pssg` |
-| `<container>.additionalEnv.DATABASE_POOL_IDLECONNECTIONTESTPERIOD`     | Test all idle, pooled but unchecked-out connections, every this number of seconds                                                              | `300 seconds` | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress`, `pssg` |
-| `<container>.additionalEnv.DATABASE_POOL_INITIALPOOLSIZE`              | Number of Connections a pool will try to acquire upon startup                                                                                  | `5`           | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress`, `pssg` |
-| `<container>.additionalEnv.DATABASE_POOL_MAXSTATEMENTS`                | The size of global PreparedStatement cache                                                                                                     | `300`         | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress`, `pssg` |
-| `<container>.additionalEnv.DATABASE_POOL_MAXCONNECTIONAGE`             | A Connection older than maxConnectionAge will be destroyed and purged from the pool                                                            | `0 seconds`   | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress`, `pssg` |
-| `<container>.additionalEnv.DATABASE_POOL_MAXIDLETIME`                  | Seconds a Connection can remain pooled but unused before being discarded.                                                                      | `0 seconds`   | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress`, `pssg` |
-| `<container>.additionalEnv.DATABASE_POOL_MAXIDLETIMEEXCESSCONNECTIONS` | Number of seconds that Connections in excess of minPoolSize should be permitted to remain idle in the pool before being culled                 | `0 seconds`   | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress`, `pssg` |
+| Parameter                                                              | Description                                                                                                                                    | Default      | Container                                                                           |
+|------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|--------------|-------------------------------------------------------------------------------------|
+| `<container>.additionalEnv.DATABASE_POOL_MINPOOLSIZE`                  | Minimum number of Connections a pool will maintain at any given time                                                                           | `5`          | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress`, `pssg` |
+| `<container>.additionalEnv.DATABASE_POOL_MAXPOOLSIZE`                  | Maximum number of Connections a pool will maintain at any given time                                                                           | `30`         | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress`, `pssg` |
+| `<container>.additionalEnv.DATABASE_POOL_CHECKOUTTIMEOUT`              | The number of milliseconds a client calling getConnection() will wait for a Connection to be checked-in or acquired when the pool is exhausted | `30000 (ms)` | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress`, `pssg` |
+| `<container>.additionalEnv.DATABASE_POOL_MAXSTATEMENTSPERCONNECTION`   | The number of PreparedStatements to be cached for a single pooled Connection                                                                   | `50`         | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress`, `pssg` |
+| `<container>.additionalEnv.DATABASE_POOL_IDLECONNECTIONTESTPERIOD`     | Test all idle, pooled but unchecked-out connections, every this number of seconds                                                              | `60 seconds` | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress`, `pssg` |
+| `<container>.additionalEnv.DATABASE_POOL_INITIALPOOLSIZE`              | Number of Connections a pool will try to acquire upon startup                                                                                  | `5`          | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress`, `pssg` |
+| `<container>.additionalEnv.DATABASE_POOL_MAXSTATEMENTS`                | The size of global PreparedStatement cache                                                                                                     | `300`        | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress`, `pssg` |
+| `<container>.additionalEnv.DATABASE_POOL_MAXCONNECTIONAGE`             | A Connection older than maxConnectionAge will be destroyed and purged from the pool                                                            | `0 seconds`  | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress`, `pssg` |
+| `<container>.additionalEnv.DATABASE_POOL_MAXIDLETIME`                  | Seconds a Connection can remain pooled but unused before being discarded.                                                                      | `0 seconds`  | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress`, `pssg` |
+| `<container>.additionalEnv.DATABASE_POOL_MAXIDLETIMEEXCESSCONNECTIONS` | Number of seconds that Connections in excess of minPoolSize should be permitted to remain idle in the pool before being culled                 | `0 seconds`  | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress`, `pssg` |
 
 #### Authenticator specific configurations
 | Parameter                                                            | Description                                                                                                                                    | Default       |
@@ -457,32 +464,32 @@ This section describes configurable parameters in **values.yaml**, there is also
 | `authenticator.additionalEnv.DATABASE_POOL_MAXIMUMIDLECONNECTIONS`   | The maximum number of idle connections                                                                                                         | `10`          |
 
 #### Additional portalData configurations for File Repository Database
-| Parameter                                                                             | Description                                                                                                                                    | Default       |
-|---------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|---------------|
-| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MINPOOLSIZE`                  | Minimum number of Connections a pool will maintain at any given time                                                                           | `5`           |
-| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MAXPOOLSIZE`                  | Maximum number of Connections a pool will maintain at any given time                                                                           | `30`          |                       
-| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_CHECKOUTTIMEOUT`              | The number of milliseconds a client calling getConnection() will wait for a Connection to be checked-in or acquired when the pool is exhausted | `30000 (ms)`  |           
-| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MAXSTATEMENTSPERCONNECTION`   | The number of PreparedStatements to be cached for a single pooled Connection                                                                   | `50`          |
-| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_IDLECONNECTIONTESTPERIOD`     | Test all idle, pooled but unchecked-out connections, every this number of seconds                                                              | `300 seconds` |
-| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_INITIALPOOLSIZE`              | Number of Connections a pool will try to acquire upon startup                                                                                  | `5`           |
-| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MAXSTATEMENTS`                | The size of global PreparedStatement cache                                                                                                     | `300`         |
-| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MAXCONNECTIONAGE`             | A Connection older than maxConnectionAge will be destroyed and purged from the pool                                                            | `0 seconds`   |
-| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MAXIDLETIME`                  | Seconds a Connection can remain pooled but unused before being discarded.                                                                      | `0 seconds`   |
-| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MAXIDLETIMEEXCESSCONNECTIONS` | Number of seconds that Connections in excess of minPoolSize should be permitted to remain idle in the pool before being culled                 | `0 seconds`   |
+| Parameter                                                                             | Description                                                                                                                                    | Default      |
+|---------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|--------------|
+| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MINPOOLSIZE`                  | Minimum number of Connections a pool will maintain at any given time                                                                           | `5`          |
+| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MAXPOOLSIZE`                  | Maximum number of Connections a pool will maintain at any given time                                                                           | `30`         |                       
+| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_CHECKOUTTIMEOUT`              | The number of milliseconds a client calling getConnection() will wait for a Connection to be checked-in or acquired when the pool is exhausted | `30000 (ms)` |           
+| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MAXSTATEMENTSPERCONNECTION`   | The number of PreparedStatements to be cached for a single pooled Connection                                                                   | `50`         |
+| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_IDLECONNECTIONTESTPERIOD`     | Test all idle, pooled but unchecked-out connections, every this number of seconds                                                              | `60 seconds` |
+| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_INITIALPOOLSIZE`              | Number of Connections a pool will try to acquire upon startup                                                                                  | `5`          |
+| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MAXSTATEMENTS`                | The size of global PreparedStatement cache                                                                                                     | `300`        |
+| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MAXCONNECTIONAGE`             | A Connection older than maxConnectionAge will be destroyed and purged from the pool                                                            | `0 seconds`  |
+| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MAXIDLETIME`                  | Seconds a Connection can remain pooled but unused before being discarded.                                                                      | `0 seconds`  |
+| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MAXIDLETIMEEXCESSCONNECTIONS` | Number of seconds that Connections in excess of minPoolSize should be permitted to remain idle in the pool before being culled                 | `0 seconds`  |
 
 #### Additional tenantProvisioner configurations for Portal Database
-| Parameter                                                                             | Description                                                                                                                                    | Default       |
-|---------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|---------------|
-| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MINPOOLSIZE`                    | Minimum number of Connections a pool will maintain at any given time                                                                           | `5`           |
-| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MAXPOOLSIZE`                    | Maximum number of Connections a pool will maintain at any given time                                                                           | `30`          | 
-| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_CHECKOUTTIMEOUT`                | The number of milliseconds a client calling getConnection() will wait for a Connection to be checked-in or acquired when the pool is exhausted | `30000 (ms)`  |
-| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MAXSTATEMENTSPERCONNECTION`     | The number of PreparedStatements to be cached for a single pooled Connection                                                                   | `50`          |
-| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_IDLECONNECTIONTESTPERIOD`       | Test all idle, pooled but unchecked-out connections, every this number of seconds                                                              | `300 seconds` |
-| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_INITIALPOOLSIZE`                | Number of Connections a pool will try to acquire upon startup                                                                                  | `5`           |
-| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MAXSTATEMENTS`                  | The size of global PreparedStatement cache                                                                                                     | `300`         |
-| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MAXCONNECTIONAGE`               | A Connection older than maxConnectionAge will be destroyed and purged from the pool                                                            | `0 seconds`   |
-| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MAXIDLETIME`                    | Seconds a Connection can remain pooled but unused before being discarded.                                                                      | `0 seconds`   |
-| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MAXIDLETIMEEXCESSCONNECTIONS`   | Number of seconds that Connections in excess of minPoolSize should be permitted to remain idle in the pool before being culled                 | `0 seconds`   |
+| Parameter                                                                             | Description                                                                                                                                    | Default      |
+|---------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|--------------|
+| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MINPOOLSIZE`                    | Minimum number of Connections a pool will maintain at any given time                                                                           | `5`          |
+| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MAXPOOLSIZE`                    | Maximum number of Connections a pool will maintain at any given time                                                                           | `30`         | 
+| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_CHECKOUTTIMEOUT`                | The number of milliseconds a client calling getConnection() will wait for a Connection to be checked-in or acquired when the pool is exhausted | `30000 (ms)` |
+| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MAXSTATEMENTSPERCONNECTION`     | The number of PreparedStatements to be cached for a single pooled Connection                                                                   | `50`         |
+| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_IDLECONNECTIONTESTPERIOD`       | Test all idle, pooled but unchecked-out connections, every this number of seconds                                                              | `60 seconds` |
+| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_INITIALPOOLSIZE`                | Number of Connections a pool will try to acquire upon startup                                                                                  | `5`          |
+| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MAXSTATEMENTS`                  | The size of global PreparedStatement cache                                                                                                     | `300`        |
+| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MAXCONNECTIONAGE`               | A Connection older than maxConnectionAge will be destroyed and purged from the pool                                                            | `0 seconds`  |
+| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MAXIDLETIME`                    | Seconds a Connection can remain pooled but unused before being discarded.                                                                      | `0 seconds`  |
+| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MAXIDLETIMEEXCESSCONNECTIONS`   | Number of seconds that Connections in excess of minPoolSize should be permitted to remain idle in the pool before being culled                 | `0 seconds`  |
 
 ### Portal TLS Defaults 
 Portal TLS defaults if the parameters are not set.
@@ -661,18 +668,18 @@ Portal Analytics
 ### Portal Images
 | Parameter                                 | Description                                                                                                          | Default                                                      |
 |-------------------------------------------|----------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------|
-| `image.dispatcher` | dispatcher image | `dispatcher:5.2.3` |
-| `image.pssg` | PSSG image | `pssg:5.2.3` |
-| `image.apim` | APIM ingress image | `ingress:5.2.3` |
-| `image.enterprise` | portal-enterprise image | `portal-enterprise:5.2.3` |
-| `image.data` | portal-data image | `portal-data:5.2.3` |
-| `image.tps` | tenant provisioner image | `tenant-provisioning-service:5.2.3` |
-| `image.analytics` | Analytics image | `analytics-server:5.2.3` |
-| `image.authenticator` | Authenticator image | `authenticator:5.2.3` |
-| `image.dbUpgrade` | db upgrade image | `db-upgrade-portal:5.2.3` |
-| `image.rbacUpgrade` | Analytics image, per Portal version | `db-upgrade-rbac:5.2.3` |
-| `image.upgradeVerify` | Upgrade verification image | `upgrade-verify:5.2.3` |
-| `image.tlsManager` | TLS manager image | `tls-automator:5.2.3` |
+| `image.dispatcher` | dispatcher image | `dispatcher:5.3` |
+| `image.pssg` | PSSG image | `pssg:5.3` |
+| `image.apim` | APIM ingress image | `ingress:5.3` |
+| `image.enterprise` | portal-enterprise image | `portal-enterprise:5.3` |
+| `image.data` | portal-data image | `portal-data:5.3` |
+| `image.tps` | tenant provisioner image | `tenant-provisioning-service:5.3` |
+| `image.analytics` | Analytics image | `analytics-server:5.3` |
+| `image.authenticator` | Authenticator image | `authenticator:5.3` |
+| `image.dbUpgrade` | db upgrade image | `db-upgrade-portal:5.3` |
+| `image.rbacUpgrade` | Analytics image, per Portal version | `db-upgrade-rbac:5.3` |
+| `image.upgradeVerify` | Upgrade verification image | `upgrade-verify:5.3` |
+| `image.tlsManager` | TLS manager image | `tls-automator:5.3` |
 
 ## Subcharts
 For Production, use an external MySQL Server.
@@ -804,14 +811,14 @@ The following table lists the configured parameters of the Druid Subchart
 
 | Parameter                   | Description         | Default                  |
 |-----------------------------|---------------------|--------------------------|
-| `druid.image.zookeeper `    | Zookeeper image     | `zookeeper:5.2.3`        |
-| `druid.image.broker`        | Broker image        | `druid:5.2.3`            |
-| `druid.image.coordinator`   | Coordinator         | `druid:5.2.3`            |
-| `druid.image.middlemanager` | Middlemanager image | `druid:5.2.3`            |
-| `druid.image.minio`         | Minio image         | `minio:5.2.3`            |
-| `druid.image.historical`    | Historical image    | `druid:5.2.3`            |
-| `druid.image.kafka`         | Kafka image         | `kafka:5.2.3`            |
-| `druid.image.ingestion`     | Ingestion image     | `ingestion-server:5.2.3` |
+| `druid.image.zookeeper `    | Zookeeper image     | `zookeeper:5.3`        |
+| `druid.image.broker`        | Broker image        | `druid:5.3`            |
+| `druid.image.coordinator`   | Coordinator         | `druid:5.3`            |
+| `druid.image.middlemanager` | Middlemanager image | `druid:5.3`            |
+| `druid.image.minio`         | Minio image         | `minio:5.3`            |
+| `druid.image.historical`    | Historical image    | `druid:5.3`            |
+| `druid.image.kafka`         | Kafka image         | `kafka:5.3`            |
+| `druid.image.ingestion`     | Ingestion image     | `ingestion-server:5.3` |
 
 ## RabbitMQ
 The following table lists the configured parameters of the Bitnami RabbitMQ Subchart - https://github.com/bitnami/charts/tree/master/bitnami/rabbitmq
@@ -854,7 +861,7 @@ The following table lists the configured parameters of the MySQL Subchart - http
 
 | Parameter                        | Description                               | Default                                                      |
 | -----------------------------    | -----------------------------------       | -----------------------------------------------------------  |
-| `mysql.image.tag`                | MySQL Image to use   | `8.0.31-debian-11-r36` |
+| `mysql.image.tag`                | MySQL Image to use   | `8.0.37-debian-12-r2` |
 | `mysql.auth.username`           | MySQL Username   | `admin` |
 | `mysql.auth.existingSecret`     | Secret where credentials are stored, see global.databaseSecret   | `database-secret` |
 | `mysql.initdbScripts`           | Dictionary of initdb scripts | `see values.yaml` |
@@ -1046,6 +1053,6 @@ $ kubectl scale statefulset <release-name>-mysql --replicas=<replica_count>
 ```
 
 ## License
-Copyright (c) 2023 CA, A Broadcom Company. All rights reserved.
+Copyright (c) 2024 CA, A Broadcom Company. All rights reserved.
 
 This software may be modified and distributed under the terms of the MIT license. See the [LICENSE](https://github.com/CAAPIM/apim-charts/blob/stable/LICENSE) file for details.
diff --git a/charts/portal/charts/druid-1.0.11.tgz b/charts/portal/charts/druid-1.0.11.tgz
deleted file mode 100644
index a1386a4a..00000000
Binary files a/charts/portal/charts/druid-1.0.11.tgz and /dev/null differ
diff --git a/charts/portal/charts/druid-1.0.13.tgz b/charts/portal/charts/druid-1.0.13.tgz
deleted file mode 100644
index 5bee2946..00000000
Binary files a/charts/portal/charts/druid-1.0.13.tgz and /dev/null differ
diff --git a/charts/portal/charts/druid-1.0.14.tgz b/charts/portal/charts/druid-1.0.14.tgz
new file mode 100644
index 00000000..89e2614a
Binary files /dev/null and b/charts/portal/charts/druid-1.0.14.tgz differ
diff --git a/charts/portal/charts/ingress-nginx-4.10.0.tgz b/charts/portal/charts/ingress-nginx-4.10.0.tgz
new file mode 100644
index 00000000..795ef644
Binary files /dev/null and b/charts/portal/charts/ingress-nginx-4.10.0.tgz differ
diff --git a/charts/portal/charts/ingress-nginx-4.7.2.tgz b/charts/portal/charts/ingress-nginx-4.7.2.tgz
deleted file mode 100644
index 286a23f8..00000000
Binary files a/charts/portal/charts/ingress-nginx-4.7.2.tgz and /dev/null differ
diff --git a/charts/portal/charts/mysql-10.3.0.tgz b/charts/portal/charts/mysql-10.3.0.tgz
new file mode 100644
index 00000000..920bca02
Binary files /dev/null and b/charts/portal/charts/mysql-10.3.0.tgz differ
diff --git a/charts/portal/charts/mysql-9.19.1.tgz b/charts/portal/charts/mysql-9.19.1.tgz
deleted file mode 100644
index 164835ef..00000000
Binary files a/charts/portal/charts/mysql-9.19.1.tgz and /dev/null differ
diff --git a/charts/portal/templates/analytics-server/analytics-config.yaml b/charts/portal/templates/analytics-server/analytics-config.yaml
index 0cf89b14..5bd323a4 100644
--- a/charts/portal/templates/analytics-server/analytics-config.yaml
+++ b/charts/portal/templates/analytics-server/analytics-config.yaml
@@ -24,7 +24,7 @@ data:
   DATABASE_REQUIRE_SSL: {{ .Values.global.databaseRequireSSL | quote }}
   NSS_SDB_USE_CACHE: "no"
   ONPREM: "true"
-  PORTAL_VERSION: {{ .Chart.AppVersion }}
+  PORTAL_VERSION: {{ .Chart.AppVersion | quote }}
   RABBITMQ_HOST: {{ .Values.rabbitmq.host | quote }}
   RABBITMQ_PORT: {{ .Values.rabbitmq.service.port | quote }}
   PAPI_PUBLIC_HOST: {{ include "tssg-public-host" . | quote }}
diff --git a/charts/portal/templates/apim/apim-config.yaml b/charts/portal/templates/apim/apim-config.yaml
index 9af08af3..8c75a826 100644
--- a/charts/portal/templates/apim/apim-config.yaml
+++ b/charts/portal/templates/apim/apim-config.yaml
@@ -22,7 +22,7 @@ data:
   OTK_DATABASE_NAME: {{ include "otk-db-name" . | quote }}
   OTK_PORT: {{ .Values.portal.otk.port | quote }}
   PORTAL_SUBDOMAIN: {{ required "Please fill in domain in values.yaml" .Values.portal.domain | quote }}
-  PORTAL_VERSION: {{ .Chart.AppVersion }}
+  PORTAL_VERSION: {{ .Chart.AppVersion | quote }}
   SSG_CLUSTER_HOST: {{ include "tssg-public-host" . | quote }}
   SSG_JVM_HEAP: 4096m
   TENANT_ID: {{ include "default-tenant-id" . | quote }}
diff --git a/charts/portal/templates/authenticator/authenticator-config.yaml b/charts/portal/templates/authenticator/authenticator-config.yaml
index 347a31f4..1c762301 100644
--- a/charts/portal/templates/authenticator/authenticator-config.yaml
+++ b/charts/portal/templates/authenticator/authenticator-config.yaml
@@ -22,7 +22,7 @@ data:
   DATABASE_REQUIRE_SSL: {{ .Values.global.databaseRequireSSL | quote }}
   JAVA_OPTIONS: {{ .Values.authenticator.javaOptions | default "-Xms1g -Xmx1g" | quote }}
   NSS_SDB_USE_CACHE: "no"
-  PORTAL_VERSION: {{ .Chart.AppVersion }}
+  PORTAL_VERSION: {{ .Chart.AppVersion | quote }}
   RABBITMQ_PORT: {{ .Values.rabbitmq.service.port | quote }}
 {{ if .Values.authenticator.additionalEnv }}
 {{- range $key, $val := .Values.authenticator.additionalEnv }}
diff --git a/charts/portal/templates/dispatcher/dispatcher-config.yaml b/charts/portal/templates/dispatcher/dispatcher-config.yaml
index 20b819de..da20cd44 100644
--- a/charts/portal/templates/dispatcher/dispatcher-config.yaml
+++ b/charts/portal/templates/dispatcher/dispatcher-config.yaml
@@ -10,7 +10,7 @@ metadata:
 data:
   NSS_SDB_USE_CACHE: "no"
   PORTAL_SUBDOMAIN: {{ required "Please fill in domain in values.yaml" .Values.portal.domain | quote }}
-  PORTAL_VERSION: {{ .Chart.AppVersion }}
+  PORTAL_VERSION: {{ .Chart.AppVersion | quote }}
   TSSG_PUBLIC_HOST: {{ include "tssg-public-host" . | quote }}
   USE_PROXY_PROTOCOL: "false"
 {{ if .Values.dispatcher.additionalEnv }}
diff --git a/charts/portal/templates/portal-data/portal-data-config.yaml b/charts/portal/templates/portal-data/portal-data-config.yaml
index 6312ea96..477da187 100644
--- a/charts/portal/templates/portal-data/portal-data-config.yaml
+++ b/charts/portal/templates/portal-data/portal-data-config.yaml
@@ -31,7 +31,7 @@ data:
   NSS_SDB_USE_CACHE: "no"
   PAPI_PUBLIC_HOST: {{ include "tssg-public-host" . | quote }}
   PORTAL_SUBDOMAIN: {{ required "Please fill in domain in values.yaml" .Values.portal.domain | quote }}
-  PORTAL_VERSION: {{ .Chart.AppVersion }}
+  PORTAL_VERSION: {{ .Chart.AppVersion | quote }}
   RABBITMQ_HOST: {{ .Values.rabbitmq.host | quote }}
   RABBITMQ_PORT: {{ .Values.rabbitmq.service.port | quote }}
   RBAC_DATABASE_NAME: {{ include "rbac-db-name" . | quote }}
diff --git a/charts/portal/templates/portal-enterprise/portal-enterprise-config.yaml b/charts/portal/templates/portal-enterprise/portal-enterprise-config.yaml
index f0ed4a56..f3cb8978 100644
--- a/charts/portal/templates/portal-enterprise/portal-enterprise-config.yaml
+++ b/charts/portal/templates/portal-enterprise/portal-enterprise-config.yaml
@@ -23,7 +23,7 @@ data:
   HELP_BASE_URL: {{ include "portal.help.page" . | quote }}
   JAVA_OPTIONS: {{ .Values.portalEnterprise.javaOptions | default "-Xms2g -Xmx2g" | quote }}
   NSS_SDB_USE_CACHE: "no"
-  PORTAL_VERSION: {{ .Chart.AppVersion }}
+  PORTAL_VERSION: {{ .Chart.AppVersion | quote }}
   RABBITMQ_HOST: {{ .Values.rabbitmq.host | quote }}
   RABBITMQ_PORT: {{ .Values.rabbitmq.service.port | quote }}
   RBAC_DATABASE_NAME: {{ include "rbac-db-name" . | quote }}
diff --git a/charts/portal/templates/pssg/pssg-config.yaml b/charts/portal/templates/pssg/pssg-config.yaml
index 45266875..98a3659e 100644
--- a/charts/portal/templates/pssg/pssg-config.yaml
+++ b/charts/portal/templates/pssg/pssg-config.yaml
@@ -36,7 +36,7 @@ data:
   DATABASE_USE_SSL: {{ .Values.global.databaseUseSSL | quote }}
   DATABASE_REQUIRE_SSL: {{ .Values.global.databaseRequireSSL | quote }}
   NSS_SDB_USE_CACHE: "no"
-  PORTAL_VERSION: {{ .Chart.AppVersion }}
+  PORTAL_VERSION: {{ .Chart.AppVersion | quote }}
   SSG_JVM_HEAP: 4096m
 {{ if .Values.pssg.additionalEnv }}
 {{- range $key, $val := .Values.pssg.additionalEnv }}
diff --git a/charts/portal/templates/tenant-provisioner/tenant-provisioner-config.yaml b/charts/portal/templates/tenant-provisioner/tenant-provisioner-config.yaml
index ac0b091d..26bc7309 100644
--- a/charts/portal/templates/tenant-provisioner/tenant-provisioner-config.yaml
+++ b/charts/portal/templates/tenant-provisioner/tenant-provisioner-config.yaml
@@ -27,7 +27,7 @@ data:
   JAVA_OPTIONS: {{ .Values.tenantProvisioner.javaOptions | default "-Xms512m -Xmx512m" | quote }}
   NSS_SDB_USE_CACHE: "no"
   OTK_PORT: {{ .Values.portal.otk.port | quote }}
-  PORTAL_VERSION: {{ .Chart.AppVersion }}
+  PORTAL_VERSION: {{ .Chart.AppVersion | quote }}
   PORTAL_DATABASE_NAME: {{ include "portal-db-name" . | quote }}
   RABBITMQ_PORT: {{ .Values.rabbitmq.service.port | quote }}
 {{ if .Values.tenantProvisioner.additionalEnv }}
diff --git a/charts/portal/values-production.yaml b/charts/portal/values-production.yaml
index 92520d6b..b7d43340 100644
--- a/charts/portal/values-production.yaml
+++ b/charts/portal/values-production.yaml
@@ -32,7 +32,7 @@ global:
   containerSecurityContext: {}
   #   containerSecurityContext:
   #     runAsUser: 1001
-  helpPage: https://techdocs.broadcom.com/us/en/ca-enterprise-software/layer7-api-management/api-developer-portal/5-2/
+  helpPage: https://techdocs.broadcom.com/us/en/ca-enterprise-software/layer7-api-management/api-developer-portal/5-3/
 # storageClass: "_"
 # schedulerName:
 
@@ -523,18 +523,18 @@ tenantProvisioner:
   additionalEnv:
 
 image:
-  dispatcher: dispatcher:5.2.3
-  pssg: pssg:5.2.3
-  apim: ingress:5.2.3
-  enterprise: portal-enterprise:5.2.3
-  data: portal-data:5.2.3
-  tps: tenant-provisioning-service:5.2.3
-  analytics: analytics-server:5.2.3
-  authenticator: authenticator:5.2.3
-  dbUpgrade: db-upgrade-portal:5.2.3
-  rbacUpgrade: db-upgrade-rbac:5.2.3
-  upgradeVerify: upgrade-verify:5.2.3
-  tlsManager: tls-automator:5.2.3
+  dispatcher: dispatcher:5.3
+  pssg: pssg:5.3
+  apim: ingress:5.3
+  enterprise: portal-enterprise:5.3
+  data: portal-data:5.3
+  tps: tenant-provisioning-service:5.3
+  analytics: analytics-server:5.3
+  authenticator: authenticator:5.3
+  dbUpgrade: db-upgrade-portal:5.3
+  rbacUpgrade: db-upgrade-rbac:5.3
+  upgradeVerify: upgrade-verify:5.3
+  tlsManager: tls-automator:5.3
 
 ##
 ## Subchart Configuration
@@ -835,14 +835,14 @@ druid:
   #         topologyKey: kubernetes.io/hostname
 
   image:
-    zookeeper: zookeeper:5.2.3
-    broker: druid:5.2.3
-    coordinator: druid:5.2.3
-    middlemanager: druid:5.2.3
-    minio: minio:5.2.3
-    historical: druid:5.2.3
-    kafka: kafka:5.2.3
-    ingestion: ingestion-server:5.2.3
+    zookeeper: zookeeper:5.3
+    broker: druid:5.3
+    coordinator: druid:5.3
+    middlemanager: druid:5.3
+    minio: minio:5.3
+    historical: druid:5.3
+    kafka: kafka:5.3
+    ingestion: ingestion-server:5.3
 
 # Settings for RabbitMQ - https://github.com/bitnami/charts/tree/master/bitnami/rabbitmq
 rabbitmq:
@@ -852,7 +852,7 @@ rabbitmq:
   image:
     registry: caapim
     repository: message-broker
-    tag: "5.2.3"
+    tag: "5.3"
     pullSecrets:
       - broadcom-apim
   pdb:
@@ -978,7 +978,7 @@ jobs:
 # MySQL Stable Chart values - https://github.com/bitnami/charts/tree/master/bitnami/mysql
 mysql:
   image:
-    tag: "8.0.36-debian-11-r4"
+    tag: "8.0.37-debian-12-r2"
   auth:
     username: portal
     existingSecret: database-secret
diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml
index 1310c931..12810cf1 100644
--- a/charts/portal/values.yaml
+++ b/charts/portal/values.yaml
@@ -32,7 +32,7 @@ global:
   containerSecurityContext: {}
   #   containerSecurityContext:
   #     runAsUser: 1001
-  helpPage: https://techdocs.broadcom.com/us/en/ca-enterprise-software/layer7-api-management/api-developer-portal/5-2/
+  helpPage: https://techdocs.broadcom.com/us/en/ca-enterprise-software/layer7-api-management/api-developer-portal/5-3/
 # storageClass: "_"
 # schedulerName:
 # The saas flag should be left as is unless otherwise specified by support.
@@ -453,18 +453,18 @@ tenantProvisioner:
   additionalEnv:
 
 image:
-  dispatcher: dispatcher:5.2.3
-  pssg: pssg:5.2.3
-  apim: ingress:5.2.3
-  enterprise: portal-enterprise:5.2.3
-  data: portal-data:5.2.3
-  tps: tenant-provisioning-service:5.2.3
-  analytics: analytics-server:5.2.3
-  authenticator: authenticator:5.2.3
-  dbUpgrade: db-upgrade-portal:5.2.3
-  rbacUpgrade: db-upgrade-rbac:5.2.3
-  upgradeVerify: upgrade-verify:5.2.3
-  tlsManager: tls-automator:5.2.3
+  dispatcher: dispatcher:5.3
+  pssg: pssg:5.3
+  apim: ingress:5.3
+  enterprise: portal-enterprise:5.3
+  data: portal-data:5.3
+  tps: tenant-provisioning-service:5.3
+  analytics: analytics-server:5.3
+  authenticator: authenticator:5.3
+  dbUpgrade: db-upgrade-portal:5.3
+  rbacUpgrade: db-upgrade-rbac:5.3
+  upgradeVerify: upgrade-verify:5.3
+  tlsManager: tls-automator:5.3
 
 ##
 ## Subchart Configuration
@@ -691,14 +691,14 @@ druid:
   # affinity: {}
 
   image:
-    zookeeper: zookeeper:5.2.3
-    broker: druid:5.2.3
-    coordinator: druid:5.2.3
-    middlemanager: druid:5.2.3
-    minio: minio:5.2.3
-    historical: druid:5.2.3
-    kafka: kafka:5.2.3
-    ingestion: ingestion-server:5.2.3
+    zookeeper: zookeeper:5.3
+    broker: druid:5.3
+    coordinator: druid:5.3
+    middlemanager: druid:5.3
+    minio: minio:5.3
+    historical: druid:5.3
+    kafka: kafka:5.3
+    ingestion: ingestion-server:5.3
 
 # Settings for RabbitMQ - https://github.com/bitnami/charts/tree/master/bitnami/rabbitmq
 rabbitmq:
@@ -708,7 +708,7 @@ rabbitmq:
   image:
     registry: caapim
     repository: message-broker
-    tag: "5.2.3"
+    tag: "5.3"
     pullSecrets:
       - broadcom-apim
   pdb:
@@ -823,7 +823,7 @@ jobs:
 # MySQL Stable Chart values - https://github.com/bitnami/charts/tree/master/bitnami/mysql
 mysql:
   image:
-    tag: "8.0.36-debian-11-r4"
+    tag: "8.0.37-debian-12-r2"
   auth:
     username: portal
     existingSecret: database-secret
diff --git a/utils/create-tenant.sh b/utils/create-tenant.sh
index 97f89ff0..a713d026 100755
--- a/utils/create-tenant.sh
+++ b/utils/create-tenant.sh
@@ -30,7 +30,7 @@ function print_steps() {
 
 	The tenant has been added to the database. The tenant info can be found in the tenant_info file in the current directory.
 	Please follow the rest of the instructions at TechDocs to enroll your gateway with the portal.
-	(https://techdocs.broadcom.com/us/en/ca-enterprise-software/layer7-api-management/api-developer-portal/5-2/install-configure-and-upgrade/post-installation-tasks/enroll-a-layer7-api-gateway.html)
+	(https://techdocs.broadcom.com/us/en/ca-enterprise-software/layer7-api-management/api-developer-portal/5-3/install-configure-and-upgrade/post-installation-tasks/enroll-a-layer7-api-gateway.html)
 			
 	1. You will need to navigate to the portal at https://${tenant_id}.${domain} and create a new API PROXY. 
 	2. Copy the enrollment URL