diff --git a/charts/unikorn-common/Chart.yaml b/charts/unikorn-common/Chart.yaml
index 15eaa46..573f946 100644
--- a/charts/unikorn-common/Chart.yaml
+++ b/charts/unikorn-common/Chart.yaml
@@ -4,6 +4,6 @@ description: Unikorn common templates to keep dependent charts in check.
 
 type: application
 
-version: v0.1.4
+version: v0.1.5
 
 icon: https://raw.githubusercontent.com/unikorn-cloud/assets/main/images/logos/dark-on-light/icon.png
diff --git a/charts/unikorn-common/templates/_helpers.tpl b/charts/unikorn-common/templates/_helpers.tpl
index 124f8b3..bc6e5cb 100644
--- a/charts/unikorn-common/templates/_helpers.tpl
+++ b/charts/unikorn-common/templates/_helpers.tpl
@@ -145,17 +145,17 @@ however you could also create a shared secret for things like letsencrypt-stagin
 where you want to use ACME, but don't want to make is widely structed by browsers.
 */}}
 {{- define "unikorn.ca.secretNamespace" -}}
-{{- if (and .Values.global .Values.global.ca .Values.global.ca .Values.global.ca.secretNamespace) -}}
+{{- if (and .Values.global .Values.global.ca .Values.global.ca.secretNamespace) -}}
 {{- .Values.global.ca.secretNamespace }}
-{{- else if .Values.identity.caSecretNamespace }}
+{{- else if (and .Values.ca .Values.ca.secretNamespace) -}}
 {{- .Values.ca.secretNamespace }}
 {{- end }}
 {{- end }}
 
 {{- define "unikorn.ca.secretName" -}}
-{{- if (and .Values.global .Values.global.ca .Values.global.ca .Values.global.ca.secretName) -}}
+{{- if (and .Values.global .Values.global.ca .Values.global.ca.secretName) -}}
 {{- .Values.global.ca.secretName }}
-{{- else if .Values.ca.secretName }}
+{{- else if (and .Values.ca .Values.ca.secretName) -}}
 {{- .Values.ca.secretName }}
 {{- end }}
 {{- end }}