diff --git a/aidbox/Chart.yaml b/aidbox/Chart.yaml
index 9662e9f..0a251ee 100644
--- a/aidbox/Chart.yaml
+++ b/aidbox/Chart.yaml
@@ -5,4 +5,4 @@ home: https://www.health-samurai.io/aidbox
 icon: https://aidbox.github.io/helm-charts/icon.png?1712669999
 name: aidbox
 type: application
-version: 0.1.14
+version: 0.1.15
diff --git a/aidbox/README.md b/aidbox/README.md
index 0b307e0..169e139 100644
--- a/aidbox/README.md
+++ b/aidbox/README.md
@@ -2,7 +2,7 @@
 
 [Aidbox](https://docs.aidbox.app/) is an efficient and scalable FHIR server built to handle healthcare data effectively, empowering healthcare providers and developers alike with its comprehensive platform for storing, accessing, and exchanging healthcare information in accordance with FHIR standards.
 
-![Version: 0.1.14](https://img.shields.io/badge/Version-0.1.14-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: edge](https://img.shields.io/badge/AppVersion-edge-informational?style=flat-square)
+![Version: 0.1.15](https://img.shields.io/badge/Version-0.1.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: edge](https://img.shields.io/badge/AppVersion-edge-informational?style=flat-square)
 
 ## Installation
 
diff --git a/aidbox/templates/secrets.yaml b/aidbox/templates/secrets.yaml
index 3fb6ec2..06ac01a 100644
--- a/aidbox/templates/secrets.yaml
+++ b/aidbox/templates/secrets.yaml
@@ -6,14 +6,14 @@ metadata:
     {{- include "aidbox.labels" . | nindent 4 }}
 data:
   {{- with .Values.config }}
-  AIDBOX_ADMIN_ID: {{ .AIDBOX_ADMIN_ID | b64enc }}
-  AIDBOX_ADMIN_PASSWORD: {{ .AIDBOX_ADMIN_PASSWORD | b64enc }}
-  AIDBOX_CLIENT_ID: {{ .AIDBOX_CLIENT_ID | b64enc }}
-  AIDBOX_CLIENT_SECRET: {{ .AIDBOX_CLIENT_SECRET | b64enc }}
+  {{ if .AIDBOX_ADMIN_ID }}AIDBOX_ADMIN_ID: {{ .AIDBOX_ADMIN_ID | b64enc }}{{ end }}
+  {{ if .AIDBOX_ADMIN_PASSWORD }}AIDBOX_ADMIN_PASSWORD: {{ .AIDBOX_ADMIN_PASSWORD | b64enc }}{{ end }}
+  {{ if .AIDBOX_CLIENT_ID }}AIDBOX_CLIENT_ID: {{ .AIDBOX_CLIENT_ID | b64enc }}{{ end }}
+  {{ if .AIDBOX_CLIENT_SECRET }}AIDBOX_CLIENT_SECRET: {{ .AIDBOX_CLIENT_SECRET | b64enc }}{{ end }}
   {{ if .AIDBOX_CLUSTER_SECRET }}AIDBOX_CLUSTER_SECRET: {{ .AIDBOX_CLUSTER_SECRET | b64enc }}{{ end }}
   {{ if .AIDBOX_SUPERUSER }}AIDBOX_SUPERUSER: {{ .AIDBOX_SUPERUSER | b64enc }}{{ end }}
   {{ if .AIDBOX_ES_AUTH }}AIDBOX_ES_AUTH: {{ .AIDBOX_ES_AUTH | b64enc }}{{ end }}
-  AIDBOX_LICENSE: {{ .AIDBOX_LICENSE | b64enc }}
-  PGUSER: {{ .PGUSER | b64enc }}
-  PGPASSWORD: {{ .PGPASSWORD | b64enc }}
+  {{ if .AIDBOX_LICENSE }}AIDBOX_LICENSE: {{ .AIDBOX_LICENSE | b64enc }}{{ end }}
+  {{ if .PGUSER }}PGUSER: {{ .PGUSER | b64enc }}{{ end }}
+  {{ if .PGPASSWORD }}PGPASSWORD: {{ .PGPASSWORD | b64enc }}{{ end }}
   {{- end }}