diff --git a/charts/supabase/templates/secrets/analytics.yaml b/charts/supabase/templates/secrets/analytics.yaml
index 8710542fe0752894256b732126765df24411b6f1..b80f4f7431eca73a095df736ad2cbbcbff6b5b2c 100644
--- a/charts/supabase/templates/secrets/analytics.yaml
+++ b/charts/supabase/templates/secrets/analytics.yaml
@@ -8,6 +8,10 @@ metadata:
 type: Opaque
 data:
 {{- range $key, $value := .Values.secret.analytics }}
+{{- if $value }}
+{{- if eq (typeOf $value) "string" }}
   {{ $key }}: {{ $value | b64enc }}
 {{- end }}
 {{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/supabase/templates/secrets/dashboard.yaml b/charts/supabase/templates/secrets/dashboard.yaml
index d0db4c7c138b5a9b779c8cb2a6ead299a09c7a78..cd99197bd5c18d0c7018d6193981c3ad0bb5e8a0 100644
--- a/charts/supabase/templates/secrets/dashboard.yaml
+++ b/charts/supabase/templates/secrets/dashboard.yaml
@@ -9,7 +9,11 @@ metadata:
 type: Opaque
 data:
 {{- range $key, $value := .Values.secret.dashboard }}
+{{- if $value }}
+{{- if eq (typeOf $value) "string" }}
   {{ $key }}: {{ $value | b64enc }}
 {{- end }}
 {{- end }}
 {{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/supabase/templates/secrets/db.yaml b/charts/supabase/templates/secrets/db.yaml
index 21f5735e96f6620af793f80b4574d51a705304d9..aa3544fd9dc2bd48e113e75847ec509c82bb1ea0 100644
--- a/charts/supabase/templates/secrets/db.yaml
+++ b/charts/supabase/templates/secrets/db.yaml
@@ -8,7 +8,11 @@ metadata:
 type: Opaque
 data:
 {{- range $key, $value := .Values.secret.db }}
+{{- if $value }}
+{{- if eq (typeOf $value) "string" }}
   {{ $key }}: {{ $value | b64enc }}
+{{- end }}
+{{- end }}
 {{- end }}
   password_encoded: {{ .Values.secret.db.password | urlquery | b64enc }}
 {{- end }}
diff --git a/charts/supabase/templates/secrets/jwt.yaml b/charts/supabase/templates/secrets/jwt.yaml
index b8d4296c2e405e15d33681285a26a56c36293488..0b190a1cc03b60ac5768b90754859eb5f2d7644f 100644
--- a/charts/supabase/templates/secrets/jwt.yaml
+++ b/charts/supabase/templates/secrets/jwt.yaml
@@ -9,7 +9,11 @@ metadata:
 type: Opaque
 data:
 {{- range $key, $value := .Values.secret.jwt }}
+{{- if $value }}
+{{- if eq (typeOf $value) "string" }}
   {{ $key }}: {{ $value | toString | b64enc }}
 {{- end }}
 {{- end }}
 {{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/supabase/templates/secrets/s3.yaml b/charts/supabase/templates/secrets/s3.yaml
index 510610b05f7137083bc3cdb835684a423ce9f3de..7421da428b53b564846361af3b4ba8da2f45861a 100644
--- a/charts/supabase/templates/secrets/s3.yaml
+++ b/charts/supabase/templates/secrets/s3.yaml
@@ -9,7 +9,11 @@ metadata:
 type: Opaque
 data:
 {{- range $key, $value := .Values.secret.s3 }}
+{{- if $value }}
+{{- if eq (typeOf $value) "string" }}
   {{ $key }}: {{ $value | toString | b64enc }}
 {{- end }}
 {{- end }}
 {{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/supabase/templates/secrets/smtp.yaml b/charts/supabase/templates/secrets/smtp.yaml
index 4dd4a9319ff0b307ef7a8e3d056a7c71ed71c99e..05c3579b80b02978b0413fa16590d176f1cae4c0 100644
--- a/charts/supabase/templates/secrets/smtp.yaml
+++ b/charts/supabase/templates/secrets/smtp.yaml
@@ -9,7 +9,11 @@ metadata:
 type: Opaque
 data:
 {{- range $key, $value := .Values.secret.smtp }}
+{{- if $value }}
+{{- if eq (typeOf $value) "string" }}
   {{ $key }}: {{ $value | b64enc }}
 {{- end }}
 {{- end }}
 {{- end }}
+{{- end }}
+{{- end }}