diff --git a/helm/gitea-mirror/templates/configmap.yaml b/helm/gitea-mirror/templates/configmap.yaml
index a953c74..4451772 100644
--- a/helm/gitea-mirror/templates/configmap.yaml
+++ b/helm/gitea-mirror/templates/configmap.yaml
@@ -6,31 +6,31 @@ metadata:
   labels:
     {{- include "gitea-mirror.labels" . | nindent 4 }}
 data:
-  NODE_ENV: {{ $gm.nodeEnv }}
+  NODE_ENV: {{ $gm.nodeEnv | quote }}
   # Core configuration
-  DATABASE_URL: {{ $gm.core.databaseUrl }}
-  BETTER_AUTH_SECRET: {{ $gm.core.be }}
-  BETTER_AUTH_URL: {{ $gm.betterAuthSecret }}
+  DATABASE_URL: {{ $gm.core.databaseUrl | quote }}
+  BETTER_AUTH_SECRET: {{ $gm.core.be | quote }}
+  BETTER_AUTH_URL: {{ $gm.betterAuthSecret | quote }}
   # GitHub Config
-  GITHUB_USERNAME: {{ $gm.github.username }}
-  PRIVATE_REPOSITORIES: {{ $gm.privateRepositories }}
-  MIRROR_STARRED: {{ $gm.mirror.starred }}
-  SKIP_FORKS: {{ $gm.github.skipForks }}
-  SKIP_STARRED_ISSUES: {{ $gm.github.skipStarredIssues }}
+  GITHUB_USERNAME: {{ $gm.github.username | quote }}
+  PRIVATE_REPOSITORIES: {{ $gm.privateRepositories | quote }}
+  MIRROR_STARRED: {{ $gm.mirror.starred | quote }}
+  SKIP_FORKS: {{ $gm.github.skipForks | quote }}
+  SKIP_STARRED_ISSUES: {{ $gm.github.skipStarredIssues | quote }}
   # Gitea Config
-  GITEA_URL: {{ $gm.gitea.url }}
-  GITEA_USERNAME: {{ $gm.gitea.username }}
-  GITEA_ORGANIZATION: {{ $gm.gitea.organization }}
-  GITEA_ORG_VISIBILITY: {{ $gm.gitea.visibility }}
+  GITEA_URL: {{ $gm.gitea.url | quote }}
+  GITEA_USERNAME: {{ $gm.gitea.username | quote }}
+  GITEA_ORGANIZATION: {{ $gm.gitea.organization | quote }}
+  GITEA_ORG_VISIBILITY: {{ $gm.gitea.visibility | quote }}
   # Mirror Options
-  MIRROR_RELEASES: {{ $gm.mirror.releases }}
-  MIRROR_WIKI: {{ $gm.mirror.wiki }}
-  MIRROR_METADATA: {{ $gm.mirror.metadata }}
-  MIRROR_ISSUES: {{ $gm.mirror.issues }}
-  MIRROR_PULL_REQUESTS: {{ $gm.mirror.pullRequests }}
+  MIRROR_RELEASES: {{ $gm.mirror.releases | quote }}
+  MIRROR_WIKI: {{ $gm.mirror.wiki | quote }}
+  MIRROR_METADATA: {{ $gm.mirror.metadata | quote }}
+  MIRROR_ISSUES: {{ $gm.mirror.issues | quote }}
+  MIRROR_PULL_REQUESTS: {{ $gm.mirror.pullRequests | quote }}
   # Automation
-  SCHEDULE_ENABLED: {{ $gm.automation.schedule_enabled }}
-  SCHEDULE_INTERVAL: {{ $gm.automation.schedule_interval }}
+  SCHEDULE_ENABLED: {{ $gm.automation.schedule_enabled| quote  }}
+  SCHEDULE_INTERVAL: {{ $gm.automation.schedule_interval | quote }}
   # Cleanup
-  CLEANUP_ENABLED: {{ $gm.cleanup.enabled }}
-  CLEANUP_INTERVAL: {{ $gm.cleanup.interval }}
+  CLEANUP_ENABLED: {{ $gm.cleanup.enabled | quote }}
+  CLEANUP_INTERVAL: {{ $gm.cleanup.interval | quote }}
diff --git a/helm/gitea-mirror/templates/deployment.yaml b/helm/gitea-mirror/templates/deployment.yaml
index f30e0d6..929cd5a 100644
--- a/helm/gitea-mirror/templates/deployment.yaml
+++ b/helm/gitea-mirror/templates/deployment.yaml
@@ -131,11 +131,9 @@ spec:
       {{- end }}
       volumes:
       {{- if .Values.persistence.enabled }}
-        {{- if .Values.persistence.mount }}
         - name: data
           persistentVolumeClaim:
             claimName: {{ .Values.persistence.claimName }}
-        {{- end }}
       {{- else if not .Values.persistence.enabled }}
           - name: data
             emptyDir: {}
diff --git a/helm/gitea-mirror/templates/httproute.yaml b/helm/gitea-mirror/templates/httproute.yaml
index 11c184f..d9a8bc1 100644
--- a/helm/gitea-mirror/templates/httproute.yaml
+++ b/helm/gitea-mirror/templates/httproute.yaml
@@ -46,7 +46,7 @@ spec:
           port: {{ .Values.service.port }}
       {{- with .Values.route.http.filters }}
       filters:
-         {{ toYaml . | nindent 4 }}
+         {{- toYaml . | nindent 8 }}
       {{- end }}
 {{- end }}
 ---
@@ -72,6 +72,6 @@ spec:
           port: {{ .Values.service.port }}
       {{- with .Values.route.https.filters }}
       filters:
-          {{ toYaml . | nindent 4 }}
+          {{- toYaml . | nindent 8 }}
       {{- end }}
 {{- end }}
diff --git a/helm/gitea-mirror/templates/pvc.yaml b/helm/gitea-mirror/templates/pvc.yaml
index 0e63293..81f9ce9 100644
--- a/helm/gitea-mirror/templates/pvc.yaml
+++ b/helm/gitea-mirror/templates/pvc.yaml
@@ -12,9 +12,9 @@ metadata:
   {{- end }}
 spec:
   accessModes:
-    - {{ .Values.persistence.accessModes }}
+    {{- toYaml .Values.persistence.accessModes | nindent 4 }}
   {{- with .Values.persistence.storageClass }}
-  storageClass: {{ . }}
+  storageClassName: {{ . }}
   {{- end }}
   volumeMode: Filesystem
   {{- with .Values.persistence.volumeName }}
diff --git a/helm/gitea-mirror/values.yaml b/helm/gitea-mirror/values.yaml
index 07eb7f6..123450d 100644
--- a/helm/gitea-mirror/values.yaml
+++ b/helm/gitea-mirror/values.yaml
@@ -86,7 +86,8 @@ persistence:
   create: true
   claimName: gitea-mirror-storage
   storageClass: ""
-  accessMode: ReadWriteOnce
+  accessModes:
+    - ReadWriteOnce
   size: 1Gi
 
 affinity: {}