diff --git a/bitnami/prestashop/1/docker-compose.yml b/bitnami/prestashop/1/docker-compose.yml
index c05aec9738a6..843db0705b72 100644
--- a/bitnami/prestashop/1/docker-compose.yml
+++ b/bitnami/prestashop/1/docker-compose.yml
@@ -3,6 +3,8 @@ version: '2'
 services:
   mariadb:
     image: 'bitnami/mariadb:latest'
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
     volumes:
       - 'mariadb_data:/bitnami/mariadb'
   prestashop:
diff --git a/bitnami/prestashop/README.md b/bitnami/prestashop/README.md
index 1d743db6eacc..cbde19732130 100644
--- a/bitnami/prestashop/README.md
+++ b/bitnami/prestashop/README.md
@@ -31,6 +31,8 @@ version: '2'
 services:
   mariadb:
     image: 'bitnami/mariadb:latest'
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
     volumes:
       - 'mariadb_data:/bitnami/mariadb'
   prestashop:
@@ -68,7 +70,7 @@ If you want to run the application manually instead of using docker-compose, the
 2. Start a MariaDB database in the network generated:
 
   ```bash
-  $ docker run -d --name mariadb --network prestashop-tier bitnami/mariadb
+  $ docker run -d --name mariadb -e ALLOW_EMPTY_PASSWORD=yes --network prestashop-tier bitnami/mariadb
   ```
 
   *Note:* You need to give the container a name in order to PrestaShop to resolve the host
@@ -98,6 +100,8 @@ version: '2'
 services:
   mariadb:
     image: 'bitnami/mariadb:latest'
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
     volumes:
       - '/path/to/mariadb-persistence:/bitnami/mariadb'
   prestashop:
@@ -126,7 +130,7 @@ In this case you need to specify the directories to mount on the run command. Th
 2. Create a MariaDB container with host volume:
 
   ```bash
-  $ docker run -d --name mariadb \
+  $ docker run -d --name mariadb -e ALLOW_EMPTY_PASSWORD=yes \
     --network prestashop-tier \
     --volume /path/to/mariadb-persistence:/bitnami/mariadb \
     bitnami/mariadb:latest
diff --git a/bitnami/prestashop/docker-compose.yml b/bitnami/prestashop/docker-compose.yml
index a0d2d2b6557b..696634bb60e2 100644
--- a/bitnami/prestashop/docker-compose.yml
+++ b/bitnami/prestashop/docker-compose.yml
@@ -3,6 +3,8 @@ version: '2'
 services:
   mariadb:
     image: 'bitnami/mariadb:latest'
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
     volumes:
       - 'mariadb_data:/bitnami/mariadb'
   prestashop: