diff --git a/.env b/.env
index b28a75a9de..ea7f385c96 100644
--- a/.env
+++ b/.env
@@ -17,14 +17,14 @@ _APP_REDIS_HOST=redis
 _APP_REDIS_PORT=6379
 _APP_REDIS_PASS=
 _APP_REDIS_USER=
-_APP_DB_HOST=mysql
+_APP_DB_HOST=mariadb
 _APP_DB_PORT=3306
 _APP_DB_SCHEMA=appwrite
 _APP_DB_USER=user
 _APP_DB_PASS=password
 _APP_DB_ROOT_PASS=rootsecretpassword
-_APP_CONNECTIONS_DB_PROJECT=db_fra1_02=mysql://user:password@mysql:3306/appwrite
-_APP_CONNECTIONS_DB_CONSOLE=db_fra1_01=mysql://user:password@mysql:3306/appwrite
+_APP_CONNECTIONS_DB_PROJECT=db_fra1_02=mariadb://user:password@mariadb:3306/appwrite
+_APP_CONNECTIONS_DB_CONSOLE=db_fra1_01=mariadb://user:password@mariadb:3306/appwrite
 _APP_CONNECTIONS_CACHE=redis_fra1_01=redis://redis:6379
 _APP_CONNECTIONS_QUEUE=redis_fra1_01=redis://redis:6379
 _APP_CONNECTIONS_PUBSUB=redis_fra1_01=redis://redis:6379
diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index c3056db574..2b791e6ea9 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -20,7 +20,6 @@ use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\DateTime;
 use Utopia\Database\Query;
-use Utopia\Database\Adapter\MySQL;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\Key;
 use Utopia\Database\Validator\Permissions;
diff --git a/docker-compose.yml b/docker-compose.yml
index f6687493aa..16626f7bc4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -85,7 +85,7 @@ services:
       - ./src:/usr/src/code/src
       - ./dev:/usr/local/dev
     depends_on:
-      - mysql
+      - mariadb
       - redis
       # - clamav
     entrypoint: 
@@ -208,7 +208,7 @@ services:
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
     depends_on:
-      - mysql
+      - mariadb
       - redis
     environment:
       - _APP_ENV
@@ -244,7 +244,7 @@ services:
       - ./src:/usr/src/code/src
     depends_on:
       - redis
-      - mysql
+      - mariadb
     environment:
       - _APP_ENV
       - _APP_OPENSSL_KEY_V1
@@ -276,7 +276,7 @@ services:
       - ./src:/usr/src/code/src
     depends_on:
       - redis
-      - mysql
+      - mariadb
       - request-catcher
     environment:
       - _APP_ENV
@@ -299,7 +299,7 @@ services:
       - appwrite
     depends_on:
       - redis
-      - mysql
+      - mariadb
     volumes: 
       - appwrite-uploads:/storage/uploads:rw
       - appwrite-cache:/storage/cache:rw
@@ -362,7 +362,7 @@ services:
       - ./src:/usr/src/code/src
     depends_on:
       - redis
-      - mysql
+      - mariadb
     environment:
       - _APP_ENV
       - _APP_OPENSSL_KEY_V1
@@ -394,7 +394,7 @@ services:
       - ./src:/usr/src/code/src
     depends_on:
       - redis
-      - mysql
+      - mariadb
     environment:
       - _APP_ENV
       - _APP_OPENSSL_KEY_V1
@@ -425,7 +425,7 @@ services:
       - appwrite
     depends_on:
       - redis
-      - mysql
+      - mariadb
     volumes: 
       - appwrite-config:/storage/config:rw
       - appwrite-certificates:/storage/certificates:rw
@@ -465,7 +465,7 @@ services:
       - ./src:/usr/src/code/src
     depends_on:
       - redis
-      - mysql
+      - mariadb
       - appwrite-executor
     environment:
       - _APP_ENV
@@ -510,7 +510,7 @@ services:
       - /tmp:/tmp:rw
     depends_on:
       - redis
-      - mysql
+      - mariadb
       - appwrite
     environment:
       - _APP_ENV
@@ -670,7 +670,7 @@ services:
       - ./dev:/usr/local/dev
     depends_on:
       - influxdb
-      - mysql
+      - mariadb
     environment:
       - _APP_ENV
       - _APP_OPENSSL_KEY_V1
@@ -708,7 +708,7 @@ services:
       - ./dev:/usr/local/dev
     depends_on:
       - influxdb
-      - mysql
+      - mariadb
     environment:
       - _APP_ENV
       - _APP_OPENSSL_KEY_V1
@@ -751,14 +751,14 @@ services:
       - _APP_REDIS_PASS
       - _APP_CONNECTIONS_QUEUE
 
-  mysql:
-    image: mysql:8.0.28-oracle # fix issues when upgrading using: mysql_upgrade -u root -p
-    container_name: appwrite-mysql
+  mariadb:
+    image: mariadb:10.7 # fix issues when upgrading using: mysql_upgrade -u root -p
+    container_name: mariadb
     <<: *x-logging
     networks:
       - appwrite
     volumes:
-      - appwrite-mysql:/var/lib/mysql:rw
+      - appwrite-mariadb:/var/lib/mysql:rw
     ports:
       - "3306:3306"
     environment:
@@ -917,7 +917,7 @@ networks:
   runtimes:
 
 volumes:
-  appwrite-mysql:
+  appwrite-mariadb:
   appwrite-redis:
   appwrite-cache:
   appwrite-uploads: