diff --git a/charts/enterprise/clusterissuer/Chart.yaml b/charts/enterprise/clusterissuer/Chart.yaml
index e6216892e41..4c73d94fe52 100644
--- a/charts/enterprise/clusterissuer/Chart.yaml
+++ b/charts/enterprise/clusterissuer/Chart.yaml
@@ -34,4 +34,4 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/enterprise/clusterissuer
   - https://hub.docker.com/_/hello-world
 type: application
-version: 6.3.0
+version: 6.3.1
diff --git a/charts/enterprise/clusterissuer/templates/clusterissuer/_CA.tpl b/charts/enterprise/clusterissuer/templates/clusterissuer/_CA.tpl
index 4867a96380a..3091b2c5e85 100644
--- a/charts/enterprise/clusterissuer/templates/clusterissuer/_CA.tpl
+++ b/charts/enterprise/clusterissuer/templates/clusterissuer/_CA.tpl
@@ -39,8 +39,8 @@ metadata:
   name: {{ .name }}-ca
   namespace: {{ $namespace }}
 data:
-  tls.crt: {{ .crt | replace " " "\n" | b64enc }}
-  tls.key: {{ .key | replace " " "\n" | b64enc }}
+  tls.crt: {{ .crt | replace " CERTIFICATE" "_CERTIFICATE" | replace " " "\n" | replace "_CERTIFICATE" " CERTIFICATE" | b64enc }}
+  tls.key: {{ .key | replace " PRIVATE KEY" "_PRIVATE_KEY" | replace " " "\n" | replace "_PRIVATE_KEY" " PRIVATE KEY" | b64enc }}
 {{- end }}
 ---
 apiVersion: cert-manager.io/v1