diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index 19264454e0..ec8a479ae0 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -20,7 +20,7 @@ use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\DateTime;
 use Utopia\Database\Query;
-use Utopia\Database\Adapter\MariaDB;
+use Utopia\Database\Adapter\MySQL as MariaDB;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\Key;
 use Utopia\Database\Validator\Permissions;
diff --git a/app/init.php b/app/init.php
index 054721d439..a9893801cc 100644
--- a/app/init.php
+++ b/app/init.php
@@ -52,7 +52,7 @@ use MaxMind\Db\Reader;
 use PHPMailer\PHPMailer\PHPMailer;
 use Utopia\Cache\Adapter\Redis as RedisCache;
 use Utopia\Cache\Cache;
-use Utopia\Database\Adapter\MariaDB;
+use Utopia\Database\Adapter\MySQL as MariaDB;
 use Utopia\Database\Document;
 use Utopia\Database\Database;
 use Utopia\Database\Validator\Structure;
diff --git a/app/realtime.php b/app/realtime.php
index be87c3d6e6..21ebb02d91 100644
--- a/app/realtime.php
+++ b/app/realtime.php
@@ -20,7 +20,7 @@ use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Cache\Adapter\Redis as RedisCache;
 use Utopia\Cache\Cache;
-use Utopia\Database\Adapter\MariaDB;
+use Utopia\Database\Adapter\MySQL as MariaDB;
 use Utopia\Database\Document;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
diff --git a/app/tasks/maintenance.php b/app/tasks/maintenance.php
index 42b5ed00dc..02445e117d 100644
--- a/app/tasks/maintenance.php
+++ b/app/tasks/maintenance.php
@@ -9,7 +9,7 @@ use Appwrite\Event\Delete;
 use Utopia\App;
 use Utopia\Cache\Cache;
 use Utopia\CLI\Console;
-use Utopia\Database\Adapter\MariaDB;
+use Utopia\Database\Adapter\MySQL as MariaDB;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Cache\Adapter\Redis as RedisCache;
diff --git a/app/tasks/migrate.php b/app/tasks/migrate.php
index f0ab71a964..53e101c539 100644
--- a/app/tasks/migrate.php
+++ b/app/tasks/migrate.php
@@ -7,7 +7,7 @@ use Appwrite\Migration\Migration;
 use Utopia\App;
 use Utopia\Cache\Cache;
 use Utopia\Cache\Adapter\Redis as RedisCache;
-use Utopia\Database\Adapter\MariaDB;
+use Utopia\Database\Adapter\MySQL as MariaDB;
 use Utopia\Database\Database;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
diff --git a/app/tasks/usage.php b/app/tasks/usage.php
index 48876557a8..7b8d20b0f6 100644
--- a/app/tasks/usage.php
+++ b/app/tasks/usage.php
@@ -12,7 +12,7 @@ use Utopia\App;
 use Utopia\Cache\Adapter\Redis as RedisCache;
 use Utopia\Cache\Cache;
 use Utopia\CLI\Console;
-use Utopia\Database\Adapter\MariaDB;
+use Utopia\Database\Adapter\MySQL as MariaDB;
 use Utopia\Database\Database as UtopiaDatabase;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Registry\Registry;
diff --git a/docker-compose.yml b/docker-compose.yml
index ea9241a9d3..1785af59ce 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -693,7 +693,7 @@ services:
       - _APP_REDIS_PASS
 
   mariadb:
-    image: mariadb:10.7 # fix issues when upgrading using: mysql_upgrade -u root -p
+    image: mysql:8.0.31 # fix issues when upgrading using: mysql_upgrade -u root -p
     container_name: appwrite-mariadb
     <<: *x-logging
     networks:
diff --git a/src/Appwrite/Resque/Worker.php b/src/Appwrite/Resque/Worker.php
index dd7cebd084..6c1ac478ce 100644
--- a/src/Appwrite/Resque/Worker.php
+++ b/src/Appwrite/Resque/Worker.php
@@ -7,7 +7,7 @@ use Utopia\Cache\Cache;
 use Utopia\Cache\Adapter\Redis as RedisCache;
 use Utopia\CLI\Console;
 use Utopia\Database\Database;
-use Utopia\Database\Adapter\MariaDB;
+use Utopia\Database\Adapter\MySQL as MariaDB;
 use Utopia\Storage\Device;
 use Utopia\Storage\Storage;
 use Utopia\Storage\Device\Local;