diff --git a/deploy/charts/emqx-enterprise/README.md b/deploy/charts/emqx-enterprise/README.md
index df3be6766..b11159c84 100644
--- a/deploy/charts/emqx-enterprise/README.md
+++ b/deploy/charts/emqx-enterprise/README.md
@@ -100,6 +100,7 @@ The following table lists the configurable parameters of the emqx chart and thei
 | `ssl.useExisting` | Use existing certificate or let cert-manager generate one | false |
 | `ssl.existingName` | Name of existing certificate | emqx-tls |
 | `ssl.dnsnames` | DNS name(s) for certificate to be generated | {} |
+| `ssl.commonName` | Common name for or certificate to be generated | |
 | `ssl.issuer.name` | Issuer name for certificate generation | letsencrypt-dns |
 | `ssl.issuer.kind` | Issuer kind for certificate generation | ClusterIssuer |
 
diff --git a/deploy/charts/emqx-enterprise/templates/certificate.yaml b/deploy/charts/emqx-enterprise/templates/certificate.yaml
index 9a2ed969a..528f989a1 100644
--- a/deploy/charts/emqx-enterprise/templates/certificate.yaml
+++ b/deploy/charts/emqx-enterprise/templates/certificate.yaml
@@ -9,6 +9,9 @@ spec:
   issuerRef:
     name: {{ default "letsencrypt-staging" .Values.ssl.issuer.name }}
     kind: {{ default "ClusterIssuer" .Values.ssl.issuer.kind }}
+  {{- if .Values.ssl.commonName }}
+  commonName: {{ .Values.ssl.commonName }}
+  {{- end }}
   dnsNames:
     {{- range .Values.ssl.dnsnames }}
     - {{ . }}
diff --git a/deploy/charts/emqx-enterprise/values.yaml b/deploy/charts/emqx-enterprise/values.yaml
index 71569b9a3..412462854 100644
--- a/deploy/charts/emqx-enterprise/values.yaml
+++ b/deploy/charts/emqx-enterprise/values.yaml
@@ -237,6 +237,7 @@ ssl:
   useExisting: false
   existingName: emqx-tls
   dnsnames: []
+  commonName: 
   issuer:
     name: letsencrypt-dns
     kind: ClusterIssuer
diff --git a/deploy/charts/emqx/README.md b/deploy/charts/emqx/README.md
index 47ae89245..7c6ef122f 100644
--- a/deploy/charts/emqx/README.md
+++ b/deploy/charts/emqx/README.md
@@ -99,6 +99,7 @@ The following table lists the configurable parameters of the emqx chart and thei
 | `ssl.enabled` | Enable SSL support | false |
 | `ssl.useExisting` | Use existing certificate or let cert-manager generate one | false |
 | `ssl.existingName` | Name of existing certificate | emqx-tls |
+| `ssl.commonName` | Common name for or certificate to be generated | |
 | `ssl.dnsnames` | DNS name(s) for certificate to be generated | {} |
 | `ssl.issuer.name` | Issuer name for certificate generation | letsencrypt-dns |
 | `ssl.issuer.kind` | Issuer kind for certificate generation | ClusterIssuer |
diff --git a/deploy/charts/emqx/templates/certificate.yaml b/deploy/charts/emqx/templates/certificate.yaml
index 9a2ed969a..528f989a1 100644
--- a/deploy/charts/emqx/templates/certificate.yaml
+++ b/deploy/charts/emqx/templates/certificate.yaml
@@ -9,6 +9,9 @@ spec:
   issuerRef:
     name: {{ default "letsencrypt-staging" .Values.ssl.issuer.name }}
     kind: {{ default "ClusterIssuer" .Values.ssl.issuer.kind }}
+  {{- if .Values.ssl.commonName }}
+  commonName: {{ .Values.ssl.commonName }}
+  {{- end }}
   dnsNames:
     {{- range .Values.ssl.dnsnames }}
     - {{ . }}
diff --git a/deploy/charts/emqx/values.yaml b/deploy/charts/emqx/values.yaml
index f7c6483fe..86fa44880 100644
--- a/deploy/charts/emqx/values.yaml
+++ b/deploy/charts/emqx/values.yaml
@@ -240,6 +240,7 @@ ssl:
   useExisting: false
   existingName: emqx-tls
   dnsnames: []
+  commonName: 
   issuer:
     name: letsencrypt-dns
     kind: ClusterIssuer