diff --git a/helm/defectdojo/templates/media-pvc.yaml b/helm/defectdojo/templates/media-pvc.yaml
index 57fcae8e0c7..6649ec7a77c 100644
--- a/helm/defectdojo/templates/media-pvc.yaml
+++ b/helm/defectdojo/templates/media-pvc.yaml
@@ -4,7 +4,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  {{- with .Values.extraAnnotations }}
+  {{- with $.Values.extraAnnotations }}
   annotations:
     {{- range $key, $value := . }}
     {{ $key }}: {{ quote $value }}
@@ -16,18 +16,18 @@ metadata:
     app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     helm.sh/chart: {{ include "defectdojo.chart" $ }}
-    {{- range $key, $value := .Values.extraLabels }}
+    {{- range $key, $value := $.Values.extraLabels }}
     {{ $key }}: {{ quote $value }}
     {{- end }}
   name: {{ $fullName }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ $.Release.Namespace }}
 spec:
   accessModes: 
   {{- toYaml .persistentVolumeClaim.accessModes | nindent 4 }}
   resources:
     requests:
       storage: {{ .persistentVolumeClaim.size }}
-  {{- if .persistentVolumeClaim.storageClassName }}
+  {{- with .persistentVolumeClaim.storageClassName }}
   storageClassName: {{ .persistentVolumeClaim.storageClassName }}
   {{- end }}
 {{- end }}