diff --git a/library/common/1.0.0/templates/lib/controller/_volumes.tpl b/library/common/1.0.0/templates/lib/controller/_volumes.tpl
index ede3f13413..b35f5475b7 100644
--- a/library/common/1.0.0/templates/lib/controller/_volumes.tpl
+++ b/library/common/1.0.0/templates/lib/controller/_volumes.tpl
@@ -6,84 +6,85 @@ you can specify a size for memory backed volumes.
 */}}
 {{/* Volumes included by the controller. */}}
 {{- define "ix.v1.common.controller.volumes" -}}
-{{- $persistenceDefault := "pvc" -}}
-{{- range $index, $persistence := .Values.persistence }}
-{{- if $persistence.enabled }}
-  {{- if not $persistence.type }} {{/* If persistence type is not defined, fallback to $persistenceDefault */}}
-    {{ $_ := set $persistence "type" $persistenceDefault }}
-  {{- end }}
-- name: {{ tpl ( toString $index ) $ }}
-  {{- if eq $persistence.type "pvc" }} {{/* PVC */}}
-    {{- $pvcName := (include "ix.v1.common.names.fullname" $) -}}
-    {{- if $persistence.existingClaim }} {{/* Always prefer existingClaim if it set */}}
-      {{- $pvcName = $persistence.existingClaim -}}
-    {{- else -}} {{/* Else use nameOverride */}}
-      {{- if $persistence.nameOverride -}}
-        {{- if not (eq $persistence.nameOverride "-") -}}
-          {{- $pvcName = (printf "%s-%s" (include "ix.v1.common.names.fullname" $) $persistence.nameOverride) -}}
-        {{- end -}}
-      {{- else -}} {{/* Else generate the PVC name from fullname + volume name */}}
-        {{- $pvcName = (printf "%s-%s" (include "ix.v1.common.names.fullname" $) $index) -}}
-      {{- end -}}
-      {{- if $persistence.forceName -}}
-        {{- $pvcName = $persistence.forceName }}
-      {{- end -}}
-    {{- end }}
-  persistentVolumeClaim:
-    claimName: {{ tpl $pvcName $ }}
-  {{- else if eq $persistence.type "emptyDir" }} {{/* emptyDir */}}
-    {{- if not (or $persistence.medium $persistence.sizeLimit) }}
-  emptyDir: {}
-    {{- else }}
-  emptyDir:
-      {{- with $persistence.medium }}
-      {{- if eq (tpl . $) "Memory" }}
-    medium: Memory
-        {{- else }}
-          {{- fail "You can only set medium as (Memory)" }}
+  {{- $root := . -}}
+  {{- $persistenceDefault := .Values.global.ixChartContext.defaultPersistenceType -}}
+  {{- range $index, $persistence := .Values.persistence -}}
+    {{- if $persistence.enabled -}}
+      {{- if not $persistence.type -}} {{/* If persistence type is not defined, fallback to $persistenceDefault */}}
+        {{- $_ := set $persistence "type" $persistenceDefault -}}
+      {{- end }}
+- name: {{ tpl (toString $index) $root }}
+      {{- if eq $persistence.type "pvc" -}} {{/* PVC */}}
+        {{- $pvcName := (include "ix.v1.common.names.fullname" $root) -}}
+        {{- if $persistence.existingClaim -}} {{/* Always prefer existingClaim if it set */}}
+          {{- $pvcName = $persistence.existingClaim -}}
+        {{- else -}} {{/* Else use nameOverride */}}
+          {{- if $persistence.nameOverride -}}
+            {{- if not (eq $persistence.nameOverride "-") -}}
+              {{- $pvcName = (printf "%s-%s" (include "ix.v1.common.names.fullname" $root) $persistence.nameOverride) -}}
+            {{- end -}}
+          {{- else -}} {{/* Else generate the PVC name from fullname + volume name */}}
+            {{- $pvcName = (printf "%s-%s" (include "ix.v1.common.names.fullname" $root) $index) -}}
+          {{- end -}}
+          {{- with $persistence.forceName -}}
+            {{- $pvcName = . -}}
+          {{- end -}}
         {{- end }}
-      {{- end }}
-      {{- with $persistence.sizeLimit }}
-    sizeLimit: {{ tpl . $ }}
-      {{- end }}
-    {{- end }}
-  {{- else if has $persistence.type (list "configMap" "secret") }}
-    {{- $objectName := (required (printf "objectName not set for persistence item %s" (toString $index)) $persistence.objectName) }}
-    {{- $objectName = tpl $objectName $ }}
-    {{- if eq $persistence.type "configMap" }} {{/* configMap */}}
+  persistentVolumeClaim:
+    claimName: {{ tpl $pvcName $root }}
+      {{- else if eq $persistence.type "emptyDir" -}} {{/* emptyDir */}}
+        {{- if not (or $persistence.medium $persistence.sizeLimit) }}
+  emptyDir: {}
+        {{- else }}
+  emptyDir:
+          {{- with $persistence.medium -}}
+            {{- if eq (tpl . $root) "Memory" }}
+    medium: Memory
+            {{- else -}}
+              {{- fail "You can only set medium as (Memory)" -}}
+            {{- end -}}
+          {{- end -}}
+          {{- with $persistence.sizeLimit }}
+    sizeLimit: {{ tpl . $root }}
+          {{- end -}}
+        {{- end -}}
+      {{- else if has $persistence.type (list "configMap" "secret") -}}
+        {{- $objectName := (required (printf "objectName not set for persistence item %s" (toString $index)) $persistence.objectName) -}}
+        {{- $objectName = tpl $objectName $root -}}
+        {{- if eq $persistence.type "configMap" }} {{/* configMap */}}
   configMap:
     name: {{ $objectName }}
-    {{- else }} {{/* secret */}}
+        {{- else }} {{/* secret */}}
   secret:
     secretName: {{ $objectName }}
-    {{- end }}
-    {{- with $persistence.defaultMode }}
-    defaultMode: {{ tpl (toString .) $ }}
-    {{- end }}
-    {{- with $persistence.items }}
+        {{- end -}}
+        {{- with $persistence.defaultMode }}
+    defaultMode: {{ tpl (toString .) $root }}
+        {{- end -}}
+        {{- with $persistence.items }}
     items:
-      {{- range . }}
-      - key: {{ tpl (required (printf "No key was given for persistence item %s" (toString $index)) .key) $ }}
-        path: {{ tpl (required (printf "No path was given for persistence item %s" (toString $index)) .path) $ }}
-      {{- end }}
-    {{- end }}
-  {{- else if eq $persistence.type "hostPath" }} {{/* hostPath */}}
+          {{- range . }}
+      - key: {{ tpl (required (printf "No key was given for persistence item %s" (toString $index)) .key) $root }}
+        path: {{ tpl (required (printf "No path was given for persistence item %s" (toString $index)) .path) $root }}
+          {{- end -}}
+        {{- end -}}
+      {{- else if eq $persistence.type "hostPath" }} {{/* hostPath */}}
   hostPath:
     path: {{ required (printf "hostPath not set on item %s" $index) $persistence.hostPath }}
-    {{- with $persistence.hostPathType }}
-    type: {{ tpl . $ }}
-    {{- end }}
-  {{- else if eq $persistence.type "nfs" }}
+        {{- with $persistence.hostPathType }}
+    type: {{ tpl . $root }}
+        {{- end -}}
+      {{- else if eq $persistence.type "nfs" }}
   nfs:
     server: {{ required (printf "NFS Server not set on item %s" $index) $persistence.server }}
     path: {{ required (printf "NFS Path not set on item %s" $index) $persistence.path }}
-  {{- else if eq $persistence.type "ix-volumes" }} {{/* ix-volumes */}}
-  {{/* TODO: Implement ix-volumes */}}
-  {{- else if eq $persistence.type "custom" }} {{/* Custom, in case we want to add something once */}}
-    {{- tpl ( toYaml $persistence.volumeSpec ) $ | nindent 2 }}
-  {{- else }}
-    {{- fail (printf "Not a valid persistence.type (%s)" $persistence.type) }}
-  {{- end }}
-{{- end }}
-{{- end }}
-{{- end }}
+      {{- else if eq $persistence.type "ix-volumes" -}} {{/* ix-volumes */}}
+      {{/* TODO: Implement ix-volumes */}}
+      {{- else if eq $persistence.type "custom" }} {{/* Custom, in case we want to add something once */}}
+        {{- tpl ( toYaml $persistence.volumeSpec ) $root | nindent 2 }}
+      {{- else -}}
+        {{- fail (printf "Not a valid persistence.type (%s)" $persistence.type) -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}