diff --git a/bitnami/odoo/18/debian-12/Dockerfile b/bitnami/odoo/18/debian-12/Dockerfile
index 263e48f7541a..53e437beb091 100644
--- a/bitnami/odoo/18/debian-12/Dockerfile
+++ b/bitnami/odoo/18/debian-12/Dockerfile
@@ -8,14 +8,14 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2025-05-30T16:18:58Z" \
+      org.opencontainers.image.created="2025-06-10T11:11:03Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/odoo/README.md" \
-      org.opencontainers.image.ref.name="18.0.20250405-debian-12-r5" \
+      org.opencontainers.image.ref.name="18.0.20250605-debian-12-r0" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/odoo" \
       org.opencontainers.image.title="odoo" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
-      org.opencontainers.image.version="18.0.20250405"
+      org.opencontainers.image.version="18.0.20250605"
 
 ENV OS_ARCH="${TARGETARCH:-amd64}" \
     OS_FLAVOUR="debian-12" \
@@ -27,11 +27,11 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 RUN install_packages acl ca-certificates curl fontconfig libbsd0 libbz2-1.0 libc6 libcap2-bin libcom-err2 libcrypt1 libedit2 libffi8 libfreetype6 libgcc-s1 libgmp10 libgnutls30 libgssapi-krb5-2 libhogweed6 libicu72 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.5-0 liblz4-1 liblzma5 libmd0 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpng16-16 libpq5 libreadline8 libsasl2-2 libsqlite3-0 libssl3 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libunistring2 libuuid1 libx11-6 libxcb1 libxext6 libxml2 libxrender1 libxslt1.1 procps xfonts-75dpi xfonts-base zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
     COMPONENTS=( \
-      "python-3.12.10-15-linux-${OS_ARCH}-debian-12" \
-      "render-template-1.0.7-16-linux-${OS_ARCH}-debian-12" \
+      "python-3.12.11-3-linux-${OS_ARCH}-debian-12" \
+      "render-template-1.0.7-17-linux-${OS_ARCH}-debian-12" \
       "postgresql-client-17.5.0-1-linux-${OS_ARCH}-debian-12" \
       "node-22.16.0-0-linux-${OS_ARCH}-debian-12" \
-      "odoo-18.0.20250405-0-linux-${OS_ARCH}-debian-12" \
+      "odoo-18.0.20250605-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -56,7 +56,7 @@ RUN curl -sLO "https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/odoo/postunpack.sh
-ENV APP_VERSION="18.0.20250405" \
+ENV APP_VERSION="18.0.20250605" \
     BITNAMI_APP_NAME="odoo" \
     PATH="/opt/bitnami/python/bin:/opt/bitnami/common/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/node/bin:/opt/bitnami/odoo/bin:$PATH"
 
diff --git a/bitnami/odoo/18/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/odoo/18/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index cf3ac6e60c14..4a6eebf869b9 100644
--- a/bitnami/odoo/18/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/odoo/18/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -9,7 +9,7 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "18.0.20250405-0"
+        "version": "18.0.20250605-0"
     },
     "postgresql-client": {
         "arch": "amd64",
@@ -21,12 +21,12 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "3.12.10-15"
+        "version": "3.12.11-3"
     },
     "render-template": {
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "1.0.7-16"
+        "version": "1.0.7-17"
     }
 }
\ No newline at end of file
diff --git a/bitnami/odoo/18/debian-12/prebuildfs/usr/sbin/uninstall_packages b/bitnami/odoo/18/debian-12/prebuildfs/usr/sbin/uninstall_packages
new file mode 100755
index 000000000000..615c430e4e68
--- /dev/null
+++ b/bitnami/odoo/18/debian-12/prebuildfs/usr/sbin/uninstall_packages
@@ -0,0 +1,26 @@
+#!/bin/sh
+# Copyright Broadcom, Inc. All Rights Reserved.
+# SPDX-License-Identifier: APACHE-2.0
+set -eu
+
+n=0
+max=2
+export DEBIAN_FRONTEND=noninteractive
+
+until [ $n -gt $max ]; do
+    set +e
+    (
+        apt-get autoremove --purge -y "$@"
+    )
+    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
+apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
diff --git a/bitnami/odoo/18/debian-12/rootfs/opt/bitnami/scripts/odoo/postunpack.sh b/bitnami/odoo/18/debian-12/rootfs/opt/bitnami/scripts/odoo/postunpack.sh
index e971a09d284e..b4733c1928db 100755
--- a/bitnami/odoo/18/debian-12/rootfs/opt/bitnami/scripts/odoo/postunpack.sh
+++ b/bitnami/odoo/18/debian-12/rootfs/opt/bitnami/scripts/odoo/postunpack.sh
@@ -34,10 +34,6 @@ done
 # Use daemon user ownership for compatibility when running as a non-root user
 chown "$ODOO_DAEMON_USER" "$ODOO_BASE_DIR"
 
-# Create folders that existed in previous versions of this image with proper permissions/ownership
-# TODO: Remove this block in a future release
-ensure_dir_exists "${ODOO_BASE_DIR}/odoo"
-ln -s "$ODOO_BASE_DIR"/lib/odoo-*.egg/odoo/addons "${ODOO_BASE_DIR}/odoo/addons"
 # Intentionally avoid symlink since it would point to the parent folder, with potential to cause problems
 ensure_dir_exists "${ODOO_TMP_DIR}/pids"
 configure_permissions_ownership "${ODOO_TMP_DIR}/pids" -d "775" -f "664" -u "$ODOO_DAEMON_USER" -g "root"
diff --git a/bitnami/odoo/18/debian-12/tags-info.yaml b/bitnami/odoo/18/debian-12/tags-info.yaml
index 16dd34783313..bd2f15184631 100644
--- a/bitnami/odoo/18/debian-12/tags-info.yaml
+++ b/bitnami/odoo/18/debian-12/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
 - "18"
 - 18-debian-12
-- 18.0.20250405
+- 18.0.20250605
 - latest
diff --git a/bitnami/odoo/README.md b/bitnami/odoo/README.md
index 930ad9f7e123..55c3642e65df 100644
--- a/bitnami/odoo/README.md
+++ b/bitnami/odoo/README.md
@@ -136,13 +136,13 @@ This requires a minor change to the [`docker-compose.yml`](https://github.com/bi
    postgresql:
      ...
      volumes:
--      - 'postgresql_data:/bitnami/postgresql'
+-      - postgresql_data:/bitnami/postgresql
 +      - /path/to/postgresql-persistence:/bitnami/postgresql
    ...
    odoo:
      ...
      volumes:
--      - 'odoo_data:/bitnami/odoo'
+-      - odoo_data:/bitnami/odoo
 +      - /path/to/odoo-persistence:/bitnami/odoo
    ...
 -volumes:
@@ -223,7 +223,7 @@ docker run -d --name odoo \
 | `ODOO_CONF_DIR`              | Odoo directory for configuration files.         | `${ODOO_BASE_DIR}/conf`                       |
 | `ODOO_CONF_FILE`             | Configuration file for Odoo.                    | `${ODOO_CONF_DIR}/odoo.conf`                  |
 | `ODOO_DATA_DIR`              | Odoo directory for data files.                  | `${ODOO_BASE_DIR}/data`                       |
-| `ODOO_ADDONS_DIR`            | Odoo directory for addons.                      | `${ODOO_ADDONS_DIR:-${ODOO_BASE_DIR}/addons}` |
+| `ODOO_ADDONS_DIR`            | Odoo directory for extra addons.                | `${ODOO_ADDONS_DIR:-${ODOO_BASE_DIR}/addons}` |
 | `ODOO_TMP_DIR`               | Odoo directory for temporary files.             | `${ODOO_BASE_DIR}/tmp`                        |
 | `ODOO_PID_FILE`              | PID file for Odoo.                              | `${ODOO_TMP_DIR}/odoo.pid`                    |
 | `ODOO_LOGS_DIR`              | Odoo directory for log files.                   | `${ODOO_BASE_DIR}/log`                        |