diff --git a/charts/portal/Chart.yaml b/charts/portal/Chart.yaml
index 45430f20..9d92adca 100644
--- a/charts/portal/Chart.yaml
+++ b/charts/portal/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "5.2.2"
 description: CA API Developer Portal
 name: portal
-version: 2.3.4
+version: 2.3.5
 type: application
 home: https://github.com/CAAPIM/apim-charts
 maintainers:
diff --git a/charts/portal/templates/portal-data/portal-data-config.yaml b/charts/portal/templates/portal-data/portal-data-config.yaml
index 3b7a4b64..6312ea96 100644
--- a/charts/portal/templates/portal-data/portal-data-config.yaml
+++ b/charts/portal/templates/portal-data/portal-data-config.yaml
@@ -25,10 +25,9 @@ data:
   DATABASE_REQUIRE_SSL: {{ .Values.global.databaseRequireSSL | quote }}
   FILE_REPOSITORY_DATABASE_NAME: {{ include "portal-db-name" . | quote }}
   HELP_BASE_URL: {{ include "portal.help.page" . | quote }}
-  JAVA_OPTIONS: {{ .Values.portalData.javaOptions | default "-Xms2g -Xmx2g" | quote }}
+  JAVA_OPTIONS: {{ .Values.portalData.javaOptions | default "-Xms2048m -Xmx2048m" | quote }}
   # TODO: Find out why this is hardcoded, can it be ommitted??
   HOST_NAME_ID: MTAuMTc1LjI0Ny4yNDQgMTcyLjE4LjAuMSAxNzIuMTcuMC4xIAo=
-  JAVA_OPTIONS: -Xms2048m -Xmx2048m
   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 }}
diff --git a/charts/portal/values-production.yaml b/charts/portal/values-production.yaml
index c4fef581..16b3de89 100644
--- a/charts/portal/values-production.yaml
+++ b/charts/portal/values-production.yaml
@@ -341,7 +341,7 @@ dispatcher:
 portalData:
   forceRedeploy: false
   replicaCount: 2
-  javaOptions: -Xms2g -Xmx2g
+  javaOptions: -Xms2048m -Xmx2048m
   image:
     pullPolicy: IfNotPresent
   pdb:
diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml
index 893aea5d..f4815b32 100644
--- a/charts/portal/values.yaml
+++ b/charts/portal/values.yaml
@@ -307,7 +307,7 @@ dispatcher:
 portalData:
   forceRedeploy: false
   replicaCount: 1
-  javaOptions: -Xms2g -Xmx2g
+  javaOptions: -Xms2048m -Xmx2048m
   image:
     pullPolicy: IfNotPresent
   pdb: