diff --git a/bitnami/airflow/2/debian-10/Dockerfile b/bitnami/airflow/2/debian-10/Dockerfile
index 3368f45144cf..34be9354752b 100644
--- a/bitnami/airflow/2/debian-10/Dockerfile
+++ b/bitnami/airflow/2/debian-10/Dockerfile
@@ -28,7 +28,7 @@ RUN /opt/bitnami/scripts/airflow/postunpack.sh
 RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
 ENV AIRFLOW_HOME="/opt/bitnami/airflow" \
     BITNAMI_APP_NAME="airflow" \
-    BITNAMI_IMAGE_VERSION="2.2.3-debian-10-r16" \
+    BITNAMI_IMAGE_VERSION="2.2.3-debian-10-r17" \
     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" \
diff --git a/bitnami/airflow/2/debian-10/docker-compose.yml b/bitnami/airflow/2/debian-10/docker-compose.yml
index 0ef53b7c8701..fda62601ac47 100644
--- a/bitnami/airflow/2/debian-10/docker-compose.yml
+++ b/bitnami/airflow/2/debian-10/docker-compose.yml
@@ -19,8 +19,6 @@ services:
       # ALLOW_EMPTY_PASSWORD is recommended only for development.
       - ALLOW_EMPTY_PASSWORD=yes
   airflow-scheduler:
-    # TODO: to be reverted to use proper registry/distro on T39132
-    # image: docker.io/bitnami/airflow-scheduler:2
     image: docker.io/bitnami/airflow-scheduler:2
     environment:
       - AIRFLOW_DATABASE_NAME=bitnami_airflow
@@ -31,8 +29,6 @@ services:
     volumes:
       - airflow_scheduler_data:/bitnami
   airflow-worker:
-    # TODO: to be reverted to use proper registry/distro on T39132
-    # image: docker.io/bitnami/airflow-worker:2
     image: docker.io/bitnami/airflow-worker:2
     environment:
       - AIRFLOW_DATABASE_NAME=bitnami_airflow
diff --git a/bitnami/airflow/README.md b/bitnami/airflow/README.md
index 644a603c5432..ba3222139a38 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.3`, `2.2.3-debian-10-r16`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-airflow/blob/2.2.3-debian-10-r16/2/debian-10/Dockerfile)
+* [`2`, `2-debian-10`, `2.2.3`, `2.2.3-debian-10-r17`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-airflow/blob/2.2.3-debian-10-r17/2/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/airflow GitHub repo](https://github.com/bitnami/bitnami-docker-airflow).
 
diff --git a/bitnami/airflow/docker-compose-ldap.yml b/bitnami/airflow/docker-compose-ldap.yml
index cec7f7fd7f70..56bb2aa427fb 100644
--- a/bitnami/airflow/docker-compose-ldap.yml
+++ b/bitnami/airflow/docker-compose-ldap.yml
@@ -17,8 +17,6 @@ services:
     environment:
       - ALLOW_EMPTY_PASSWORD=yes
   airflow-scheduler:
-    # TODO: to be reverted to use proper registry/distro on T39132
-    # image: docker.io/bitnami/airflow-scheduler:2
     image: docker.io/bitnami/airflow-scheduler:2
     environment:
       - AIRFLOW_DATABASE_NAME=bitnami_airflow
@@ -29,8 +27,6 @@ services:
     volumes:
       - airflow_scheduler_data:/bitnami
   airflow-worker:
-    # TODO: to be reverted to use proper registry/distro on T39132
-    # image: docker.io/bitnami/airflow-worker:2
     image: docker.io/bitnami/airflow-worker:2
     environment:
       - AIRFLOW_DATABASE_NAME=bitnami_airflow
diff --git a/bitnami/airflow/docker-compose.yml b/bitnami/airflow/docker-compose.yml
index 0ef53b7c8701..fda62601ac47 100644
--- a/bitnami/airflow/docker-compose.yml
+++ b/bitnami/airflow/docker-compose.yml
@@ -19,8 +19,6 @@ services:
       # ALLOW_EMPTY_PASSWORD is recommended only for development.
       - ALLOW_EMPTY_PASSWORD=yes
   airflow-scheduler:
-    # TODO: to be reverted to use proper registry/distro on T39132
-    # image: docker.io/bitnami/airflow-scheduler:2
     image: docker.io/bitnami/airflow-scheduler:2
     environment:
       - AIRFLOW_DATABASE_NAME=bitnami_airflow
@@ -31,8 +29,6 @@ services:
     volumes:
       - airflow_scheduler_data:/bitnami
   airflow-worker:
-    # TODO: to be reverted to use proper registry/distro on T39132
-    # image: docker.io/bitnami/airflow-worker:2
     image: docker.io/bitnami/airflow-worker:2
     environment:
       - AIRFLOW_DATABASE_NAME=bitnami_airflow