diff --git a/charts/airbyte/templates/_database.tpl b/charts/airbyte/templates/_database.tpl
index fd0e5ef873..ab08bf8607 100644
--- a/charts/airbyte/templates/_database.tpl
+++ b/charts/airbyte/templates/_database.tpl
@@ -207,11 +207,11 @@ Renders all of the common environment variables which provide database credentia
 Renders a set of database secrets to be included in the shared Airbyte secret
 */}}
 {{- define "airbyte.database.secrets" }}
-{{ $user := (include "airbyte.database.user" .)}}
+{{ $user := (include "airbyte.database.user" .) | trim }}
 {{- if not (empty $user) }}
 DATABASE_USER: {{ $user }}
 {{- end }}
-{{ $password := (include "airbyte.database.password" .)}}
+{{ $password := (include "airbyte.database.password" .) | trim }}
 {{- if not (empty $password) }}
 DATABASE_PASSWORD: {{ $password }}
 {{- end}}
diff --git a/charts/airbyte/templates/secret.yaml b/charts/airbyte/templates/secret.yaml
index 7d4230d09c..a0c6a3d432 100644
--- a/charts/airbyte/templates/secret.yaml
+++ b/charts/airbyte/templates/secret.yaml
@@ -15,4 +15,4 @@ stringData:
   KEYCLOAK_ADMIN_USER: {{ .Values.keycloak.auth.adminUsername | quote }}
   KEYCLOAK_ADMIN_PASSWORD: {{ .Values.keycloak.auth.adminPassword | quote }}
   {{- end }}
-  WORKLOAD_API_BEARER_TOKEN: {{ index ".Values.workload-api.bearerToken" | quote }}
+  WORKLOAD_API_BEARER_TOKEN: {{ index .Values "workload-api-server" "bearerToken" | quote }}