diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index bff77612f..7e8b93629 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,9 +1,10 @@
 name: "Tests"
+
 on: [pull_request]
 jobs:
   tests:
     name: Unit & E2E
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
 
     steps:
     - name: Checkout repository
@@ -18,29 +19,16 @@ jobs:
     - run: git checkout HEAD^2
       if: ${{ github.event_name == 'pull_request' }}
 
-    - name: Prepare Docker
+    - name: Build Appwrite
+      # Upstream bug causes buildkit pulls to fail so prefetch base images
+      # https://github.com/moby/moby/issues/41864
       run:  |
-        export COMPOSE_INTERACTIVE_NO_CLI
-        export DOCKER_BUILDKIT=1
-        export COMPOSE_DOCKER_CLI_BUILD=1
         echo "_APP_FUNCTIONS_RUNTIMES=php-8.0" >> .env
         docker pull composer:2.0
         docker pull php:8.0-cli-alpine
-        docker compose pull
-
-    - name: Prepare Cache
-      uses: satackey/action-docker-layer-caching@v0.0.11
-      # Ignore the failure of a step and avoid terminating the job.
-      continue-on-error: true
-
-    - name: Build Appwrite
-      run: docker compose build --progress=plain
-
-    - name: Start Appwrite
-      run: |
+        docker compose build --progress=plain
         docker compose up -d
-        sleep 30
-
+        sleep 10
     - name: Doctor
       run: docker compose exec -T appwrite doctor
 
@@ -49,3 +37,9 @@ jobs:
 
     - name: Run Tests
       run: docker compose exec -T appwrite test --debug
+
+    - name: Teardown
+      if: always()
+      run: |
+        docker compose down -v
+        docker ps -aq | xargs docker rm --force
\ No newline at end of file