diff --git a/charts/core-api/templates/serviceaccount.yaml b/charts/core-api/templates/serviceaccount.yaml
index e037ccc..777195b 100644
--- a/charts/core-api/templates/serviceaccount.yaml
+++ b/charts/core-api/templates/serviceaccount.yaml
@@ -2,9 +2,9 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ .Values.serviceAccount.name }}
+  name: {{ include "core-api.serviceAccountName" . }}
   labels:
-    {{- include "search.labels" . | nindent 4 }}
+    {{- include "core-api.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/dev/config/config.json b/dev/.config/config.json
similarity index 100%
rename from dev/config/config.json
rename to dev/.config/config.json