diff --git a/bitnami/airflow-scheduler/2/debian-11/Dockerfile b/bitnami/airflow-scheduler/2/debian-11/Dockerfile
index bbfcf6298559..aca416e7cf48 100644
--- a/bitnami/airflow-scheduler/2/debian-11/Dockerfile
+++ b/bitnami/airflow-scheduler/2/debian-11/Dockerfile
@@ -7,23 +7,30 @@ ENV HOME="/" \
 COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
-RUN install_packages acl ca-certificates curl gzip libbrotli1 libbsd0 libbz2-1.0 libc6 libcom-err2 libcrypt1 libcurl4 libedit2 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmariadb3 libmd0 libncursesw6 libnettle8 libnghttp2-14 libnsl2 libp11-kit0 libpsl5 libreadline8 librtmp1 libsasl2-2 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libunistring2 libuuid1 libxml2 libxslt1.1 netbase procps tar zlib1g
+RUN install_packages acl ca-certificates curl gzip libbrotli1 libbsd0 libbz2-1.0 libc6 libcom-err2 libcrypt1 libcurl4 libedit2 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmariadb3 libmd0 libncursesw6 libnettle8 libnghttp2-14 libnsl2 libp11-kit0 libpsl5 libreadline8 librtmp1 libsasl2-2 libsasl2-modules libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libunistring2 libuuid1 libxml2 libxslt1.1 locales netbase procps tar zlib1g
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-152" --checksum 0c751c7e2ec0bc900a19dbec0306d6294fe744ddfb0fa64197ba1a36040092f0
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wait-for-port" "1.0.3-150" --checksum 1013e2ebbe58e5dc8f3c79fc952f020fc5306ba48463803cacfbed7779173924
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "python" "3.8.13-152" --checksum a831df58c181297ce77597daf2364175cbb9f211f7755ca8d8c8b5918ad9ce24
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "postgresql-client" "10.21.0-150" --checksum c9d6f09bac47484b4d4aaec3d48018c46d4102fb35abebeb62ef7a3496125e4c
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wait-for-port" "1.0.3-152" --checksum 0694ae67645c416d9f6875e90c0f7cef379b4ac8030a6a5b8b5cc9ca77c6975d
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "python" "3.8.13-154" --checksum c5a4c246e2373d5f2ecc2c08fca804c7551366c8a2a00f66b185bcc5c759b81e
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "postgresql-client" "10.21.0-151" --checksum 115eb173951cb02a87b553e857075f7c09a1d3f0dfd891d61b2b91fcbe556e95
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "ini-file" "1.4.3-151" --checksum 3f23f4fff5bd0ebead5b1a59c450e7b9806198864ff9c765439df14bfb9e1cf4
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "git" "2.37.1-1" --checksum 39ea3040baa552b4760c1100a3713f86493620c0a74121c1ceba50fe17341878
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "airflow-scheduler" "2.3.3-1" --checksum 65982c13163f8b6acc242ecc729a29e43d0b0f2c6ccca25bbbf0db2af625c32f
 RUN apt-get update && apt-get upgrade -y && \
     rm -r /var/lib/apt/lists /var/cache/apt/archives
 RUN chmod g+rwX /opt/bitnami
+RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8
+RUN update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX && \
+    DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales
+RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/airflow-scheduler/postunpack.sh
+RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
 ENV AIRFLOW_HOME="/opt/bitnami/airflow" \
     APP_VERSION="2.3.3" \
     BITNAMI_APP_NAME="airflow-scheduler" \
+    LANG="en_US.UTF-8" \
+    LANGUAGE="en_US:en" \
     LD_LIBRARY_PATH="/opt/bitnami/python/lib/:/opt/bitnami/airflow/venv/lib/python3.8/site-packages/numpy.libs/:$LD_LIBRARY_PATH" \
     LIBNSS_WRAPPER_PATH="/opt/bitnami/common/lib/libnss_wrapper.so" \
     LNAME="airflow" \
