diff --git a/bitnami/python/3.8/debian-10/Dockerfile b/bitnami/python/3.8/debian-10/Dockerfile
index d5d01e49689b..bb9a1c35936c 100644
--- a/bitnami/python/3.8/debian-10/Dockerfile
+++ b/bitnami/python/3.8/debian-10/Dockerfile
@@ -3,7 +3,7 @@ LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 COPY prebuildfs /
 # Install required system packages and dependencies
-RUN install_packages build-essential ca-certificates curl git libbz2-1.0 libc6 libffi6 liblzma5 libncursesw6 libreadline7 libsqlite3-0 libsqlite3-dev libssl-dev libssl1.1 libtinfo6 pkg-config procps sudo unzip wget zlib1g
+RUN install_packages build-essential ca-certificates curl git gzip libbz2-1.0 libc6 libffi6 liblzma5 libncursesw6 libreadline7 libsqlite3-0 libsqlite3-dev libssl-dev libssl1.1 libtinfo6 pkg-config procps tar unzip wget zlib1g
 RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/python-3.8.3-4-linux-amd64-debian-10.tar.gz && \
     echo "9154f34ea08789fd1e9fd12afc3fc094b5422894005461f01216c3d8aaef4707  /tmp/bitnami/pkg/cache/python-3.8.3-4-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \
     tar -zxf /tmp/bitnami/pkg/cache/python-3.8.3-4-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
@@ -15,7 +15,10 @@ RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS    90/' /etc/login.defs && \
     sed -i 's/sha512/sha512 minlen=8/' /etc/pam.d/common-password
 
 ENV BITNAMI_APP_NAME="python" \
-    BITNAMI_IMAGE_VERSION="3.8.3-debian-10-r10" \
+    BITNAMI_IMAGE_VERSION="3.8.3-debian-10-r11" \
+    OS_ARCH="amd64" \
+    OS_FLAVOUR="debian-10" \
+    OS_NAME="linux" \
     PATH="/opt/bitnami/python/bin:$PATH"
 
 EXPOSE 8000
diff --git a/bitnami/python/3.8/debian-10/docker-compose.yml b/bitnami/python/3.8/debian-10/docker-compose.yml
index 772a607b03be..223e4749d7d8 100644
--- a/bitnami/python/3.8/debian-10/docker-compose.yml
+++ b/bitnami/python/3.8/debian-10/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
   python:
     tty: true # Enables debugging capabilities when attached to this container.
-    image: 'bitnami/python:3.8'
+    image: 'docker.io/bitnami/python:3.8-debian-10'
     ports:
       - 8000:8000
     volumes:
diff --git a/bitnami/python/3.8/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/python/3.8/debian-10/prebuildfs/usr/sbin/install_packages
new file mode 100755
index 000000000000..c9577647443b
--- /dev/null
+++ b/bitnami/python/3.8/debian-10/prebuildfs/usr/sbin/install_packages
@@ -0,0 +1,24 @@
+#!/bin/sh
+set -e
+set -u
+export DEBIAN_FRONTEND=noninteractive
+n=0
+max=2
+until [ $n -gt $max ]; do
+    set +e
+    (
+      apt-get update -qq &&
+      apt-get install -y --no-install-recommends "$@"
+    )
+    CODE=$?
+    set -e
+    if [ $CODE -eq 0 ]; then
+        break
+    fi
+    if [ $n -eq $max ]; then
+        exit $CODE
+    fi
+    echo "apt failed, retrying"
+    n=$(($n + 1))
+done
+rm -r /var/lib/apt/lists /var/cache/apt/archives
diff --git a/bitnami/python/README.md b/bitnami/python/README.md
index 60c147484e28..1d5268ca6ab5 100644
--- a/bitnami/python/README.md
+++ b/bitnami/python/README.md
@@ -34,14 +34,14 @@ $ docker-compose up -d
 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/).
 
 
-* [`3.8-debian-10-prod`, `3.8.3-debian-10-r10-prod`, `3.8-prod`, `3.8.3-prod` (3.8-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.8.3-debian-10-r10-prod/3.8-prod/debian-10/Dockerfile)
-* [`3.8-debian-10`, `3.8.3-debian-10-r10`, `3.8`, `3.8.3` (3.8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.8.3-debian-10-r10/3.8/debian-10/Dockerfile)
+* [`3.8-prod-debian-10`, `3.8-debian-10-prod`, `3.8.3-prod-debian-10-r10`, `3.8.3-debian-10-r10-prod`, `3.8-prod`, `3.8.3-prod` (3.8-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.8.3-prod-debian-10-r10/3.8-prod/debian-10/Dockerfile)
+* [`3.8-debian-10`, `3.8.3-debian-10-r11`, `3.8`, `3.8.3` (3.8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.8.3-debian-10-r11/3.8/debian-10/Dockerfile)
+* [`3.7-prod-debian-10`, `3.7-debian-10-prod`, `3.7.7-prod-debian-10-r77`, `3.7.7-debian-10-r77-prod`, `3.7-prod`, `3.7.7-prod`, `latest-prod` (3.7-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.7.7-prod-debian-10-r77/3.7-prod/debian-10/Dockerfile)
 * [`3.7-debian-10`, `3.7.7-debian-10-r82`, `3.7`, `3.7.7`, `latest` (3.7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.7.7-debian-10-r82/3.7/debian-10/Dockerfile)
-* [`3.7-debian-10-prod`, `3.7.7-debian-10-r77-prod`, `3.7-prod`, `3.7.7-prod`, `latest-prod` (3.7-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.7.7-debian-10-r77-prod/3.7-prod/debian-10/Dockerfile)
+* [`3.6-prod-debian-10`, `3.6-debian-10-prod`, `3.6.10-prod-debian-10-r117`, `3.6.10-debian-10-r117-prod`, `3.6-prod`, `3.6.10-prod` (3.6-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.6.10-prod-debian-10-r117/3.6-prod/debian-10/Dockerfile)
 * [`3.6-debian-10`, `3.6.10-debian-10-r125`, `3.6`, `3.6.10` (3.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.6.10-debian-10-r125/3.6/debian-10/Dockerfile)
-* [`3.6-debian-10-prod`, `3.6.10-debian-10-r117-prod`, `3.6-prod`, `3.6.10-prod` (3.6-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.6.10-debian-10-r117-prod/3.6-prod/debian-10/Dockerfile)
+* [`2-prod-debian-10`, `2-debian-10-prod`, `2.7.18-prod-debian-10-r31`, `2.7.18-debian-10-r31-prod`, `2-prod`, `2.7.18-prod` (2-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/2.7.18-prod-debian-10-r31/2-prod/debian-10/Dockerfile)
 * [`2-debian-10`, `2.7.18-debian-10-r36`, `2`, `2.7.18` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/2.7.18-debian-10-r36/2/debian-10/Dockerfile)
-* [`2-debian-10-prod`, `2.7.18-debian-10-r31-prod`, `2-prod`, `2.7.18-prod` (2-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/2.7.18-debian-10-r31-prod/2-prod/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/python GitHub repo](https://github.com/bitnami/bitnami-docker-python).