diff --git a/bitnami/airflow/2/debian-11/Dockerfile b/bitnami/airflow/2/debian-11/Dockerfile
index 315c0f9e07f2..7b964e012b97 100644
--- a/bitnami/airflow/2/debian-11/Dockerfile
+++ b/bitnami/airflow/2/debian-11/Dockerfile
@@ -7,10 +7,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-09-21T02:45:46Z" \
+      org.opencontainers.image.created="2023-09-22T11:48:04Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.7.1-debian-11-r13" \
+      org.opencontainers.image.ref.name="2.7.1-debian-11-r15" \
       org.opencontainers.image.title="airflow" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.7.1"
@@ -30,7 +30,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
       "python-3.9.18-2-linux-${OS_ARCH}-debian-11" \
       "postgresql-client-15.4.0-1-linux-${OS_ARCH}-debian-11" \
       "ini-file-1.4.5-10-linux-${OS_ARCH}-debian-11" \
-      "airflow-2.7.1-1-linux-${OS_ARCH}-debian-11" \
+      "airflow-2.7.1-2-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/airflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/airflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 28f507f008f5..609498be107d 100644
--- a/bitnami/airflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/airflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "2.7.1-1"
+        "version": "2.7.1-2"
     },
     "ini-file": {
         "arch": "amd64",
diff --git a/bitnami/airflow/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh b/bitnami/airflow/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh
index 70b777fc7fc2..be3f4b0cb488 100644
--- a/bitnami/airflow/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh
+++ b/bitnami/airflow/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh
@@ -186,7 +186,7 @@ airflow_execute() {
 airflow_generate_config() {
     # Create Airflow confirguration from default files
     cp "$(find "$AIRFLOW_BASE_DIR" -name default_airflow.cfg)" "$AIRFLOW_CONF_FILE"
-    cp "$(find "$AIRFLOW_BASE_DIR" -name default_webserver_config.py)" "$AIRFLOW_WEBSERVER_CONF_FILE"
+    [[ -n "$AIRFLOW_WEBSERVER_CONF_FILE" ]] && cp "$(find "$AIRFLOW_BASE_DIR" -name default_webserver_config.py)" "$AIRFLOW_WEBSERVER_CONF_FILE"
 
     # Setup Airflow base URL
     airflow_configure_base_url
@@ -402,6 +402,7 @@ airflow_configure_celery_executor() {
     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}"
+    is_boolean_yes "$AIRFLOW_REDIS_USE_SSL" && airflow_conf_set "celery" "broker_url" "rediss://${redis_user}:${redis_password}@${REDIS_HOST}:${REDIS_PORT_NUMBER}/${REDIS_DATABASE}"
     is_boolean_yes "$AIRFLOW_REDIS_USE_SSL" && airflow_conf_set "celery" "redis_backend_use_ssl" "true"
 
     # Configure celery backend