diff --git a/bitnami/airflow-scheduler/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/airflow-scheduler/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index b49415e7c45d..e8aa4a70b603 100644
--- a/bitnami/airflow-scheduler/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/airflow-scheduler/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -29,23 +29,23 @@
     },
     "postgresql-client": {
         "arch": "amd64",
-        "digest": "c9d6f09bac47484b4d4aaec3d48018c46d4102fb35abebeb62ef7a3496125e4c",
+        "digest": "115eb173951cb02a87b553e857075f7c09a1d3f0dfd891d61b2b91fcbe556e95",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "10.21.0-150"
+        "version": "10.21.0-151"
     },
     "python": {
         "arch": "amd64",
-        "digest": "a831df58c181297ce77597daf2364175cbb9f211f7755ca8d8c8b5918ad9ce24",
+        "digest": "c5a4c246e2373d5f2ecc2c08fca804c7551366c8a2a00f66b185bcc5c759b81e",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "3.8.13-152"
+        "version": "3.8.13-154"
     },
     "wait-for-port": {
         "arch": "amd64",
-        "digest": "1013e2ebbe58e5dc8f3c79fc952f020fc5306ba48463803cacfbed7779173924",
+        "digest": "0694ae67645c416d9f6875e90c0f7cef379b4ac8030a6a5b8b5cc9ca77c6975d",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.0.3-150"
+        "version": "1.0.3-152"
     }
 }
\ No newline at end of file
diff --git a/bitnami/airflow-scheduler/2/debian-11/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh b/bitnami/airflow-scheduler/2/debian-11/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh
new file mode 100755
index 000000000000..de3120bd8ec0
--- /dev/null
+++ b/bitnami/airflow-scheduler/2/debian-11/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+# shellcheck disable=SC1091
+
+set -o errexit
+set -o nounset
+set -o pipefail
+# set -o xtrace # Uncomment this line for debugging purpose
+
+# Defaults
+WITH_ALL_LOCALES="${WITH_ALL_LOCALES:-no}"
+EXTRA_LOCALES="${EXTRA_LOCALES:-}"
+
+# Constants
+LOCALES_FILE="/etc/locale.gen"
+SUPPORTED_LOCALES_FILE="/usr/share/i18n/SUPPORTED"
+
+# Helper function for enabling locale only when it was not added before
+enable_locale() {
+    local -r locale="${1:?missing locale}"
+    if ! grep -q -E "^${locale}$" "$SUPPORTED_LOCALES_FILE"; then
+        echo "Locale ${locale} is not supported in this system"
+        return 1
+    fi
+    if ! grep -q -E "^${locale}" "$LOCALES_FILE"; then
+        echo "$locale" >> "$LOCALES_FILE"
+    else
+        echo "Locale ${locale} is already enabled"
+    fi
+}
+
+if [[ "$WITH_ALL_LOCALES" =~ ^(yes|true|1)$ ]]; then
+    echo "Enabling all locales"
+    cp "$SUPPORTED_LOCALES_FILE" "$LOCALES_FILE"
+else
+    # shellcheck disable=SC2001
+    LOCALES_TO_ADD="$(sed 's/[,;]\s*/\n/g' <<< "$EXTRA_LOCALES")"
+    while [[ -n "$LOCALES_TO_ADD" ]] && read -r locale; do
+        echo "Enabling locale ${locale}"
+        enable_locale "$locale"
+    done <<< "$LOCALES_TO_ADD"
+fi
+
+locale-gen
diff --git a/bitnami/airflow-scheduler/README.md b/bitnami/airflow-scheduler/README.md
index 89689f5fa29b..e3d0eb3a3727 100644
--- a/bitnami/airflow-scheduler/README.md
+++ b/bitnami/airflow-scheduler/README.md
@@ -33,7 +33,7 @@ You can find the default credentials and available configuration options in the
 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-11`, `2.3.3`, `2.3.3-debian-11-r2`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-airflow-scheduler/blob/2.3.3-debian-11-r2/2/debian-11/Dockerfile)
+* [`2`, `2-debian-11`, `2.3.3`, `2.3.3-debian-11-r5`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-airflow-scheduler/blob/2.3.3-debian-11-r5/2/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/airflow GitHub repo](https://github.com/bitnami/bitnami-docker-airflow-scheduler).