diff --git a/stable/keycloak/Chart.yaml b/stable/keycloak/Chart.yaml
index 9784dedf9d..fb59e44cf8 100644
--- a/stable/keycloak/Chart.yaml
+++ b/stable/keycloak/Chart.yaml
@@ -1,5 +1,5 @@
 name: keycloak
-version: 4.0.5
+version: 4.0.6
 appVersion: 4.5.0.Final
 description: Open Source Identity and Access Management For Modern Applications and Services
 keywords:
diff --git a/stable/keycloak/templates/headless-service.yaml b/stable/keycloak/templates/headless-service.yaml
index b67a433416..a94be2d314 100644
--- a/stable/keycloak/templates/headless-service.yaml
+++ b/stable/keycloak/templates/headless-service.yaml
@@ -1,3 +1,4 @@
+{{- $highAvailability := gt (int .Values.keycloak.replicas) 1 -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -15,6 +16,12 @@ spec:
       port: {{ .Values.keycloak.service.port }}
       targetPort: http
       protocol: TCP
+  {{- if $highAvailability }}
+    - name: jgroups
+      port: {{ .Values.keycloak.service.jgroupsPort }}
+      targetPort: jgroups
+      protocol: TCP
+  {{- end }}
   selector:
     app: {{ template "keycloak.name" . }}
     release: "{{ .Release.Name }}"
diff --git a/stable/keycloak/templates/statefulset.yaml b/stable/keycloak/templates/statefulset.yaml
index ca8609f2c2..7f56164a8f 100644
--- a/stable/keycloak/templates/statefulset.yaml
+++ b/stable/keycloak/templates/statefulset.yaml
@@ -92,6 +92,11 @@ spec:
             - name: http
               containerPort: 8080
               protocol: TCP
+          {{- if $highAvailability }}
+            - name: jgroups
+              containerPort: 7600
+              protocol: TCP
+          {{- end }}
           livenessProbe:
             httpGet:
               path: /{{ .Values.keycloak.basepath }}/
diff --git a/stable/keycloak/values.yaml b/stable/keycloak/values.yaml
index 2bef2d2d40..950d14c00b 100644
--- a/stable/keycloak/values.yaml
+++ b/stable/keycloak/values.yaml
@@ -162,6 +162,9 @@ keycloak:
 
     port: 80
 
+    # Optional: jGroups port for high availability clustering
+    jgroupsPort: 7600
+
   ## Ingress configuration.
   ## ref: https://kubernetes.io/docs/user-guide/ingress/
   ingress: