diff --git a/README.md b/README.md
index f12e77a1..18abda11 100644
--- a/README.md
+++ b/README.md
@@ -495,6 +495,35 @@ helm upgrade -n <namespace> -f values.yaml <pulsar-release-name> apachepulsar/pu
 
 For more detailed information, see our [Upgrading](http://pulsar.apache.org/docs/helm-upgrade/) guide.
 
+## Upgrading to Helm chart version 4.8.0
+
+### X.509 certificate subject
+
+In order to define the various parameters of the X.509 certificate subject, you need to update `tls.common` values :
+
+```
+# before
+tls:
+  common:
+    organization:
+      - pulsar
+# after
+tls:
+  common:
+    subject:
+      organizations:
+        - pulsar
+      # countries: []
+      # organizationalUnits: []
+      # localities: []
+      # provinces: []
+      # streetAddresses: []
+      # postalCodes: []
+      # serialNumber: ""
+```
+
+The upgrade will fail if you still use the old value `tls.common.organization`.
+
 ## Upgrading to Helm chart version 4.6.0
 
 ### ZooKeeper and Broker Services split into ClusterIP + headless
diff --git a/charts/pulsar/templates/_certs.tpl b/charts/pulsar/templates/_certs.tpl
index 8462d901..9f038cdb 100644
--- a/charts/pulsar/templates/_certs.tpl
+++ b/charts/pulsar/templates/_certs.tpl
@@ -87,9 +87,13 @@ spec:
 {{- end }}
   duration: "{{ .root.Values.tls.common.duration }}"
   renewBefore: "{{ .root.Values.tls.common.renewBefore }}"
+{{- if hasKey .root.Values.tls.common "organization" -}}
+{{- fail "tls.common.organization is no longer supported. Please configure tls.common.subject instead" -}}
+{{- end -}}
+{{- if .root.Values.tls.common.subject }}
   subject:
-    organizations:
-{{ toYaml .root.Values.tls.common.organization | indent 4 }}
+{{ toYaml .root.Values.tls.common.subject | indent 4 }}
+{{- end }}
   # The use of the common name field has been deprecated since 2000 and is
   # discouraged from being used.
   commonName: "{{ template "pulsar.fullname" .root }}-{{ .componentConfig.component }}"
diff --git a/charts/pulsar/values.yaml b/charts/pulsar/values.yaml
index 772f2826..1c6d6925 100755
--- a/charts/pulsar/values.yaml
+++ b/charts/pulsar/values.yaml
@@ -268,8 +268,16 @@ tls:
     duration: 2160h
     # 15d
     renewBefore: 360h
-    organization:
-      - pulsar
+    subject:
+      organizations:
+        - pulsar
+      # countries: []
+      # organizationalUnits: []
+      # localities: []
+      # provinces: []
+      # streetAddresses: []
+      # postalCodes: []
+      # serialNumber: ""
     keySize: 4096
     keyAlgorithm: RSA
     keyEncoding: PKCS8