diff --git a/notebooks-accounting/templates/accounting-config.yaml b/notebooks-accounting/templates/accounting-config.yaml
index 679805d..6c744ab 100644
--- a/notebooks-accounting/templates/accounting-config.yaml
+++ b/notebooks-accounting/templates/accounting-config.yaml
@@ -6,37 +6,37 @@ metadata:
 data:
   config.ini: |
     [default]
-    {{- if .Values.accounting.sitename }}
+    {{- if ((.Values.accounting).sitename) }}
     site={{ .Values.accounting.sitename }}
     {{- else }}
     # site=EGI-NOTEBOOKS
     {{- end }}
-    {{- if .Values.accounting.cloudType }}
+    {{- if ((.Values.accounting).cloudType }}
     cloud_type={{ .Values.accounting.cloudType }}
     {{- else }}
     # cloud_type=EGI Notebooks
     {{- end }}
-    {{- if .Values.accounting.service }}
+    {{- if ((.Values.accounting).service }}
     cloud_compute_service={{ .Values.accounting.service }}
     {{- else }}
     # cloud_compute_service=
     {{- end }}
-    {{- if.Values.debug }}
+    {{- if (.Values.debug) }}
     verbose=1
     {{- end }}
-    {{- if .Values.storage.apelSpool }}
+    {{- if ((.Values.storage).apelSpool }}
     apel_spool={{ .Values.storage.apelSpool }}
     {{- else }}
     # apel_spool=
     {{- end }}
-    {{- if .Values.storage.notebooksDb }}
+    {{- if ((.Values.storage).notebooksDb }}
     notebooks_db={{ .Values.storage.notebooksDb }}
     {{- else }}
     # notebooks_db=
     {{- end }}
 
     [prometheus]
-    {{- if .Values.prometheus.url }}
+    {{- if ((.Values.prometheus).url) }}
     url={{ .Values.prometheus.url }}
     {{- else }}
     # url=http://localhost:8080
@@ -55,25 +55,26 @@ data:
 
     # EOSC accounting
     [eosc]
-    {{- if .Values.eosc.tokenUrl }}
+    {{- if ((.Values.eosc).tokenUrl) }}
     token_url={{ .Values.eosc.tokenUrl }}
     {{- end }}
-    {{- if .Values.eosc.clientSecret }}
+    {{- if ((.Values.eosc).clientSecret) }}
     client_secret={{ .Values.eosc.clientSecret }}
     {{- end }}
-    {{- if .Values.eosc.clientId }}
+    {{- if ((.Values.eosc).clientId) }}
     client_id={{ .Values.eosc.clientId }}
     {{- end }}
-    {{- if .Values.eosc.accountingUrl }}
+    {{- if ((.Values.eosc).accountingUrl) }}
     accounting_url={{ .Values.eosc.accountingUrl }}
     {{- end }}
-    {{- if .Values.eosc.installationId }}
+    {{- if ((.Values.eosc).installationId) }}
     installation_id={{ .Values.eosc.installationId }}
     {{- end }}
-    {{- if .Values.storage.timestamp }}
+    {{- if ((.Values.storage).timestamp) }}
     timestamp_file={{ .Values.storage.timestamp }}
     {{- end }}
 
+    {{- if ((.Values.eosc).flavorMetrics) }}
     [eosc.flavors]
     {{- range $key, $val := .Values.eosc.flavorMetrics }}
     {{ $key }}={{ $val }}
diff --git a/notebooks-accounting/templates/accounting-cronjob.yaml b/notebooks-accounting/templates/accounting-cronjob.yaml
index 20843bc..309fcbc 100644
--- a/notebooks-accounting/templates/accounting-cronjob.yaml
+++ b/notebooks-accounting/templates/accounting-cronjob.yaml
@@ -1,5 +1,5 @@
 ---
-{{- if .Values.accounting.schedule }}
+{{- if ((.Values.accounting).schedule) }}
 apiVersion: batch/v1
 kind: CronJob
 metadata:
diff --git a/notebooks-accounting/templates/eosc-cronjob.yaml b/notebooks-accounting/templates/eosc-cronjob.yaml
index 6b6ea23..fd06492 100644
--- a/notebooks-accounting/templates/eosc-cronjob.yaml
+++ b/notebooks-accounting/templates/eosc-cronjob.yaml
@@ -1,5 +1,5 @@
 ---
-{{- if .Values.eosc.schedule }}
+{{- if ((.Values.eosc).schedule) }}
 apiVersion: batch/v1
 kind: CronJob
 metadata:
diff --git a/notebooks-accounting/templates/ssm-config.yaml b/notebooks-accounting/templates/ssm-config.yaml
index 1105c43..bca2d7b 100644
--- a/notebooks-accounting/templates/ssm-config.yaml
+++ b/notebooks-accounting/templates/ssm-config.yaml
@@ -1,5 +1,5 @@
 ---
-{{- if .Values.ssm.schedule }}
+{{- if ((.Values.ssm).schedule) }}
 kind: ConfigMap
 apiVersion: v1
 metadata:
diff --git a/notebooks-accounting/templates/ssm-cronjob.yaml b/notebooks-accounting/templates/ssm-cronjob.yaml
index f889092..f461d34 100644
--- a/notebooks-accounting/templates/ssm-cronjob.yaml
+++ b/notebooks-accounting/templates/ssm-cronjob.yaml
@@ -1,5 +1,5 @@
 ---
-{{- if .Values.ssm.schedule }}
+{{- if ((.Values.ssm).schedule) }}
 apiVersion: batch/v1
 kind: CronJob
 metadata:
diff --git a/notebooks-accounting/templates/ssm-secret.yaml b/notebooks-accounting/templates/ssm-secret.yaml
index 10d6516..93c9cd5 100644
--- a/notebooks-accounting/templates/ssm-secret.yaml
+++ b/notebooks-accounting/templates/ssm-secret.yaml
@@ -1,5 +1,5 @@
 ---
-{{- if .Values.ssm.schedule }}
+{{- if ((.Values.ssm).schedule) }}
 kind: Secret
 apiVersion: v1
 metadata: