diff --git a/charts/headscale/templates/headscale.yaml b/charts/headscale/templates/headscale.yaml
index 35356e3..1bf3a07 100644
--- a/charts/headscale/templates/headscale.yaml
+++ b/charts/headscale/templates/headscale.yaml
@@ -39,6 +39,34 @@
             port:
               name: http
 ---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    acme.cert-manager.io/http01-edit-in-place: "true"
+    cert-manager.io/cluster-issuer: {{ .Values.certificateIssuer}}
+    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/backend-protocol: "GRPC"
+  name: ingress-grpc
+  namespace: {{ .Release.Namespace }}
+spec:
+  ingressClassName: {{ .Values.ingressClassName }}
+  tls:
+  - hosts:
+    - grpc.headscale.{{ .Values.domain }}
+    secretName: cert-headscale.{{ .Values.domain }}
+  rules:
+  - host: grpc.headscale.{{ .Values.domain }}
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: headscale
+            port:
+              number: grpc
+---
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/charts/headscale/values.yaml b/charts/headscale/values.yaml
index 9843d64..60a25d0 100644
--- a/charts/headscale/values.yaml
+++ b/charts/headscale/values.yaml
@@ -1,6 +1,6 @@
 image:
   repository: headscale/headscale
-  tag: 0.17
+  tag: 0.22.3
   pullPolicy: IfNotPresent
 storage:
   size: 5Gi