diff --git a/pkg/helm/README.md b/pkg/helm/README.md
index 0d9d643c1..e5bc5e6a3 100644
--- a/pkg/helm/README.md
+++ b/pkg/helm/README.md
@@ -34,8 +34,8 @@ The chart should dump its version and appVersion in the Chart.yaml file every re
 | `preferences.enabled` | Whether to mount preferences.json | `false` |
 | `preferences.data` | Preferences to load | `{}` |
 | `resources.*` | Allocated requests and limits resources | `{"requests": {...}, "limits": {...}}` |
-| `persistence.enabled` | PVC resource creation | `false` |
+| `persistence.enabled` | PVC resource creation | `true` |
 | `service.type` | Service type | `"ClusterIP"` |
 | `service.loadBalancerIP` | Load balancer IP (Only if service.type is LoadBalancer) | `""` |
 | `ingress.enabled` | Ingress resource creation | `false` |
-| `ingress.hostname` | Ingress resource hostname | `"pgadmin4.local"` |
\ No newline at end of file
+| `ingress.hostname` | Ingress resource hostname | `"pgadmin4.local"` |
diff --git a/pkg/helm/templates/_helpers.tpl b/pkg/helm/templates/_helpers.tpl
index 3f78e71b1..dd0e9af95 100644
--- a/pkg/helm/templates/_helpers.tpl
+++ b/pkg/helm/templates/_helpers.tpl
@@ -25,4 +25,25 @@
   {{- $securityContext = omit $securityContext "appArmorProfile" -}}
 {{- end -}}
 {{- $securityContext | toYaml -}}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
+
+{{- define "tpl.preserve.variable" -}}
+{{- $obj := . }}
+{{- if kindIs "map" $obj }}
+  {{- range $k, $v := $obj }}
+    {{- if kindIs "string" $v }}
+      {{- if regexMatch "^[0-9]+$" $v }}
+        {{- $_ := set $obj $k (atoi $v) }}
+      {{- else if regexMatch "(?i)^(true|false)$" $v }}
+        {{- $_ := set $obj $k (eq (lower $v) "true") }}
+      {{- end }}
+    {{- else }}
+      {{- include "tpl.preserve.variable" $v }}
+    {{- end }}
+  {{- end }}
+{{- else if kindIs "slice" $obj }}
+  {{- range $i, $v := $obj }}
+    {{- include "tpl.preserve.variable" $v }}
+  {{- end }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/pkg/helm/templates/configmap-serverDefinitions.yaml b/pkg/helm/templates/configmap-serverDefinitions.yaml
index 4be08bd80..b501fe6dc 100644
--- a/pkg/helm/templates/configmap-serverDefinitions.yaml
+++ b/pkg/helm/templates/configmap-serverDefinitions.yaml
@@ -10,5 +10,7 @@ metadata:
   annotations: {{ . | toYaml | nindent 4 }}
   {{- end }}
 data:
-  servers.json: | {{ tpl (dict "Servers" .Values.serverDefinitions.data | toYaml) . | fromYaml | toPrettyJson | nindent 4 }}
+{{- $variableToPreserveTPL := tpl (dict "Servers" .Values.serverDefinitions.data | toYaml) . | fromYaml }}
+{{- include "tpl.preserve.variable" $variableToPreserveTPL }}
+  servers.json: | {{ $variableToPreserveTPL | toYaml | nindent 4 }}
 {{- end }}
\ No newline at end of file
diff --git a/pkg/helm/templates/deployment.yaml b/pkg/helm/templates/deployment.yaml
index 92fae1675..017094f23 100644
--- a/pkg/helm/templates/deployment.yaml
+++ b/pkg/helm/templates/deployment.yaml
@@ -117,7 +117,7 @@ spec:
             - name: PGADMIN_DISABLE_POSTFIX
               value: {{ .Values.disablePostfix | quote }}
           {{- with .Values.extraEnvVars }}
-          {{- tpl (. | toYaml) $ | nindent 14 }}
+          {{- tpl (. | toYaml) $ | nindent 12 }}
           {{- end }}
           volumeMounts:
             - mountPath: /var/lib/pgadmin
@@ -234,4 +234,4 @@ spec:
               type: RuntimeDefault
             {{- end }}
             windowsOptions:
-              hostProcess: false
\ No newline at end of file
+              hostProcess: false
diff --git a/pkg/helm/values.yaml b/pkg/helm/values.yaml
index 10906e8a4..768663706 100644
--- a/pkg/helm/values.yaml
+++ b/pkg/helm/values.yaml
@@ -71,11 +71,11 @@ preferences:
 
 resources:
   requests:
-    cpu: 250m
-    memory: 512Mi
+    cpu: 500m
+    memory: 1Gi
   limits:
-    cpu: 250m
-    memory: 512Mi
+    cpu: 500m
+    memory: 1Gi
 
 persistence:
   enabled: true
@@ -152,4 +152,5 @@ containerSecurityContext:
   appArmorProfile:
     type: RuntimeDefault
   windowsOptions:
-    hostProcess: false
\ No newline at end of file
+
+    hostProcess: false