diff --git a/charts/intel/templates/secrets.yaml b/charts/intel/templates/secrets.yaml
index 5cdd56d..b5b85e7 100644
--- a/charts/intel/templates/secrets.yaml
+++ b/charts/intel/templates/secrets.yaml
@@ -4,5 +4,13 @@ metadata:
   name: ai-secrets
 type: Opaque
 data:
+  {{- if .Values.ai.openai }}
+  {{- if .Values.ai.openai.api_key }}
   openai-api-key: {{ .Values.ai.openai.api_key | b64enc }}
+  {{- end }}
+  {{- end }}
+  {{- if .Values.ai.external }}
+  {{- if .Values.ai.external.api_key }}
   external-ai-key: {{ .Values.ai.external.api_key | b64enc }}
+  {{- end }}
+  {{- end }}