diff --git a/bitnami/odoo/12/debian-9/Dockerfile b/bitnami/odoo/12/debian-9/Dockerfile
index dfcc7bd7243c..1a027e207458 100644
--- a/bitnami/odoo/12/debian-9/Dockerfile
+++ b/bitnami/odoo/12/debian-9/Dockerfile
@@ -1,16 +1,16 @@
-FROM bitnami/minideb-extras:stretch-r358
+FROM bitnami/minideb-extras:stretch-r366
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 # Install required system packages and dependencies
 RUN install_packages ghostscript imagemagick libbsd0 libbz2-1.0 libc6 libedit2 libffi6 libgcc1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libhogweed4 libicu57 libidn11 libldap-2.4-2 liblzma5 libncurses5 libnettle6 libp11-kit0 libpq5 libreadline7 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo5 libxml2 libxslt1.1 zlib1g
 RUN bitnami-pkg install python-3.6.8-2 --checksum 2eb057ee7701667327f6bcc1fc8765abe5d9d003a64124e5f8505fa692e71eb8
-RUN bitnami-pkg install postgresql-client-10.7.0-1 --checksum a351a3ea00d4443bdc6892e5f9d45aaf2fbbdf7c2aa40ab6cf423c78d535cca1
+RUN bitnami-pkg install postgresql-client-11.3.0-0 --checksum eb5e96b4b53e9f60dc07d5f9823d09f7884aa9c2408da5bec92beb6cbf6a9de4
 RUN bitnami-pkg install node-7.10.1-1 --checksum 53362288e961d298a724353710a31901d4cb8237894a26a2f676b35450c02975
 RUN bitnami-pkg unpack odoo-12.0.20190415-0 --checksum 8fb0ec8038a0b94791d2cea70bc9c43b60ea1858499f2b48858f0962cd84c7e0
 
 COPY rootfs /
 ENV BITNAMI_APP_NAME="odoo" \
-    BITNAMI_IMAGE_VERSION="12.0.20190415-debian-9-r3" \
+    BITNAMI_IMAGE_VERSION="12.0.20190415-debian-9-r4" \
     ODOO_EMAIL="user@example.com" \
     ODOO_PASSWORD="bitnami" \
     PATH="/opt/bitnami/python/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/node/bin:$PATH" \
diff --git a/bitnami/odoo/12/debian-9/docker-compose.yml b/bitnami/odoo/12/debian-9/docker-compose.yml
index 181c369989f5..6b019ae352fb 100644
--- a/bitnami/odoo/12/debian-9/docker-compose.yml
+++ b/bitnami/odoo/12/debian-9/docker-compose.yml
@@ -1,9 +1,11 @@
 version: '2'
 services:
   postgresql:
-    image: 'bitnami/postgresql:10'
+    image: 'bitnami/postgresql:11'
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
     volumes:
-      - 'postgresql_data:/bitnami'
+      - 'postgresql_data:/bitnami/postgresql'
   odoo:
     image: 'bitnami/odoo:12'
     ports:
diff --git a/bitnami/odoo/README.md b/bitnami/odoo/README.md
index dd10ba454116..5fb03129248b 100644
--- a/bitnami/odoo/README.md
+++ b/bitnami/odoo/README.md
@@ -38,8 +38,8 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`12-ol-7`, `12.0.20190415-ol-7-r8` (12/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-odoo/blob/12.0.20190415-ol-7-r8/12/ol-7/Dockerfile)
-* [`12-debian-9`, `12.0.20190415-debian-9-r3`, `12`, `12.0.20190415`, `12.0.20190415-r3`, `latest` (12/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-odoo/blob/12.0.20190415-debian-9-r3/12/debian-9/Dockerfile)
-* [`11-ol-7`, `11.0.20190415-ol-7-r10` (11/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-odoo/blob/11.0.20190415-ol-7-r10/11/ol-7/Dockerfile)
+* [`12-debian-9`, `12.0.20190415-debian-9-r4`, `12`, `12.0.20190415`, `12.0.20190415-r4`, `latest` (12/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-odoo/blob/12.0.20190415-debian-9-r4/12/debian-9/Dockerfile)
+* [`11-ol-7`, `11.0.20190415-ol-7-r9` (11/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-odoo/blob/11.0.20190415-ol-7-r9/11/ol-7/Dockerfile)
 * [`11-debian-9`, `11.0.20190415-debian-9-r9`, `11`, `11.0.20190415`, `11.0.20190415-r9` (11/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-odoo/blob/11.0.20190415-debian-9-r9/11/debian-9/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/odoo GitHub repo](https://github.com/bitnami/bitnami-docker-odoo).
diff --git a/bitnami/odoo/docker-compose.yml b/bitnami/odoo/docker-compose.yml
index 181c369989f5..6b019ae352fb 100644
--- a/bitnami/odoo/docker-compose.yml
+++ b/bitnami/odoo/docker-compose.yml
@@ -1,9 +1,11 @@
 version: '2'
 services:
   postgresql:
-    image: 'bitnami/postgresql:10'
+    image: 'bitnami/postgresql:11'
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
     volumes:
-      - 'postgresql_data:/bitnami'
+      - 'postgresql_data:/bitnami/postgresql'
   odoo:
     image: 'bitnami/odoo:12'
     ports: