diff --git a/bitnami/mariadb/entrypoint.sh b/bitnami/mariadb/entrypoint.sh
index 446a2c026d4b..505bee8ebb35 100755
--- a/bitnami/mariadb/entrypoint.sh
+++ b/bitnami/mariadb/entrypoint.sh
@@ -34,7 +34,10 @@ if [ "$1" = 'mysqld.bin' ]; then
     print_container_already_initialized $BITNAMI_APP_NAME
   fi
 
-  chown -R $BITNAMI_APP_USER:$BITNAMI_APP_USER $BITNAMI_APP_DIR/logs || true
+  chown -R $BITNAMI_APP_USER:$BITNAMI_APP_USER \
+    $BITNAMI_APP_VOL_PREFIX/conf/ \
+    $BITNAMI_APP_VOL_PREFIX/logs/ \
+    $BITNAMI_APP_VOL_PREFIX/data/ || true
 fi
 
 exec "$@"
diff --git a/bitnami/mariadb/test.sh b/bitnami/mariadb/test.sh
index d526a1f074d9..4a79f9e32667 100644
--- a/bitnami/mariadb/test.sh
+++ b/bitnami/mariadb/test.sh
@@ -103,7 +103,7 @@ create_full_container_mounted(){
   # Can not login as root
   run mysql_client -e 'show databases\G'
   [ $status = 1 ]
-  run mysql_client -u $MARIADB_USER -e  'show databases\G' 
+  run mysql_client -u $MARIADB_USER -e  'show databases\G'
   [[ "$output" =~ "Database: $MARIADB_DATABASE" ]]
 }
 
@@ -165,7 +165,7 @@ create_full_container_mounted(){
 
 @test "Data gets generated in conf and data if bind mounted in the host" {
   create_full_container_mounted
-  run ls -l $HOST_VOL_PREFIX/conf/my.cnf $HOST_VOL_PREFIX/logs/mysqld.log
+  run docker run -v $HOST_VOL_PREFIX:$HOST_VOL_PREFIX --rm bitnami/mariadb ls -l $HOST_VOL_PREFIX/conf/my.cnf $HOST_VOL_PREFIX/logs/mysqld.log
   [ $status = 0 ]
   cleanup_volumes_content
 }