diff --git a/bitnami/matomo/5/debian-12/Dockerfile b/bitnami/matomo/5/debian-12/Dockerfile
index dca2b2c73b01..d82efb2fa0e2 100644
--- a/bitnami/matomo/5/debian-12/Dockerfile
+++ b/bitnami/matomo/5/debian-12/Dockerfile
@@ -7,10 +7,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2024-03-31T17:57:50Z" \
+      org.opencontainers.image.created="2024-04-01T11:41:21Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="5.0.3-debian-12-r2" \
+      org.opencontainers.image.ref.name="5.0.3-debian-12-r3" \
       org.opencontainers.image.title="matomo" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="5.0.3"
diff --git a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/matomo/postunpack.sh b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/matomo/postunpack.sh
index 8c6be32408a3..54d7bba7ad2b 100755
--- a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/matomo/postunpack.sh
+++ b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/matomo/postunpack.sh
@@ -51,3 +51,7 @@ info "Creating default web server configuration for Matomo"
 web_server_validate
 # We cannot move the .htaccess because one of the system checks will fail
 ensure_web_server_app_configuration_exists "matomo" --type php --apache-move-htaccess "no"
+
+# Copy all initially generated configuration files to the default directory
+# (this is to avoid breaking when entrypoint is being overridden)
+cp -r "/opt/bitnami/$(web_server_type)/conf"/* "/opt/bitnami/$(web_server_type)/conf.default"