diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml
index 8c1b69b..5f5fad8 100644
--- a/charts/common/Chart.yaml
+++ b/charts/common/Chart.yaml
@@ -15,4 +15,4 @@ type: library
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.0
+version: 0.3.1
diff --git a/charts/common/templates/_envFromRef.yaml b/charts/common/templates/_envFromRef.yaml
index a640001..57eb3c9 100644
--- a/charts/common/templates/_envFromRef.yaml
+++ b/charts/common/templates/_envFromRef.yaml
@@ -1,5 +1,5 @@
 {{- define "common.envFromRef.tpl" -}}
-{{- if or (or (or (.Values.vars) (.Values.secretEnabled)) .Values.sealedSecrets) .Values.secretName }}
+{{- if or (or (or (.Values.vars) (.Values.secretEnabled)) .Values.sealedSecrets) .Values.secretName -}}
 envFrom: &envFrom
 {{- if .Values.vars }}
   - configMapRef:
@@ -18,4 +18,4 @@ envFrom: &envFrom
       name: {{ template "common.robustName" .Release.Name }}
 {{- end }}
 {{- end }}
-{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/common/templates/_volumeMountsRef.yaml b/charts/common/templates/_volumeMountsRef.yaml
index 6fc2dcb..3cf1e77 100644
--- a/charts/common/templates/_volumeMountsRef.yaml
+++ b/charts/common/templates/_volumeMountsRef.yaml
@@ -1,5 +1,5 @@
 {{- define "common.volumeMountsRef.tpl" -}}
-{{- if or (or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets) .Values.existingFileSecrets }}
+{{- if or (or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets) .Values.existingFileSecrets -}}
 volumeMounts: &volumeMounts
 {{- range .Values.volumes }}
 {{- if not (hasPrefix "init-" .name) }}
diff --git a/charts/common/templates/_volumesRef.yaml b/charts/common/templates/_volumesRef.yaml
index 0071344..a1b08aa 100644
--- a/charts/common/templates/_volumesRef.yaml
+++ b/charts/common/templates/_volumesRef.yaml
@@ -1,5 +1,5 @@
 {{- define "common.volumesRef.tpl" -}}
-{{- if or (or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets) .Values.existingFileSecrets }}
+{{- if or (or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets) .Values.existingFileSecrets -}}
 volumes:
   {{- range .Values.volumes }}
   - name: {{ .name }}
diff --git a/charts/cron-job/Chart.lock b/charts/cron-job/Chart.lock
index 0620a84..dea9c02 100644
--- a/charts/cron-job/Chart.lock
+++ b/charts/cron-job/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: file://../common
-  version: 0.3.0
-digest: sha256:4f1fb49a840753587de0b15ccd8ae83f655fc8043d0a71a4cbec228365713b0d
-generated: "2023-06-08T16:30:30.656437+02:00"
+  version: 0.3.1
+digest: sha256:64689b29ef8b2262efbd5d49bccf40f798698d426dcfdc7c632aaf183a8cc681
+generated: "2023-08-18T08:34:24.144108449+02:00"
diff --git a/charts/cron-job/Chart.yaml b/charts/cron-job/Chart.yaml
index 321417d..7f8da16 100644
--- a/charts/cron-job/Chart.yaml
+++ b/charts/cron-job/Chart.yaml
@@ -19,5 +19,5 @@ version: 0.53.0
 
 dependencies:
   - name: common
-    version: 0.3.0
+    version: 0.3.1
     repository: file://../common
diff --git a/charts/cron-job/charts/common-0.3.0.tgz b/charts/cron-job/charts/common-0.3.0.tgz
deleted file mode 100644
index 3bf3323..0000000
Binary files a/charts/cron-job/charts/common-0.3.0.tgz and /dev/null differ
diff --git a/charts/cron-job/charts/common-0.3.1.tgz b/charts/cron-job/charts/common-0.3.1.tgz
new file mode 100644
index 0000000..87b3d60
Binary files /dev/null and b/charts/cron-job/charts/common-0.3.1.tgz differ
diff --git a/charts/onechart/Chart.lock b/charts/onechart/Chart.lock
index ed87a66..f5151d6 100644
--- a/charts/onechart/Chart.lock
+++ b/charts/onechart/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: file://../common
-  version: 0.3.0
-digest: sha256:4f1fb49a840753587de0b15ccd8ae83f655fc8043d0a71a4cbec228365713b0d
-generated: "2023-06-08T16:30:30.052037+02:00"
+  version: 0.3.1
+digest: sha256:64689b29ef8b2262efbd5d49bccf40f798698d426dcfdc7c632aaf183a8cc681
+generated: "2023-08-18T08:31:18.469039683+02:00"
diff --git a/charts/onechart/Chart.yaml b/charts/onechart/Chart.yaml
index b080404..4a0e2ae 100644
--- a/charts/onechart/Chart.yaml
+++ b/charts/onechart/Chart.yaml
@@ -19,5 +19,5 @@ version: 0.53.0
 
 dependencies:
   - name: common
-    version: 0.3.0
+    version: 0.3.1
     repository: file://../common
diff --git a/charts/onechart/charts/common-0.3.0.tgz b/charts/onechart/charts/common-0.3.0.tgz
deleted file mode 100644
index 3bf3323..0000000
Binary files a/charts/onechart/charts/common-0.3.0.tgz and /dev/null differ
diff --git a/charts/onechart/charts/common-0.3.1.tgz b/charts/onechart/charts/common-0.3.1.tgz
new file mode 100644
index 0000000..7e71d58
Binary files /dev/null and b/charts/onechart/charts/common-0.3.1.tgz differ
diff --git a/charts/onechart/templates/deployment.yaml b/charts/onechart/templates/deployment.yaml
index fec893e..6a73480 100644
--- a/charts/onechart/templates/deployment.yaml
+++ b/charts/onechart/templates/deployment.yaml
@@ -63,12 +63,12 @@ spec:
           {{- end }}
           volumeMounts:
           {{- range $.Values.volumes }}  
-          {{if (or (hasPrefix "shared-" .name) (hasPrefix "init-" .name))}}
+          {{- if (or (hasPrefix "shared-" .name) (hasPrefix "init-" .name))}}
           - mountPath: {{ .path }}
             name: {{ .name }}
           {{- end }}
           {{- end }}
-          {{if .securityContext }}
+          {{- if .securityContext }}
           securityContext:
           {{- toYaml .securityContext | nindent 12 }}
           {{- end}}
@@ -91,7 +91,7 @@ spec:
             - name: http
               containerPort: {{ .Values.containerPort }}
               protocol: TCP
-            {{ else }}
+            {{- else }}
             {{- range .Values.ports }}
             - name: {{ .name }}
               containerPort: {{ .containerPort }}
diff --git a/charts/onechart/templates/service.yaml b/charts/onechart/templates/service.yaml
index 8396561..223f368 100644
--- a/charts/onechart/templates/service.yaml
+++ b/charts/onechart/templates/service.yaml
@@ -31,7 +31,7 @@ spec:
       {{- if .Values.nodePort }}
       nodePort: {{ .Values.nodePort }}
       {{- end }}
-    {{ else }}
+    {{- else }}
     {{- range .Values.ports }}
     - name: {{ .name }}
       port: {{ if .svcPort }}{{ .svcPort }}{{ else }}{{ .containerPort }}{{ end }}
diff --git a/values.yaml b/values.yaml
index 8715b6d..c87edcc 100644
--- a/values.yaml
+++ b/values.yaml
@@ -5,8 +5,6 @@ ingress:
 gitRepository: github.com/laszlocph/demo-app
 gitSha: xyz
 
-vars:
-  MY_VAR: "value"
 
 volumes:
   - name: testing
@@ -15,4 +13,8 @@ volumes:
       path: /deleteme
   - name: empty
     path: /deleteme2
-    emptyDir: true 
\ No newline at end of file
+    emptyDir: true
+
+vars:
+  var1: value1
+  var2: value2