diff --git a/charts/pixelfed/README.md b/charts/pixelfed/README.md
index 9c5235b..8830e14 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,7 +156,7 @@ 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 | `{}` |  |
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/values.yaml b/charts/pixelfed/values.yaml
index 2c09a6e..7fd1c6c 100644
--- a/charts/pixelfed/values.yaml
+++ b/charts/pixelfed/values.yaml
@@ -89,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/