diff --git a/bitnami/osclass/8/debian-10/Dockerfile b/bitnami/osclass/8/debian-10/Dockerfile
index 3109419356cf..dcb6903d0d30 100644
--- a/bitnami/osclass/8/debian-10/Dockerfile
+++ b/bitnami/osclass/8/debian-10/Dockerfile
@@ -22,14 +22,14 @@ RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
-RUN /opt/bitnami/scripts/apache/postunpack.sh
 RUN /opt/bitnami/scripts/php/postunpack.sh
+RUN /opt/bitnami/scripts/apache/postunpack.sh
 RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh
 RUN /opt/bitnami/scripts/osclass/postunpack.sh
 ENV APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="osclass" \
-    BITNAMI_IMAGE_VERSION="8.0.1-debian-10-r28" \
+    BITNAMI_IMAGE_VERSION="8.0.1-debian-10-r29" \
     PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:$PATH"
 
 EXPOSE 8080 8443
diff --git a/bitnami/osclass/8/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh b/bitnami/osclass/8/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh
index 94abe7e64562..e3098a93b7c0 100644
--- a/bitnami/osclass/8/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh
+++ b/bitnami/osclass/8/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh
@@ -60,6 +60,6 @@ component_unpack() {
         echo "Verifying package integrity"
         echo "$package_sha256  ${base_name}.tar.gz" | sha256sum --check - || exit "$?"
     fi
-    tar --directory "${directory}" --extract --gunzip --file "${base_name}.tar.gz" --no-same-owner --strip-components=2 "${base_name}/files/"
+    tar --directory "${directory}" --extract --gunzip --file "${base_name}.tar.gz" --no-same-owner --strip-components=2
     rm "${base_name}.tar.gz"
 }
diff --git a/bitnami/osclass/README.md b/bitnami/osclass/README.md
index a9717760f96f..b04ae3ed1779 100644
--- a/bitnami/osclass/README.md
+++ b/bitnami/osclass/README.md
@@ -43,7 +43,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy
 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/).
 
 
-- [`8`, `8-debian-10`, `8.0.1`, `8.0.1-debian-10-r28` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-osclass/blob/8.0.1-debian-10-r28/8/debian-10/Dockerfile)
+- [`8`, `8-debian-10`, `8.0.1`, `8.0.1-debian-10-r29` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-osclass/blob/8.0.1-debian-10-r29/8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/osclass GitHub repo](https://github.com/bitnami/bitnami-docker-osclass).