diff --git a/charts/pega/charts/hazelcast/templates/pega-hz-environment-config.yaml b/charts/pega/charts/hazelcast/templates/pega-hz-environment-config.yaml
index 4ae70af4a..9af2f5f47 100644
--- a/charts/pega/charts/hazelcast/templates/pega-hz-environment-config.yaml
+++ b/charts/pega/charts/hazelcast/templates/pega-hz-environment-config.yaml
@@ -55,10 +55,10 @@ data:
 {{- if .Values.server.diagnostics_metric_level }}
   DIAGNOSTICS_METRIC_LEVEL: {{ .Values.server.diagnostics_metric_level | quote }}
 {{- end }}
-{{- if .Values.server.diagnostic_log_file_size_mb }}
-  DIAGNOSTIC_LOG_FILE_SIZE_MB: {{ .Values.server.diagnostic_log_file_size_mb | quote }}
-{{- end }}
 {{- if .Values.server.diagnostics_file_count }}
   DIAGNOSTICS_FILE_COUNT: {{ .Values.server.diagnostics_file_count | quote }}
 {{- end }}
+{{- if .Values.server.diagnostic_log_file_size_mb }}
+  DIAGNOSTIC_LOG_FILE_SIZE_MB: {{ .Values.server.diagnostic_log_file_size_mb | quote }}
+{{- end }}
 {{ end }}
\ No newline at end of file
diff --git a/charts/pega/charts/hazelcast/values.yaml b/charts/pega/charts/hazelcast/values.yaml
index 89633a7a4..b8834e258 100644
--- a/charts/pega/charts/hazelcast/values.yaml
+++ b/charts/pega/charts/hazelcast/values.yaml
@@ -13,17 +13,17 @@ password: ""
 # Memory and CPU settings for HZ service
 resources:
   requests:
-    memory: "2Gi"
-    cpu: 2
+    memory: "1Gi"
+    cpu: 1
   limits:
-    memory: "4Gi"
+    memory: "1Gi"
     cpu: 2
 # client settings for hazelcast
 client:
   clusterName: "PRPC"
 # Server side settings for hazelcast
 server:
-  java_opts: "-XX:MaxRAMPercentage=80.0 -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/hazelcast/logs/heapdump.hprof
+  java_opts: "-Xms820m -Xmx820m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/hazelcast/logs/heapdump.hprof
   -XX:+UseParallelGC -Xlog:gc*,gc+phases=debug:file=/opt/hazelcast/logs/gc.log:time,pid,tags:filecount=5,filesize=3m"
   min_cluster_size: "3"
   jmx_enabled: "true"
diff --git a/terratest/src/test/pega/pega-hz-deployment_test.go b/terratest/src/test/pega/pega-hz-deployment_test.go
index ec323bfba..eeef531ef 100644
--- a/terratest/src/test/pega/pega-hz-deployment_test.go
+++ b/terratest/src/test/pega/pega-hz-deployment_test.go
@@ -52,8 +52,8 @@ func VerifyHazelcastDeployment(t *testing.T, yamlContent string) {
 			require.Equal(t, intstr.FromInt(5701), statefulsetSpec.Containers[0].LivenessProbe.HTTPGet.Port)
 			require.Equal(t, "/hazelcast/health/ready", statefulsetSpec.Containers[0].ReadinessProbe.HTTPGet.Path)
 			require.Equal(t, intstr.FromInt(5701), statefulsetSpec.Containers[0].ReadinessProbe.HTTPGet.Port)
-			require.Equal(t, "2", statefulsetSpec.Containers[0].Resources.Requests.Cpu().String())
-			require.Equal(t, "2Gi", statefulsetSpec.Containers[0].Resources.Requests.Memory().String())
+			require.Equal(t, "1", statefulsetSpec.Containers[0].Resources.Requests.Cpu().String())
+			require.Equal(t, "1Gi", statefulsetSpec.Containers[0].Resources.Requests.Memory().String())
 			require.Equal(t, statefulsetSpec.Volumes[0].Name, "logs")
             require.Equal(t, statefulsetSpec.Volumes[1].Name, "pega-volume-credentials")
             require.Equal(t, statefulsetSpec.Volumes[1].Secret.SecretName, "pega-credentials-secret")