diff --git a/stable/airflow/Chart.yaml b/stable/airflow/Chart.yaml
index 19beb06e84..73514991f3 100644
--- a/stable/airflow/Chart.yaml
+++ b/stable/airflow/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Airflow is a platform to programmatically author, schedule and monitor workflows
 name: airflow
-version: 4.0.4
+version: 4.0.5
 appVersion: 1.10.3
 icon: https://airflow.apache.org/_images/pin_large.png
 home: https://airflow.apache.org/
diff --git a/stable/airflow/templates/_helpers.tpl b/stable/airflow/templates/_helpers.tpl
index 1bc3c6edb0..7ca8126453 100644
--- a/stable/airflow/templates/_helpers.tpl
+++ b/stable/airflow/templates/_helpers.tpl
@@ -99,14 +99,14 @@ The key names for postgres and redis are fixed, which is consistent with the sub
 {{- define "airflow.mapenvsecrets" }}
   - name: POSTGRES_USER
     value: {{ default "postgres" .Values.postgresql.postgresUser | quote }}
-  {{- if .Values.postgresql.existingSecret }}
+  {{- if or .Values.postgresql.existingSecret .Values.postgresql.enabled }}
   - name: POSTGRES_PASSWORD
     valueFrom:
       secretKeyRef:
         name: {{ default (include "airflow.postgresql.fullname" .) .Values.postgresql.existingSecret }}
         key: postgres-password
   {{- end }}
-  {{- if .Values.redis.existingSecret }}
+  {{- if or .Values.redis.existingSecret .Values.redis.enabled }}
   - name: REDIS_PASSWORD
     valueFrom:
       secretKeyRef: