diff --git a/xos-core/templates/_core.tpl b/xos-core/templates/_core.tpl
index 6722475..bd13e16 100644
--- a/xos-core/templates/_core.tpl
+++ b/xos-core/templates/_core.tpl
@@ -69,6 +69,6 @@
 {{- end }}
 
 {{- define "xos-core.ca_cert_chain" }}
-{{ .Values.ca_cert_chain | b64dec }}
+{{ (.Files.Get "pki/xos-CA.pem")}}
 {{- end }}
 
diff --git a/xos-core/templates/coreapi-cert-secret.yaml b/xos-core/templates/coreapi-cert-secret.yaml
index 048f552..b70cba6 100644
--- a/xos-core/templates/coreapi-cert-secret.yaml
+++ b/xos-core/templates/coreapi-cert-secret.yaml
@@ -20,5 +20,5 @@
   namespace: default
 type: kubernetes.io/tls
 data:
-  tls.crt: {{ .Values.secrets.core_api_cert }}
-  tls.key: {{ .Values.secrets.core_api_key }}
+  tls.crt: {{ .Files.Get "pki/xos-core.pem" | b64enc }}
+  tls.key: {{ .Files.Get "pki/xos-core.key" | b64enc }}