diff --git a/homeassistant/templates/homeassistant-core-config.configmap.yaml b/homeassistant/templates/homeassistant-core-config.configmap.yaml
index f9d082c..8a362b8 100644
--- a/homeassistant/templates/homeassistant-core-config.configmap.yaml
+++ b/homeassistant/templates/homeassistant-core-config.configmap.yaml
@@ -3,8 +3,7 @@ kind: ConfigMap
 metadata:
   name: {{ .Release.Name }}-{{ .Chart.Name }}-core-config
 data:
-  config.yaml: |-
+  config: |-
     http: !include http-config.yaml
 
-  http-config.yaml: |-
-    {{ .Values.homeassistant.config.httpConfig }}
+  http-config: "{{ toYaml .Values.homeassistant.config.httpConfig | indent 2 }}"
diff --git a/homeassistant/templates/homeassistant.sfs.yaml b/homeassistant/templates/homeassistant.sfs.yaml
index 6e4ca14..110503b 100644
--- a/homeassistant/templates/homeassistant.sfs.yaml
+++ b/homeassistant/templates/homeassistant.sfs.yaml
@@ -47,12 +47,12 @@ spec:
           configMap:
             name: {{ .Release.Name }}-{{ .Chart.Name }}-core-config
             items:
-              - key: config.yaml
-                path: config.yaml
+              - key: config
+                path: configuration.yaml
         - name: http-config
           configMap:
             name: {{ .Release.Name }}-{{ .Chart.Name }}-core-config
             items:
-              - key: http-config.yaml
+              - key: http-config
                 path: http-config.yaml
       # TODO: bind to local nodes
\ No newline at end of file