diff --git a/charts/headscale/Chart.yaml b/charts/headscale/Chart.yaml
index 0d02b9c11..442f82a1f 100644
--- a/charts/headscale/Chart.yaml
+++ b/charts/headscale/Chart.yaml
@@ -4,9 +4,9 @@ description: An open source, self-hosted implementation of the Tailscale control
 home: https://charts.gabe565.com/charts/headscale
 icon: https://raw.githubusercontent.com/juanfont/headscale/641c6fd439a915150db3c2e83928e289b7e0c9d2/docs/logo/headscale3-dots.png
 type: application
-version: 0.8.4
+version: 0.9.0
 # renovate datasource=docker depName=ghcr.io/juanfont/headscale
-appVersion: 0.20.0
+appVersion: 0.21.0
 kubeVersion: ">=1.22.0-0"
 keywords:
   - headscale
@@ -27,4 +27,4 @@ sources:
 annotations:
   artifacthub.io/changes: |-
     - kind: changed
-      description: Fix error when ingress does not have a host defined
+      description: Update ghcr.io/juanfont/headscale Docker tag to v0.21.0
diff --git a/charts/headscale/README.md b/charts/headscale/README.md
index 85cd5e242..15c538be2 100644
--- a/charts/headscale/README.md
+++ b/charts/headscale/README.md
@@ -2,9 +2,9 @@
 
 <img src="https://raw.githubusercontent.com/juanfont/headscale/641c6fd439a915150db3c2e83928e289b7e0c9d2/docs/logo/headscale3-dots.png" align="right" width="92" alt="headscale logo" style="padding-left: 20px">
 
-![Version: 0.8.4](https://img.shields.io/badge/Version-0.8.4-informational?style=flat)
+![Version: 0.9.0](https://img.shields.io/badge/Version-0.9.0-informational?style=flat)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat)
-![AppVersion: 0.20.0](https://img.shields.io/badge/AppVersion-0.20.0-informational?style=flat)
+![AppVersion: 0.21.0](https://img.shields.io/badge/AppVersion-0.21.0-informational?style=flat)
 
 An open source, self-hosted implementation of the Tailscale control server.
 
@@ -145,7 +145,7 @@ Once deployed, the UI will be available at `/web`.
 | env.HEADSCALE_DNS_CONFIG_BASE_DOMAIN | string | `"example.com"` | Defines the base domain to create the hostnames for MagicDNS. `base_domain` must be a FQDNs, without the trailing dot. The FQDN of the hosts will be `hostname.user.base_domain` (e.g., _myhost.myuser.example.com_). |
 | image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
 | image.repository | string | `"ghcr.io/juanfont/headscale"` | image repository |
-| image.tag | string | `"0.20.0"` | image tag |
+| image.tag | string | `"0.21.0"` | image tag |
 | ingress.main | object | See [values.yaml](./values.yaml) | Enable and configure ingress settings for the chart under this key. |
 | persistence.config | object | See [values.yaml](./values.yaml) | Configure persistence settings for the chart under this key. |
 | postgresql | object | See [values.yaml](./values.yaml) | Enable and configure postgresql database subchart under this key.    For more options see [postgresql chart documentation](https://github.com/bitnami/charts/tree/master/bitnami/postgresql) |
diff --git a/charts/headscale/values.yaml b/charts/headscale/values.yaml
index ca917004f..060e3dfd1 100644
--- a/charts/headscale/values.yaml
+++ b/charts/headscale/values.yaml
@@ -11,7 +11,7 @@ image:
   # -- image pull policy
   pullPolicy: IfNotPresent
   # -- image tag
-  tag: 0.20.0
+  tag: 0.21.0
 
 # -- Environment variables. [[ref]](https://github.com/juanfont/headscale/blob/main/config-example.yaml)
 # @default -- See [values.yaml](./values.yaml)