diff --git a/bitnami/airflow/CHANGELOG.md b/bitnami/airflow/CHANGELOG.md
index 528f056962..c602a55ef0 100644
--- a/bitnami/airflow/CHANGELOG.md
+++ b/bitnami/airflow/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 25.0.2 (2025-08-21)
+## 25.0.4 (2025-09-01)
 
-* [bitnami/airflow] :zap: :arrow_up: Update dependency references ([#36158](https://github.com/bitnami/charts/pull/36158))
+* [bitnami/airflow] Allow multiple executors with CeleryExecutor ([#35423](https://github.com/bitnami/charts/pull/35423))
+
+## <small>25.0.2 (2025-08-21)</small>
+
+* [bitnami/airflow] :zap: :arrow_up: Update dependency references (#36158) ([4a155c7](https://github.com/bitnami/charts/commit/4a155c719f5cb4802a30100b883351620d72f8c7)), closes [#36158](https://github.com/bitnami/charts/issues/36158)
 
 ## <small>25.0.1 (2025-08-14)</small>
 
diff --git a/bitnami/airflow/Chart.yaml b/bitnami/airflow/Chart.yaml
index 545f80a30a..e644a2b871 100644
--- a/bitnami/airflow/Chart.yaml
+++ b/bitnami/airflow/Chart.yaml
@@ -41,4 +41,4 @@ maintainers:
 name: airflow
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/airflow
-version: 25.0.3
+version: 25.0.4
diff --git a/bitnami/airflow/templates/_init_containers_sidecars.tpl b/bitnami/airflow/templates/_init_containers_sidecars.tpl
index 70912c264e..8ae8667186 100644
--- a/bitnami/airflow/templates/_init_containers_sidecars.tpl
+++ b/bitnami/airflow/templates/_init_containers_sidecars.tpl
@@ -47,7 +47,7 @@ Returns an init-container that prepares the Airflow configuration files for main
       db_password="$(airflow_encode_url "$AIRFLOW_DATABASE_PASSWORD")"
       airflow_conf_set "database" "sql_alchemy_conn" "postgresql+psycopg2://${db_user}:${db_password}@${AIRFLOW_DATABASE_HOST}:${AIRFLOW_DATABASE_PORT_NUMBER}/${AIRFLOW_DATABASE_NAME}"
     {{- end }}
-    {{- if or (eq .Values.executor "CeleryExecutor") (eq .Values.executor "CeleryKubernetesExecutor") }}
+    {{- if or (contains "CeleryExecutor" .Values.executor) (eq .Values.executor "CeleryKubernetesExecutor") }}
       {{- if and .Values.usePasswordFiles }}
       export REDIS_PASSWORD="$(< $REDIS_PASSWORD_FILE)"
       {{- end }}
@@ -107,7 +107,7 @@ Returns an init-container that prepares the Airflow configuration files for main
     - name: AIRFLOW_DATABASE_PORT_NUMBER
       value: {{ include "airflow.database.port" . }}
     {{- end }}
-    {{- if or (eq .Values.executor "CeleryExecutor") (eq .Values.executor "CeleryKubernetesExecutor") }}
+    {{- if or (contains "CeleryExecutor" .Values.executor) (eq .Values.executor "CeleryKubernetesExecutor") }}
     - name: REDIS_HOST
       value: {{ include "airflow.redis.host" . | quote }}
     - name: REDIS_PORT_NUMBER
diff --git a/bitnami/airflow/templates/config/configmap-pod-template.yaml b/bitnami/airflow/templates/config/configmap-pod-template.yaml
index 9b85fd2c6d..276b289214 100644
--- a/bitnami/airflow/templates/config/configmap-pod-template.yaml
+++ b/bitnami/airflow/templates/config/configmap-pod-template.yaml
@@ -107,7 +107,7 @@ data:
               value: LocalExecutor
             - name: AIRFLOW_EXECUTOR
               value: {{ include "airflow.worker.executor" . }}
-            {{- if or (eq .Values.executor "CeleryExecutor") (eq .Values.executor "CeleryKubernetesExecutor") }}
+            {{- if or (contains "CeleryExecutor" .Values.executor) (eq .Values.executor "CeleryKubernetesExecutor") }}
             - name: REDIS_HOST
               value: {{ include "airflow.redis.host" . | quote }}
             - name: REDIS_PORT_NUMBER
@@ -254,7 +254,7 @@ data:
               - secret:
                   name: {{ include "airflow.ldap.secretName" . }}
               {{- end }}
-              {{- if or (eq .Values.executor "CeleryExecutor") (eq .Values.executor "CeleryKubernetesExecutor") }}
+              {{- if or (contains "CeleryExecutor" .Values.executor) (eq .Values.executor "CeleryKubernetesExecutor") }}
               - secret:
                   name: {{ include "airflow.redis.secretName" . }}
               {{- end }}
diff --git a/bitnami/airflow/templates/dag-processor/deployment.yaml b/bitnami/airflow/templates/dag-processor/deployment.yaml
index a543478edd..e66844f91d 100644
--- a/bitnami/airflow/templates/dag-processor/deployment.yaml
+++ b/bitnami/airflow/templates/dag-processor/deployment.yaml
@@ -109,7 +109,7 @@ spec:
               value: "dag-processor"
             - name: AIRFLOW_EXECUTOR
               value: {{ .Values.executor }}
-            {{- if or (eq .Values.executor "CeleryExecutor") (eq .Values.executor "CeleryKubernetesExecutor") }}
+            {{- if or (contains "CeleryExecutor" .Values.executor) (eq .Values.executor "CeleryKubernetesExecutor") }}
             - name: REDIS_HOST
               value: {{ include "airflow.redis.host" . | quote }}
             - name: REDIS_PORT_NUMBER
@@ -268,7 +268,7 @@ spec:
                   name:  {{ include "airflow.secretName" . }}
               - secret:
                   name: {{ include "airflow.database.secretName" . }}
-              {{- if or (eq .Values.executor "CeleryExecutor") (eq .Values.executor "CeleryKubernetesExecutor") }}
+              {{- if or (contains "CeleryExecutor" .Values.executor) (eq .Values.executor "CeleryKubernetesExecutor") }}
               - secret:
                   name: {{ include "airflow.redis.secretName" . }}
               {{- end }}
diff --git a/bitnami/airflow/templates/scheduler/deployment.yaml b/bitnami/airflow/templates/scheduler/deployment.yaml
index 9fdce55a3c..31520f651a 100644
--- a/bitnami/airflow/templates/scheduler/deployment.yaml
+++ b/bitnami/airflow/templates/scheduler/deployment.yaml
@@ -115,7 +115,7 @@ spec:
               value: {{ .Values.executor }}
             - name: PYTHONPYCACHEPREFIX
               value: "/opt/bitnami/airflow/venv/tmp"
-            {{- if or (eq .Values.executor "CeleryExecutor") (eq .Values.executor "CeleryKubernetesExecutor") }}
+            {{- if or (contains "CeleryExecutor" .Values.executor) (eq .Values.executor "CeleryKubernetesExecutor") }}
             - name: REDIS_HOST
               value: {{ include "airflow.redis.host" . | quote }}
             - name: REDIS_PORT_NUMBER
@@ -289,7 +289,7 @@ spec:
                   name:  {{ include "airflow.secretName" . }}
               - secret:
                   name: {{ include "airflow.database.secretName" . }}
-              {{- if or (eq .Values.executor "CeleryExecutor") (eq .Values.executor "CeleryKubernetesExecutor") }}
+              {{- if or (contains "CeleryExecutor" .Values.executor) (eq .Values.executor "CeleryKubernetesExecutor") }}
               - secret:
                   name: {{ include "airflow.redis.secretName" . }}
               {{- end }}
diff --git a/bitnami/airflow/templates/setup-db-job.yaml b/bitnami/airflow/templates/setup-db-job.yaml
index 54d9571152..4a18d1e304 100644
--- a/bitnami/airflow/templates/setup-db-job.yaml
+++ b/bitnami/airflow/templates/setup-db-job.yaml
@@ -188,7 +188,7 @@ spec:
                   name:  {{ include "airflow.secretName" . }}
               - secret:
                   name: {{ include "airflow.database.secretName" . }}
-              {{- if or (eq .Values.executor "CeleryExecutor") (eq .Values.executor "CeleryKubernetesExecutor") }}
+              {{- if or (contains "CeleryExecutor" .Values.executor) (eq .Values.executor "CeleryKubernetesExecutor") }}
               - secret:
                   name: {{ include "airflow.redis.secretName" . }}
               {{- end }}
diff --git a/bitnami/airflow/templates/triggerer/statefulset.yaml b/bitnami/airflow/templates/triggerer/statefulset.yaml
index fee0105e3b..87c45c0d47 100644
--- a/bitnami/airflow/templates/triggerer/statefulset.yaml
+++ b/bitnami/airflow/templates/triggerer/statefulset.yaml
@@ -115,7 +115,7 @@ spec:
               value: {{ .Values.executor }}
             - name: PYTHONPYCACHEPREFIX
               value: "/opt/bitnami/airflow/venv/tmp"
-            {{- if or (eq .Values.executor "CeleryExecutor") (eq .Values.executor "CeleryKubernetesExecutor") }}
+            {{- if or (contains "CeleryExecutor" .Values.executor) (eq .Values.executor "CeleryKubernetesExecutor") }}
             - name: REDIS_HOST
               value: {{ include "airflow.redis.host" . | quote }}
             - name: REDIS_PORT_NUMBER
@@ -286,7 +286,7 @@ spec:
                   name:  {{ include "airflow.secretName" . }}
               - secret:
                   name: {{ include "airflow.database.secretName" . }}
-              {{- if or (eq .Values.executor "CeleryExecutor") (eq .Values.executor "CeleryKubernetesExecutor") }}
+              {{- if or (contains "CeleryExecutor" .Values.executor) (eq .Values.executor "CeleryKubernetesExecutor") }}
               - secret:
                   name: {{ include "airflow.redis.secretName" . }}
               {{- end }}
diff --git a/bitnami/airflow/templates/web/deployment.yaml b/bitnami/airflow/templates/web/deployment.yaml
index cf8b318517..6424fd14d6 100644
--- a/bitnami/airflow/templates/web/deployment.yaml
+++ b/bitnami/airflow/templates/web/deployment.yaml
@@ -315,7 +315,7 @@ spec:
               - secret:
                   name: {{ include "airflow.ldap.secretName" . }}
               {{- end }}
-              {{- if or (eq .Values.executor "CeleryExecutor") (eq .Values.executor "CeleryKubernetesExecutor") }}
+              {{- if or (contains "CeleryExecutor" .Values.executor) (eq .Values.executor "CeleryKubernetesExecutor") }}
               - secret:
                   name: {{ include "airflow.redis.secretName" . }}
               {{- end }}
diff --git a/bitnami/airflow/templates/worker/hpa.yaml b/bitnami/airflow/templates/worker/hpa.yaml
index 04dc75a266..31e0854f8e 100644
--- a/bitnami/airflow/templates/worker/hpa.yaml
+++ b/bitnami/airflow/templates/worker/hpa.yaml
@@ -3,7 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if and (or (eq .Values.executor "CeleryExecutor") (eq .Values.executor "CeleryKubernetesExecutor")) (coalesce .Values.worker.autoscaling.hpa.enabled .Values.worker.autoscaling.enabled) }}
+{{- if and (or (contains "CeleryExecutor" .Values.executor) (eq .Values.executor "CeleryKubernetesExecutor")) (coalesce .Values.worker.autoscaling.hpa.enabled .Values.worker.autoscaling.enabled) }}
 apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }}
 kind: HorizontalPodAutoscaler
 metadata:
diff --git a/bitnami/airflow/templates/worker/poddisruptionbudget.yaml b/bitnami/airflow/templates/worker/poddisruptionbudget.yaml
index 63e0bdd00d..99013f4cf4 100644
--- a/bitnami/airflow/templates/worker/poddisruptionbudget.yaml
+++ b/bitnami/airflow/templates/worker/poddisruptionbudget.yaml
@@ -3,7 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if and .Values.worker.pdb.create (or (eq .Values.executor "CeleryExecutor") (eq .Values.executor "CeleryKubernetesExecutor")) }}
+{{- if and .Values.worker.pdb.create (or (contains "CeleryExecutor" .Values.executor) (eq .Values.executor "CeleryKubernetesExecutor")) }}
 kind: PodDisruptionBudget
 apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
 metadata:
diff --git a/bitnami/airflow/templates/worker/statefulset.yaml b/bitnami/airflow/templates/worker/statefulset.yaml
index 4d26151609..3576aca1de 100644
--- a/bitnami/airflow/templates/worker/statefulset.yaml
+++ b/bitnami/airflow/templates/worker/statefulset.yaml
@@ -3,7 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if or (eq .Values.executor "CeleryExecutor") (eq .Values.executor "CeleryKubernetesExecutor") }}
+{{- if or (contains "CeleryExecutor" .Values.executor) (eq .Values.executor "CeleryKubernetesExecutor") }}
 apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }}
 kind: StatefulSet
 metadata:
@@ -117,7 +117,7 @@ spec:
               value: {{ include "airflow.worker.executor" . }}
             - name: PYTHONPYCACHEPREFIX
               value: "/opt/bitnami/airflow/venv/tmp"
-            {{- if or (eq .Values.executor "CeleryExecutor") (eq .Values.executor "CeleryKubernetesExecutor") }}
+            {{- if or (contains "CeleryExecutor" .Values.executor) (eq .Values.executor "CeleryKubernetesExecutor") }}
             - name: REDIS_HOST
               value: {{ include "airflow.redis.host" . | quote }}
             - name: REDIS_PORT_NUMBER
@@ -300,7 +300,7 @@ spec:
               - secret:
                   name: {{ include "airflow.ldap.secretName" . }}
               {{- end }}
-              {{- if or (eq .Values.executor "CeleryExecutor") (eq .Values.executor "CeleryKubernetesExecutor") }}
+              {{- if or (contains "CeleryExecutor" .Values.executor) (eq .Values.executor "CeleryKubernetesExecutor") }}
               - secret:
                   name: {{ include "airflow.redis.secretName" . }}
               {{- end }}
diff --git a/bitnami/airflow/templates/worker/vpa.yaml b/bitnami/airflow/templates/worker/vpa.yaml
index 82de8ba4a3..29fe30e3dc 100644
--- a/bitnami/airflow/templates/worker/vpa.yaml
+++ b/bitnami/airflow/templates/worker/vpa.yaml
@@ -3,7 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if and (or (eq .Values.executor "CeleryExecutor") (eq .Values.executor "CeleryKubernetesExecutor")) (include "common.capabilities.apiVersions.has" ( dict "version" "autoscaling.k8s.io/v1/VerticalPodAutoscaler" "context" . )) .Values.worker.autoscaling.vpa.enabled }}
+{{- if and (or (contains "CeleryExecutor" .Values.executor) (eq .Values.executor "CeleryKubernetesExecutor")) (include "common.capabilities.apiVersions.has" ( dict "version" "autoscaling.k8s.io/v1/VerticalPodAutoscaler" "context" . )) .Values.worker.autoscaling.vpa.enabled }}
 apiVersion: autoscaling.k8s.io/v1
 kind: VerticalPodAutoscaler
 metadata: