diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8fb3ac3518..8c96c4b74d 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -6,8 +6,8 @@ concurrency:
 
 on: [pull_request]
 jobs:
-  tests:
-    name: Unit & E2E
+  build:
+    name: Build & Unit Test
     runs-on: ubuntu-latest
 
     steps:
@@ -49,12 +49,34 @@ jobs:
         sleep 30
 
     - name: Doctor
-      run:  |
-        docker compose logs appwrite
-        docker compose exec -T appwrite doctor
+      run: docker compose exec -T appwrite doctor
 
     - name: Environment Variables
       run:  docker compose exec -T appwrite vars
 
-    - name: Run Tests
-      run: docker compose exec -T appwrite test --debug
\ No newline at end of file
+    - name: Run Unit Tests
+      run: docker compose exec appwrite test /usr/src/code/tests/unit 
+
+  e2e_test:
+    name: E2E Test
+    runs-on: ubuntu-latest
+    needs: build
+    strategy:
+      fail-fast: false
+      matrix:
+        services: [Account,Avatars,Console,Databases,Functions,GraphQL,Health,Locale,Projects,Realtime,Storage,Teams,Users,Webhooks]
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 2
+          submodules: recursive
+
+      - name: Start Appwrite
+        run:  |
+          docker compose up -d
+          sleep 30
+    
+      - name: Run ${{matrix.services}} Tests
+        run: docker compose exec -T appwrite test /usr/src/code/tests/e2e/Services/${{matrix.services}} --debug
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index 7d412e42c4..23ea118869 100644
--- a/composer.lock
+++ b/composer.lock
@@ -6096,5 +6096,5 @@
     "platform-overrides": {
         "php": "8.0"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }