diff --git a/charts/kube-plex/templates/deployment.yaml b/charts/kube-plex/templates/deployment.yaml
index b2a897c..22856f2 100644
--- a/charts/kube-plex/templates/deployment.yaml
+++ b/charts/kube-plex/templates/deployment.yaml
@@ -75,23 +75,11 @@ spec:
             fieldRef:
               fieldPath: metadata.namespace
         - name: TRANSCODE_PVC
-{{- if .Values.persistence.transcode.claimName }}
-          value: "{{ .Values.persistence.transcode.claimName }}"
-{{- else }}
-          value: "{{ template "fullname" . }}-transcode"
-{{- end }}
+          value: {{ if .Values.persistence.config.claimName }}{{ .Values.persistence.config.claimName }}{{- else }}{{ template "fullname" . }}-transcode{{- end }}
         - name: DATA_PVC
-{{- if .Values.persistence.data.claimName }}
-          value: "{{ .Values.persistence.data.claimName }}"
-{{- else }}
-          value: "{{ template "fullname" . }}-data"
-{{- end }}
+          value: {{ if .Values.persistence.config.claimName }}{{ .Values.persistence.config.claimName }}{{- else }}{{ template "fullname" . }}-data{{- end }}
         - name: CONFIG_PVC
-{{- if .Values.persistence.config.claimName }}
-          value: "{{ .Values.persistence.config.claimName }}"
-{{- else }}
-          value: "{{ template "fullname" . }}-config"
-{{- end }}
+          value: {{ if .Values.persistence.config.claimName }}{{ .Values.persistence.config.claimName }}{{- else }}{{ template "fullname" . }}-config{{- end }}
         volumeMounts:
         - name: data
           mountPath: /data
diff --git a/charts/kube-plex/templates/ingress.yaml b/charts/kube-plex/templates/ingress.yaml
index 588ceac..167f70b 100644
--- a/charts/kube-plex/templates/ingress.yaml
+++ b/charts/kube-plex/templates/ingress.yaml
@@ -22,7 +22,7 @@ spec:
           - path: /
             backend:
               serviceName: {{ $serviceName }}
-              servicePort: {{ .Values.service.port }}
+              servicePort: pms
     {{- end -}}
   {{- if .Values.ingress.tls }}
   tls: