diff --git a/bitnami/osclass/3/docker-compose.yml b/bitnami/osclass/3/docker-compose.yml
index a289fd7c7701..ffbd6758e2db 100644
--- a/bitnami/osclass/3/docker-compose.yml
+++ b/bitnami/osclass/3/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'
   osclass:
diff --git a/bitnami/osclass/README.md b/bitnami/osclass/README.md
index 18fe6f6d8311..40fbc0075605 100644
--- a/bitnami/osclass/README.md
+++ b/bitnami/osclass/README.md
@@ -31,7 +31,11 @@ version: '2'
 
 services:
   mariadb:
-    image: bitnami/mariadb:latest
+    image: 'bitnami/mariadb:latest'
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
     volumes:
       - mariadb_data:/bitnami/mariadb
   osclass:
@@ -76,7 +80,7 @@ If you want to run the application manually instead of using `docker-compose`, t
 
   ```bash
   $ docker volume create --name mariadb_data
-  $ docker run -d --name mariadb \
+  $ docker run -d --name mariadb -e ALLOW_EMPTY_PASSWORD=yes \
     --net osclass-tier \
     --volume mariadb_data:/bitnami/mariadb \
     bitnami/mariadb:latest
@@ -117,7 +121,11 @@ version: '2'
 
 services:
   mariadb:
-    image: bitnami/mariadb:latest
+    image: 'bitnami/mariadb:latest'
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
     volumes:
       - /path/to/mariadb-persistence:/bitnami/mariadb
   osclass:
@@ -142,7 +150,7 @@ services:
 
 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 osclass-tier \
     --volume /path/to/mariadb-persistence:/bitnami/mariadb \
     bitnami/mariadb:latest
@@ -238,7 +246,11 @@ version: '2'
 
 services:
   mariadb:
-    image: bitnami/mariadb:latest
+    image: 'bitnami/mariadb:latest'
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
     volumes:
       - mariadb_data:/bitnami/mariadb
   osclass:
diff --git a/bitnami/osclass/docker-compose.yml b/bitnami/osclass/docker-compose.yml
index 339feb89ce34..049753cf79f5 100644
--- a/bitnami/osclass/docker-compose.yml
+++ b/bitnami/osclass/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'
   osclass: