diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
index 156134c0..8322ff18 100644
--- a/.github/workflows/lint-test.yaml
+++ b/.github/workflows/lint-test.yaml
@@ -18,7 +18,7 @@ jobs:
       - name: Set up Helm
         uses: azure/setup-helm@v1
         with:
-          version: v3.4.0
+          version: v3.10.0
       - uses: actions/setup-python@v2
         with:
           python-version: 3.7
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 e482c8d9..fce4020a 100644
--- a/charts/portal/values-production.yaml
+++ b/charts/portal/values-production.yaml
@@ -366,7 +366,7 @@ dispatcher:
 portalData:
   forceRedeploy: false
   replicaCount: 2
-  javaOptions: -Xms2g -Xmx2g
+  javaOptions: -Xms2048m -Xmx2048m
   image:
     pullPolicy: IfNotPresent
   pdb:
@@ -925,6 +925,18 @@ rabbitmq:
     requests:
       cpu: 1000m
       memory: 2Gi
+  customLivenessProbe:
+   exec:
+    command:
+      - sh
+      - -ec
+      - curl -f  --user "{{ .Values.auth.username }}":$RABBITMQ_PASSWORD 127.0.0.1:"{{ .Values.containerPorts.manager }}"/api/health/checks/virtual-hosts
+  customReadinessProbe:
+   exec:
+    command:
+      - sh
+      - -ec
+      - curl -f  --user "{{ .Values.auth.username }}":$RABBITMQ_PASSWORD 127.0.0.1:"{{ .Values.containerPorts.manager }}"/api/health/checks/local-alarms
 
 # Settings for Nginx-Ingress - https://github.com/kubernetes/ingress-nginx/tree/master/charts/ingress-nginx
 ingress-nginx:
diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml
index 63b113ba..d14bc02f 100644
--- a/charts/portal/values.yaml
+++ b/charts/portal/values.yaml
@@ -332,7 +332,7 @@ dispatcher:
 portalData:
   forceRedeploy: false
   replicaCount: 1
-  javaOptions: -Xms2g -Xmx2g
+  javaOptions: -Xms2048m -Xmx2048m
   image:
     pullPolicy: IfNotPresent
   pdb:
@@ -771,7 +771,18 @@ rabbitmq:
     requests: {}
     # cpu: 1000m
     # memory: 2Gi
-
+  customLivenessProbe:
+    exec:
+      command:
+        - sh
+        - -ec
+        - curl -f --user {{ .Values.auth.username }}:$RABBITMQ_PASSWORD 127.0.0.1:{{ .Values.containerPorts.manager }}/api/health/checks/virtual-hosts
+  customReadinessProbe:
+    exec:
+      command:
+        - sh
+        - -ec
+        - curl -f --user {{ .Values.auth.username }}:$RABBITMQ_PASSWORD 127.0.0.1:{{ .Values.containerPorts.manager }}/api/health/checks/local-alarms
 
 # Settings for Nginx-Ingress - https://github.com/kubernetes/ingress-nginx/tree/master/charts/ingress-nginx
 ingress-nginx: