diff --git a/app/init.php b/app/init.php
index b8d2149d1e..faf21a8e1b 100644
--- a/app/init.php
+++ b/app/init.php
@@ -459,7 +459,10 @@ $register->set('dbPool', function () {
         ->withUsername($dbUser)
         ->withPassword($dbPass)
         ->withOptions([
-            PDO::ATTR_ERRMODE => App::isDevelopment() ? PDO::ERRMODE_WARNING : PDO::ERRMODE_SILENT, // If in production mode, warnings are not displayed
+            PDO::ATTR_ERRMODE => App::isDevelopment() ? PDO::ERRMODE_WARNING : PDO::ERRMODE_SILENT,// If in production mode, warnings are not displayed
+            PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
+            PDO::ATTR_EMULATE_PREPARES => true,
+            PDO::ATTR_STRINGIFY_FETCHES => true // In order to be consistent between mariadb and mysql
         ]),
         64
     );
@@ -552,11 +555,12 @@ $register->set('db', function () {
     $dbScheme = App::getEnv('_APP_DB_SCHEMA', '');
 
     $pdo = new PDO("mysql:host={$dbHost};port={$dbPort};dbname={$dbScheme};charset=utf8mb4", $dbUser, $dbPass, array(
-        PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4',
         PDO::ATTR_TIMEOUT => 3, // Seconds
         PDO::ATTR_PERSISTENT => true,
         PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
         PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
+        PDO::ATTR_EMULATE_PREPARES => true,
+        PDO::ATTR_STRINGIFY_FETCHES => true,
     ));
 
     return $pdo;
diff --git a/docker-compose.yml b/docker-compose.yml
index b6e1ed68b2..698ff7508f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -236,6 +236,7 @@ services:
     volumes:
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
+      - ./vendor/utopia-php/database:/usr/src/code/vendor/utopia-php/database
     depends_on:
       - redis
       - mariadb