diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7bc39392ef..8e6d453d5a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -108,22 +108,22 @@ jobs:
       matrix:
         service:
           [
-            Account,
-            Avatars,
-            Console,
+            # Account,
+            # Avatars,
+            # Console,
             Databases,
-            Functions,
-            GraphQL,
-            Health,
-            Locale,
-            Projects,
-            Realtime,
-            Storage,
-            Teams,
-            Users,
-            Webhooks,
-            VCS,
-            Messaging,
+            # Functions,
+            # GraphQL,
+            # Health,
+            # Locale,
+            # Projects,
+            # Realtime,
+            # Storage,
+            # Teams,
+            # Users,
+            # Webhooks,
+            # VCS,
+            # Messaging,
           ]
 
     steps:
@@ -144,7 +144,7 @@ jobs:
           sleep 25
 
       - name: Run ${{matrix.service}} Tests
-        run: docker compose exec -T appwrite test /usr/src/code/tests/e2e/Services/${{matrix.service}} --debug
+        run: docker compose exec -T appwrite test /usr/src/code/tests/e2e/Services/${{matrix.service}} --filter="testCreateDatabase|testTimeout" --debug
 
       - name: Run ${{matrix.service}} Shared Tables Tests
-        run: _APP_DATABASE_SHARED_TABLES=database_db_main docker compose exec -T appwrite test /usr/src/code/tests/e2e/Services/${{matrix.service}} --debug
+        run: _APP_DATABASE_SHARED_TABLES=database_db_main docker compose exec -T appwrite test /usr/src/code/tests/e2e/Services/${{matrix.service}} --filter="testCreateDatabase|testTimeout" --debug
diff --git a/app/init.php b/app/init.php
index a86156c750..b087fe85c2 100644
--- a/app/init.php
+++ b/app/init.php
@@ -751,7 +751,7 @@ $register->set('pools', function () {
     $group = new Group();
 
     $fallbackForDB = 'db_main=' . AppwriteURL::unparse([
-        'scheme' => 'mariadb',
+        'scheme' => 'mysql',
         'host' => System::getEnv('_APP_DB_HOST', 'mariadb'),
         'port' => System::getEnv('_APP_DB_PORT', '3306'),
         'user' => System::getEnv('_APP_DB_USER', ''),
diff --git a/docker-compose.yml b/docker-compose.yml
index b86af1c12b..ec00fe92a3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -902,7 +902,7 @@ services:
       - OPR_PROXY_HEALTHCHECK=enabled
 
   mariadb:
-    image: mariadb:10.11 # fix issues when upgrading using: mysql_upgrade -u root -p
+    image: mysql:8.0.30 # fix issues when upgrading using: mysql_upgrade -u root -p
     container_name: appwrite-mariadb
     <<: *x-logging
     networks: