diff --git a/bitnami/airflow/2/debian-10/rootfs/opt/bitnami/scripts/airflow-env.sh b/bitnami/airflow/2/debian-10/rootfs/opt/bitnami/scripts/airflow-env.sh
index 5dfa459bee4d..93925459735a 100644
--- a/bitnami/airflow/2/debian-10/rootfs/opt/bitnami/scripts/airflow-env.sh
+++ b/bitnami/airflow/2/debian-10/rootfs/opt/bitnami/scripts/airflow-env.sh
@@ -47,7 +47,6 @@ airflow_env_vars=(
     AIRFLOW_REDIS_USE_SSL
     REDIS_HOST
     REDIS_PORT_NUMBER
-    REDIS_DATABASE
     REDIS_USER
     REDIS_PASSWORD
     AIRFLOW_LDAP_ENABLE
@@ -124,7 +123,6 @@ export AIRFLOW_DATABASE_USE_SSL="${AIRFLOW_DATABASE_USE_SSL:-no}"
 export AIRFLOW_REDIS_USE_SSL="${AIRFLOW_REDIS_USE_SSL:-no}"
 export REDIS_HOST="${REDIS_HOST:-redis}"
 export REDIS_PORT_NUMBER="${REDIS_PORT_NUMBER:-6379}"
-export REDIS_DATABASE="${REDIS_DATABASE:-1}"
 export REDIS_USER="${REDIS_USER:-}"
 export REDIS_PASSWORD="${REDIS_PASSWORD:-}"
 
diff --git a/bitnami/airflow/2/debian-10/rootfs/opt/bitnami/scripts/libairflow.sh b/bitnami/airflow/2/debian-10/rootfs/opt/bitnami/scripts/libairflow.sh
index 301875001557..df04d15b93e8 100644
--- a/bitnami/airflow/2/debian-10/rootfs/opt/bitnami/scripts/libairflow.sh
+++ b/bitnami/airflow/2/debian-10/rootfs/opt/bitnami/scripts/libairflow.sh
@@ -356,7 +356,7 @@ airflow_configure_celery_executor() {
     # Configure celery Redis url
     local -r redis_user=$(airflow_encode_url "$REDIS_USER")
     local -r redis_password=$(airflow_encode_url "$REDIS_PASSWORD")
-    airflow_conf_set "celery" "broker_url" "redis://${redis_user}:${redis_password}@${REDIS_HOST}:${REDIS_PORT_NUMBER}/${REDIS_DATABASE}"
+    airflow_conf_set "celery" "broker_url" "redis://${redis_user}:${redis_password}@${REDIS_HOST}:${REDIS_PORT_NUMBER}/1"
     is_boolean_yes "$AIRFLOW_REDIS_USE_SSL" && airflow_conf_set "celery" "redis_backend_use_ssl" "true"
 
     # Configure celery backend
diff --git a/bitnami/airflow/README.md b/bitnami/airflow/README.md
index b7af2e570620..7c5ab45b7aec 100644
--- a/bitnami/airflow/README.md
+++ b/bitnami/airflow/README.md
@@ -37,7 +37,7 @@ $ docker-compose up
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`2`, `2-debian-10`, `2.2.5`, `2.2.5-debian-10-r5`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-airflow/blob/2.2.5-debian-10-r5/2/debian-10/Dockerfile)
+* [`2`, `2-debian-10`, `2.2.5`, `2.2.5-debian-10-r6`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-airflow/blob/2.2.5-debian-10-r6/2/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/airflow GitHub repo](https://github.com/bitnami/bitnami-docker-airflow).
 
@@ -332,7 +332,6 @@ The Airflow instance can be customized by specifying environment variables on th
 - `AIRFLOW_REDIS_USE_SSL`: Set to yes if Redis(TM) uses SSL. Default: **no**
 - `REDIS_HOST`: Hostname for Redis(TM) server. Default: **redis**
 - `REDIS_PORT_NUMBER`: Port used by Redis(TM) server. Default: **6379**
-- `REDIS_DATABASE`: Database number for Redis(TM) server. Default: **1**
 - `REDIS_USER`: User that Airflow will use to connect with Redis(TM). No defaults.
 - `REDIS_PASSWORD`: Password that Airflow will use to connect with Redis(TM). No defaults.