diff --git a/bitnami/magento/2/docker-compose.yml b/bitnami/magento/2/docker-compose.yml
index d68b8e3fb690..de216ac78bac 100644
--- a/bitnami/magento/2/docker-compose.yml
+++ b/bitnami/magento/2/docker-compose.yml
@@ -2,6 +2,8 @@ version: '2'
 services:
   mariadb:
     image: 'bitnami/mariadb:latest'
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
     volumes:
       - 'mariadb_data:/bitnami/mariadb'
   magento:
diff --git a/bitnami/magento/README.md b/bitnami/magento/README.md
index d55834b0b44d..8499a4e07ffe 100644
--- a/bitnami/magento/README.md
+++ b/bitnami/magento/README.md
@@ -34,6 +34,8 @@ version: '2'
 services:
   mariadb:
     image: 'bitnami/mariadb:latest'
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
     volumes:
       - 'mariadb_data:/bitnami/mariadb'
   magento:
@@ -72,7 +74,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 --net magento-tier bitnami/mariadb
+  $ docker run -d --name mariadb -e ALLOW_EMPTY_PASSWORD=yes --net magento-tier bitnami/mariadb
   ```
 
   *Note:* You need to give the container a name in order to Magento to resolve the host
@@ -107,6 +109,8 @@ version: '2'
 services:
   mariadb:
     image: 'bitnami/mariadb:latest'
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
     volumes:
       - /path/to/mariadb-persistence:/bitnami/mariadb
   magento:
@@ -136,7 +140,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 \
     --net magento-tier \
     --volume /path/to/mariadb-persistence:/bitnami/mariadb \
     bitnami/mariadb:latest
diff --git a/bitnami/magento/docker-compose.yml b/bitnami/magento/docker-compose.yml
index 54ee0872a833..4888fc50d52d 100644
--- a/bitnami/magento/docker-compose.yml
+++ b/bitnami/magento/docker-compose.yml
@@ -2,6 +2,8 @@ version: '2'
 services:
   mariadb:
     image: 'bitnami/mariadb:latest'
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
     volumes:
       - 'mariadb_data:/bitnami/mariadb'
   magento: