diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 31b95f2..650e5e0 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: helm
-version: 4.0.0-alpha.9
+version: 4.0.0-alpha.10
 kubeVersion: ">= 1.30.0-0"
 description: Platformatic microservices
 type: application
diff --git a/chart/templates/secrets.yaml b/chart/templates/secrets.yaml
index 1e12067..227de4a 100644
--- a/chart/templates/secrets.yaml
+++ b/chart/templates/secrets.yaml
@@ -15,6 +15,7 @@ data:
 {{- end }}
 
 {{/* Set ICC generic secrets */}}
+{{- with .Values.services.icc.secrets }}
 ---
 apiVersion: v1
 kind: Secret
@@ -25,13 +26,15 @@ metadata:
   labels:
     {{- include "application.labels" $ | nindent 4 }}
 data:
-  {{- range $secret, $val := .Values.services.icc.secrets }}
+  {{- range $secret, $val := . }}
   {{ $secret }}: {{ $val | b64enc }}
   {{- end }}
+{{- end }}
 
 {{/* Add all enabled ICC login methods */}}
 
-{{- if .Values.services.icc.login_methods.google_oauth.enable }}
+{{- with .Values.services.icc.login_methods.google_oauth }}
+{{- if .enable }}
 ---
 apiVersion: v1
 kind: Secret
@@ -43,11 +46,13 @@ metadata:
     {{- include "application.labels" $ | nindent 4 }}
     {{- include "application.selectorLabels" (merge (dict "name" "icc-google-oauth") $) | nindent 4 }}
 data:
-  client_id: {{ .Values.services.icc.login_methods.google_oauth.client_id | b64enc }}
-  client_secret: {{ .Values.services.icc.login_methods.google_oauth.client_secret | b64enc }}
+  client_id: {{ .client_id | b64enc }}
+  client_secret: {{ .client_secret | b64enc }}
+{{- end }}
 {{- end }}
 
-{{- if .Values.services.icc.login_methods.github_oauth.enable }}
+{{- with .Values.services.icc.login_methods.github_oauth }}
+{{- if .enable }}
 ---
 apiVersion: v1
 kind: Secret
@@ -59,11 +64,13 @@ metadata:
     {{- include "application.labels" $ | nindent 4 }}
     {{- include "application.selectorLabels" (merge (dict "name" "icc-github-oauth") $) | nindent 4 }}
 data:
-  client_id: {{ .Values.services.icc.login_methods.github_oauth.client_id | b64enc }}
-  client_secret: {{ .Values.services.icc.login_methods.github_oauth.client_secret | b64enc }}
+  client_id: {{ .client_id | b64enc }}
+  client_secret: {{ .client_secret | b64enc }}
+{{- end }}
 {{- end }}
 
 {{/* Setup databases */}}
+{{- if $.Values.services.icc.database_url }}
 ---
 apiVersion: v1
 kind: Secret
@@ -77,8 +84,10 @@ data:
   {{- range (include "service.icc.databases" . | trim | split " ") }}
   "{{ . }}": {{ printf "%s/%s" $.Values.services.icc.database_url . | b64enc }}
   {{- end }}
+{{- end }}
 
 {{/* Setup valkey */}}
+{{- with $.Values.services.icc.valkey }}
 ---
 apiVersion: v1
 kind: Secret
@@ -89,5 +98,10 @@ metadata:
   labels:
     {{- include "application.labels" $ | nindent 4 }}
 data:
-  apps: {{ $.Values.services.icc.valkey.apps_url | b64enc }}
-  icc: {{ $.Values.services.icc.valkey.icc_url | b64enc }}
+  {{- with .apps_url }}
+  apps: {{ . | b64enc }}
+  {{- end }}
+  {{- with .icc_url }}
+  icc: {{ . | b64enc }}
+  {{- end }}
+{{- end }}