diff --git a/README.md b/README.md
index 0b468b77..f80ee035 100644
--- a/README.md
+++ b/README.md
@@ -295,7 +295,7 @@ helm delete --namespace test my-application
 | certificate.duration | string | `"8760h0m0s"` | The requested "duration" (i.e. lifetime) of the Certificate. |
 | certificate.renewBefore | string | `"720h0m0s"` | The amount of time before the currently issued certificate's notAfter time that cert-manager will begin to attempt to renew the certificate. |
 | certificate.subject | tpl/object | `nil` | Full X509 name specification for certificate. |
-| certificate.commonName | string | `"admin-app"` | Common name as specified on the DER encoded CSR. |
+| certificate.commonName | tpl/string | `nil` | Common name as specified on the DER encoded CSR. This field is not recommended in cases when this certificate is an end-entity certificate. More information can be found in the [cert-manager documentation](https://cert-manager.io/docs/usage/certificate/#:~:text=%23%20Avoid%20using%20commonName,%3A%20example.com). |
 | certificate.keyAlgorithm | string | `"rsa"` | Private key algorithm of the corresponding private key for this certificate. |
 | certificate.keyEncoding | string | `"pkcs1"` | Private key cryptography standards (PKCS) for this certificate's private key to be encoded in. |
 | certificate.keySize | int | `2048` | Key bit size of the corresponding private key for this certificate. |
diff --git a/application/values.yaml b/application/values.yaml
index cbdb247c..9a1cb31c 100644
--- a/application/values.yaml
+++ b/application/values.yaml
@@ -907,9 +907,10 @@ certificate:
   #    - Stockholm
   #  provinces:
   #    - Stockholm
-  # -- (string) Common name as specified on the DER encoded CSR.
+  # -- (tpl/string) Common name as specified on the DER encoded CSR. This field is not recommended in cases when this certificate is an end-entity certificate. More information can be found in the [cert-manager documentation](https://cert-manager.io/docs/usage/certificate/#:~:text=%23%20Avoid%20using%20commonName,%3A%20example.com).
   # @section -- cert-manager Certificate Parameters
-  commonName: admin-app
+  commonName:
+  # commonName: admin-app
   # -- (string) Private key algorithm of the corresponding private key for this certificate.
   # @section -- cert-manager Certificate Parameters
   keyAlgorithm: rsa