diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b60ff4e3..3dffc540 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -91,8 +91,7 @@ jobs:
   #       # npx eslint .
   #       npx tsc
 
-  test_backend:
-    needs: [build_frontend, build_backend]
+  test_prepare:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
@@ -102,6 +101,19 @@ jobs:
         repository: mickael-kerjean/filestash-test
         ssh-key: ${{ secrets.DEPLOY_KEY_FILESTASH_TEST }}
         path: test
+    - uses: actions/upload-artifact@v4
+      with:
+        name: test
+        path: test
+
+  test_backend:
+    needs: [build_frontend, build_backend, test_prepare]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/download-artifact@v4
+      with:
+        name: test
     - uses: actions/download-artifact@v4
       with:
         name: build-frontend
@@ -123,7 +135,7 @@ jobs:
       run: go test --tags "fts5" -count=1 $(go list ./server/... | grep -v "server/plugin" | grep -v "server/generator")
 
   test_smoke:
-    needs: [build_frontend, build_backend]
+    needs: [build_frontend, build_backend, test_prepare]
     runs-on: ubuntu-latest
     steps:
      - name: Init
@@ -142,23 +154,8 @@ jobs:
          cat access.log | grep -vz "WARN"
          cat access.log | grep -vz "ERR"
 
-  test_e2e_prepare:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Clone test repo
-      uses: actions/checkout@v3
-      with:
-        repository: mickael-kerjean/filestash-test
-        ssh-key: ${{ secrets.DEPLOY_KEY_FILESTASH_TEST }}
-        path: test
-    - uses: actions/upload-artifact@v4
-      with:
-        name: test
-        path: test
-
   test_e2e:
-    needs: [test_smoke, test_e2e_prepare]
+    needs: [test_smoke, test_prepare]
     runs-on: ubuntu-latest
     container:
       image: machines/puppeteer
@@ -169,12 +166,10 @@ jobs:
         CI: true
     steps:
     - uses: actions/checkout@v3
-    - name: get back test repo
-      uses: actions/download-artifact@v4
+    - uses: actions/download-artifact@v4
       with:
         name: test
-    - name: Restore Build
-      uses: actions/download-artifact@v4
+    - uses: actions/download-artifact@v4
       with:
         name: build
     - name: Setup