diff --git a/charts/pixelfed/README.md b/charts/pixelfed/README.md
index 5f73089..793f06c 100644
--- a/charts/pixelfed/README.md
+++ b/charts/pixelfed/README.md
@@ -61,7 +61,7 @@ A Helm chart for deploying Pixelfed on Kubernetes
 | ingress.hosts[0].paths[0].path | string | `"/"` |  |
 | ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` |  |
 | ingress.tls | list | `[]` |  |
-| livenessProbe.httpGet.path | string | `"/"` |  |
+| livenessProbe.httpGet.path | string | `"/api/service/health-check"` |  |
 | livenessProbe.httpGet.port | string | `"http"` |  |
 | nameOverride | string | `""` | This is to override the chart name. |
 | nodeSelector | object | `{}` |  |
@@ -156,12 +156,13 @@ A Helm chart for deploying Pixelfed on Kubernetes
 | podSecurityContext | object | `{}` |  |
 | postgresql.enabled | bool | `true` | enable the bundled postgresql sub chart from Bitnami. Must set to true if externalDatabase.enabled=false |
 | postgresql.fullnameOverride | string | `"postgresql"` |  |
-| readinessProbe.httpGet.path | string | `"/"` |  |
+| readinessProbe.httpGet.path | string | `"/api/service/health-check"` |  |
 | readinessProbe.httpGet.port | string | `"http"` |  |
 | replicaCount | int | `1` | This will set the replicaset count more information can be found here: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/ |
 | resources | object | `{}` |  |
 | securityContext | object | `{}` |  |
 | service.port | int | `80` | This sets the ports more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#field-spec-ports |
+| service.targetPort | int | `80` | Port to attach to on the pods. Also sets what port nginx listens on inside the container. |
 | service.type | string | `"ClusterIP"` | This sets the service type more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types |
 | serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
 | serviceAccount.automount | bool | `true` | Automatically mount a ServiceAccount's API credentials? |
diff --git a/charts/pixelfed/templates/configmap.yaml b/charts/pixelfed/templates/configmap.yaml
index 43f1948..4a9da0a 100644
--- a/charts/pixelfed/templates/configmap.yaml
+++ b/charts/pixelfed/templates/configmap.yaml
@@ -8,6 +8,7 @@ data:
     # app config vars
     APP_NAME={{ .Values.pixelfed.app.name }}
     APP_ENV={{ .Values.pixelfed.app.env }}
+    APP_PORT={{ .Values.service.targetPort }}
     APP_URL={{ .Values.pixelfed.app.url }}
     APP_LOCALE={{ .Values.pixelfed.app.locale }}
     {{- with .Values.pixelfed.app.domain }}
diff --git a/charts/pixelfed/templates/deployment.yaml b/charts/pixelfed/templates/deployment.yaml
index 84c6105..b55c1aa 100644
--- a/charts/pixelfed/templates/deployment.yaml
+++ b/charts/pixelfed/templates/deployment.yaml
@@ -38,7 +38,7 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
-              containerPort: {{ .Values.service.port }}
+              containerPort: {{ .Values.service.targetPort }}
               protocol: TCP
           env:
             # app data
@@ -46,6 +46,8 @@ spec:
               value: {{ .Values.pixelfed.app.name }}
             - name: APP_ENV
               value: {{ .Values.pixelfed.app.env }}
+            - name: APP_PORT
+              value: {{ .Values.service.targetPort | quote}}
             - name: APP_URL
               value: {{ .Values.pixelfed.app.url }}
             - name: APP_LOCALE
diff --git a/charts/pixelfed/templates/secret_mail.yaml b/charts/pixelfed/templates/secret_mail.yaml
index 7bd73cc..95253fc 100644
--- a/charts/pixelfed/templates/secret_mail.yaml
+++ b/charts/pixelfed/templates/secret_mail.yaml
@@ -1,4 +1,4 @@
-{{- if not .Values.externalDatabase.existingSecret }}
+{{- if not .Values.pixelfed.mail.existingSecret }}
 ---
 apiVersion: v1
 kind: Secret
@@ -7,6 +7,10 @@ metadata:
 data:
   host: {{ .Values.pixelfed.mail.host }}
   port: {{ .Values.pixelfed.mail.port }}
+  {{- if .Values.pixelfed.mail.username }}
   username: {{ .Values.pixelfed.mail.username }}
+  {{- end }}
+  {{- if .Values.pixelfed.mail.password }}
   password: {{ .Values.pixelfed.mail.password }}
+  {{- end }}
 {{- end }}
diff --git a/charts/pixelfed/templates/service.yaml b/charts/pixelfed/templates/service.yaml
index 9b85ad5..d5a4d0f 100644
--- a/charts/pixelfed/templates/service.yaml
+++ b/charts/pixelfed/templates/service.yaml
@@ -8,7 +8,7 @@ spec:
   type: {{ .Values.service.type }}
   ports:
     - port: {{ .Values.service.port }}
-      targetPort: http
+      targetPort: {{ .Values.service.targetPort }}
       protocol: TCP
       name: http
   selector:
diff --git a/charts/pixelfed/values.yaml b/charts/pixelfed/values.yaml
index 6fcb6b4..37e95fa 100644
--- a/charts/pixelfed/values.yaml
+++ b/charts/pixelfed/values.yaml
@@ -56,6 +56,8 @@ service:
   type: ClusterIP
   # -- This sets the ports more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#field-spec-ports
   port: 80
+  # -- Port to attach to on the pods. Also sets what port nginx listens on inside the container.
+  targetPort: 80
 
 # This block is for setting up the ingress for more information can be found here: https://kubernetes.io/docs/concepts/services-networking/ingress/
 ingress:
@@ -87,12 +89,12 @@ resources: {}
 # This is to setup the liveness and readiness probes more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
 livenessProbe:
   httpGet:
-    path: /
+    path: /api/service/health-check
     port: http
 
 readinessProbe:
   httpGet:
-    path: /
+    path: /api/service/health-check
     port: http
 
 # This section is for setting up autoscaling more information can be found here: https://kubernetes.io/docs/concepts/workloads/autoscaling/