diff --git a/charts/keycloak/Chart.yaml b/charts/keycloak/Chart.yaml
index 910a621ab8a9774e0c144843e11afda1bb9aa231..54bf51267fc65bef005357d78948cca55f8137c5 100644
--- a/charts/keycloak/Chart.yaml
+++ b/charts/keycloak/Chart.yaml
@@ -7,5 +7,5 @@ icon: https://www.keycloak.org/resources/images/keycloak_icon_512px.svg
 sources:
   - https://git.shivering-isles.com/shivering-isles/infrastructure-gitops
   - https://github.com/keycloak/keycloak
-version: 0.1.6
+version: 0.2.0
 appVersion: "19.0.2"
diff --git a/charts/keycloak/README.md b/charts/keycloak/README.md
index 8d72029baabca5fade707687f9bc14eae6d62d0b..5af81c6e7fa0b7ca17f4727c65fd3dd802b53905 100644
--- a/charts/keycloak/README.md
+++ b/charts/keycloak/README.md
@@ -1,6 +1,6 @@
 # keycloak
 
-![Version: 0.1.6](https://img.shields.io/badge/Version-0.1.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 19.0.2](https://img.shields.io/badge/AppVersion-19.0.2-informational?style=flat-square)
+![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 19.0.2](https://img.shields.io/badge/AppVersion-19.0.2-informational?style=flat-square)
 
 (Alpha) A Helm chart for Keycloak on Kubernetes
 
diff --git a/charts/keycloak/templates/deployment.yaml b/charts/keycloak/templates/deployment.yaml
index e7cf34037e3e60b800d090ee0756a4fb743f23a9..ffd455621b567fa9d41b62dc112fb8c3ffa61adc 100644
--- a/charts/keycloak/templates/deployment.yaml
+++ b/charts/keycloak/templates/deployment.yaml
@@ -38,6 +38,7 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - start
+            - --cache-stack=kubernetes
             - --proxy
             - '{{ .Values.keycloak.proxy }}'
             {{- if gt (len .Values.keycloak.features) 0 }}
@@ -53,6 +54,8 @@ spec:
             {{- end }}
             - name: KC_HOSTNAME
               value: "{{ required "Setting a hostname is required" .Values.keycloak.hostname }}"
+            - name: JAVA_OPTS_APPEND
+              value: '-Djgroups.dns.query={{ include "keycloak.fullname" . }}-headless.{{ .Release.Namespace }}.svc.cluster.local'
             {{- if .Values.keycloak.database.type}}
             - name: KC_DB
               value: "{{ .Values.keycloak.database.type }}"
diff --git a/charts/keycloak/templates/service.yaml b/charts/keycloak/templates/service.yaml
index 14ce8c7c666b48dd29cd2ff4710fbed35fb0383c..20916f6a5501120f6ffcfee3ba6f7bb07ab7da54 100644
--- a/charts/keycloak/templates/service.yaml
+++ b/charts/keycloak/templates/service.yaml
@@ -13,3 +13,14 @@ spec:
       name: http
   selector:
     {{- include "keycloak.selectorLabels" . | nindent 4 }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "keycloak.fullname" . }}-headless
+  labels:
+    {{- include "keycloak.labels" . | nindent 4 }}
+spec:
+  type: None
+  selector:
+    {{- include "keycloak.selectorLabels" . | nindent 4 }}