diff --git a/bitnami/harbor-core/1/debian-10/Dockerfile b/bitnami/harbor-core/1/debian-10/Dockerfile
index d5952e577777..15a4f40d3fb1 100644
--- a/bitnami/harbor-core/1/debian-10/Dockerfile
+++ b/bitnami/harbor-core/1/debian-10/Dockerfile
@@ -1,15 +1,14 @@
 FROM docker.io/bitnami/minideb:buster
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
-ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
-    HOME="/" \
+ENV HOME="/" \
     OS_ARCH="amd64" \
     OS_FLAVOUR="debian-10" \
     OS_NAME="linux"
 
 COPY prebuildfs /
 # Install required system packages and dependencies
-RUN install_packages ca-certificates curl libc6 procps sudo unzip
+RUN install_packages ca-certificates curl gzip libc6 procps tar
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wait-for-port" "1.0.0-1" --checksum 07c4678654b01811f22b5bb65a8d6f8e253abd4524ebb3b78c7d3df042cf23bd
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "ini-file" "1.3.0-0" --checksum 41c77c119c1fb01936942bdd7f463f777d5edc29809038f977a7ab78ffdab342
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "harbor-core" "1.10.2-0" --checksum 06add6c0d49d539191ec49a92aa806ed8b04a402363eaad321e6eead5d2ad4fb
@@ -20,8 +19,7 @@ RUN apt-get update && apt-get upgrade -y && \
 COPY rootfs /
 RUN /opt/bitnami/scripts/harbor-core/postunpack.sh
 ENV BITNAMI_APP_NAME="harbor-core" \
-    BITNAMI_IMAGE_VERSION="1.10.2-debian-10-r39" \
-    NAMI_PREFIX="/.nami" \
+    BITNAMI_IMAGE_VERSION="1.10.2-debian-10-r40" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/harbor-core/bin:$PATH"
 
 VOLUME [ "/etc/core", "/data" ]
diff --git a/bitnami/harbor-core/1/debian-10/docker-compose.yml b/bitnami/harbor-core/1/debian-10/docker-compose.yml
index d25b8ea08732..e5d14bcea1bb 100644
--- a/bitnami/harbor-core/1/debian-10/docker-compose.yml
+++ b/bitnami/harbor-core/1/debian-10/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   harbor-core:
-    image: bitnami/harbor-core:1
+    image: docker.io/bitnami/harbor-core:1-debian-10
     ports:
       - 80:8080
     environment:
diff --git a/bitnami/harbor-core/1/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/harbor-core/1/debian-10/prebuildfs/usr/sbin/install_packages
new file mode 100755
index 000000000000..c9577647443b
--- /dev/null
+++ b/bitnami/harbor-core/1/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/harbor-core/README.md b/bitnami/harbor-core/README.md
index f861763c9451..cca8262b528a 100644
--- a/bitnami/harbor-core/README.md
+++ b/bitnami/harbor-core/README.md
@@ -41,7 +41,7 @@ Non-root container images add an extra layer of security and are generally recom
 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/).
 
 
-* [`1-debian-10`, `1.10.2-debian-10-r39`, `1`, `1.10.2`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-harbor-core/blob/1.10.2-debian-10-r39/1/debian-10/Dockerfile)
+* [`1-debian-10`, `1.10.2-debian-10-r40`, `1`, `1.10.2`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-harbor-core/blob/1.10.2-debian-10-r40/1/debian-10/Dockerfile)
 
 # Configuration
 
diff --git a/bitnami/harbor-core/docker-compose.yml b/bitnami/harbor-core/docker-compose.yml
index d25b8ea08732..e5d14bcea1bb 100644
--- a/bitnami/harbor-core/docker-compose.yml
+++ b/bitnami/harbor-core/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   harbor-core:
-    image: bitnami/harbor-core:1
+    image: docker.io/bitnami/harbor-core:1-debian-10
     ports:
       - 80:8080
     environment: