diff --git a/charts/stable/statping/Chart.yaml b/charts/stable/statping/Chart.yaml
index 7a9105e0..e46fba38 100644
--- a/charts/stable/statping/Chart.yaml
+++ b/charts/stable/statping/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: v0.90.65
+appVersion: v0.90.74
 description: Status page for monitoring your websites and applications
 name: statping
-version: 3.2.0
+version: 3.2.1
 kubeVersion: ">=1.16.0-0"
 keywords:
 - statping
diff --git a/charts/stable/statping/README.md b/charts/stable/statping/README.md
index e2710578..88eac5fe 100644
--- a/charts/stable/statping/README.md
+++ b/charts/stable/statping/README.md
@@ -1,6 +1,6 @@
 # statping
 
-![Version: 3.2.0](https://img.shields.io/badge/Version-3.2.0-informational?style=flat-square) ![AppVersion: v0.90.65](https://img.shields.io/badge/AppVersion-v0.90.65-informational?style=flat-square)
+![Version: 3.2.1](https://img.shields.io/badge/Version-3.2.1-informational?style=flat-square) ![AppVersion: v0.90.74](https://img.shields.io/badge/AppVersion-v0.90.74-informational?style=flat-square)
 
 Status page for monitoring your websites and applications
 
@@ -76,9 +76,6 @@ N/A
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| env.ADMIN_EMAIL | string | `"info@example.com"` | dashboard admin email |
-| env.ADMIN_PASSWORD | string | `"admin"` | dashboard admin password (needed to edit) |
-| env.ADMIN_USER | string | `"admin"` | dashboard admin user (needed to edit) |
 | env.DB_CONN | string | `"postgres"` | Type of database to use |
 | env.DB_DATABASE | string | postgresql.postgresqlDatabase value | Postgres database password |
 | env.DB_HOST | string | internal postgresql URL | Postgres database hostname |
@@ -92,7 +89,7 @@ N/A
 | env.VIRTUAL_HOST | string | `""` | External URL you use to connect to the statping (the one you enter in your browser) |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"statping/statping"` |  |
-| image.tag | string | `"v0.90.65"` |  |
+| image.tag | string | `v0.90.74` |  |
 | ingress.enabled | bool | `false` |  |
 | persistence | object | see bellow | Generated application config.yaml and logs are written here. Usually does not need to be persisted. |
 | postgresql | object | see bellow | Bitnami postgres chart. For more options see https://github.com/bitnami/charts/tree/master/bitnami/postgresql |
@@ -134,5 +131,3 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Ask a [question](https://github.com/k8s-at-home/organization/discussions)
 - Join our [Discord](https://discord.gg/sTMX7Vh) community
 
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)
\ No newline at end of file
diff --git a/charts/stable/statping/templates/common.yaml b/charts/stable/statping/templates/common.yaml
index c1719f68..eb63571a 100644
--- a/charts/stable/statping/templates/common.yaml
+++ b/charts/stable/statping/templates/common.yaml
@@ -4,21 +4,23 @@
 {{/* use the port specified in the service */}}
 {{- $_ := set .Values.env "VIRTUAL_PORT" .Values.service.port.port -}}
 
-{{/* if DB_HOST is not set use internal postgres chart */}}
-{{- if eq .Values.env.DB_HOST "" -}}
-  {{- $_ := set .Values.env "DB_HOST" (printf "%s-postgresql" .Release.Name) -}}
-{{- end -}}
-{{/* if DB_USER is not set use internal postgres chart */}}
-{{- if eq .Values.env.DB_USER "" -}}
-  {{- $_ := set .Values.env "DB_USER" .Values.postgresql.postgresqlUsername -}}
-{{- end -}}
-{{/* if DB_PASS is not set use internal postgres chart */}}
-{{- if eq .Values.env.DB_PASS "" -}}
-  {{- $_ := set .Values.env "DB_PASS" .Values.postgresql.postgresqlPassword -}}
-{{- end -}}
-{{/* if DB_DATABASE is not set use internal postgres chart */}}
-{{- if eq .Values.env.DB_DATABASE "" -}}
-  {{- $_ := set .Values.env "DB_DATABASE" .Values.postgresql.postgresqlDatabase -}}
+{{- if .Values.postgresql.enabled -}}
+  {{/* if DB_HOST is not set use internal postgres chart */}}
+  {{- if eq .Values.env.DB_HOST "" -}}
+    {{- $_ := set .Values.env "DB_HOST" (printf "%s-postgresql" .Release.Name) -}}
+  {{- end -}}
+  {{/* if DB_USER is not set use internal postgres chart */}}
+  {{- if eq .Values.env.DB_USER "" -}}
+    {{- $_ := set .Values.env "DB_USER" .Values.postgresql.postgresqlUsername -}}
+  {{- end -}}
+  {{/* if DB_PASS is not set use internal postgres chart */}}
+  {{- if eq .Values.env.DB_PASS "" -}}
+    {{- $_ := set .Values.env "DB_PASS" .Values.postgresql.postgresqlPassword -}}
+  {{- end -}}
+  {{/* if DB_DATABASE is not set use internal postgres chart */}}
+  {{- if eq .Values.env.DB_DATABASE "" -}}
+    {{- $_ := set .Values.env "DB_DATABASE" .Values.postgresql.postgresqlDatabase -}}
+  {{- end -}}
 {{- end -}}
 
 {{/* Render the templates */}}
diff --git a/charts/stable/statping/values.yaml b/charts/stable/statping/values.yaml
index 2592f13f..07d3c50f 100644
--- a/charts/stable/statping/values.yaml
+++ b/charts/stable/statping/values.yaml
@@ -38,17 +38,16 @@ env:
   # -- Postgres database password
   # @default -- postgresql.postgresqlDatabase value
   DB_DATABASE: ""
-  # -- dashboard admin user (needed to edit)
-  ADMIN_USER: admin
-  # -- dashboard admin password (needed to edit)
-  ADMIN_PASSWORD: admin
-  # -- dashboard admin email
-  ADMIN_EMAIL: info@example.com
   # -- Use CDN for static context from third-parties
   USE_CDN: false
   # -- Disable logs from appearing and writing to disk
   DISABLE_LOGS: false
-
+  # -- dashboard admin user (needed to edit)
+  # ADMIN_USER: admin
+  # -- dashboard admin password (needed to edit)
+  # ADMIN_PASSWORD: admin
+  # -- dashboard admin email
+  # ADMIN_EMAIL: info@example.com
 
 service:
   port: