diff --git a/.github/workflows/appmap-analysis.yml b/.github/workflows/appmap-analysis.yml
index d5ffff9099..450cb1734f 100644
--- a/.github/workflows/appmap-analysis.yml
+++ b/.github/workflows/appmap-analysis.yml
@@ -4,8 +4,13 @@ on:
   pull_request:
 
 jobs:
-  test:
+  record-appmaps:
     runs-on: ubuntu-latest
+    
+    strategy:
+      fail-fast: false
+      matrix:
+        group: [1, 2, 3, 4, 5]
 
     services:
         postgres:
@@ -38,10 +43,33 @@ jobs:
           POSTGRES_USER: misago
           POSTGRES_PASSWORD: misago
           POSTGRES_HOST: localhost
-        run: |
-          pytest --cov=misago
+        run: pytest --cov=misago --splits 5 --group ${{ matrix.group }}
       
-      - name: Archive AppMaps
+      - name: Save AppMap archive
         uses: getappmap/archive-action@v1
+        with:
+          archive-id: ${{ matrix.group }}
+
+  appmap-analysis:
+    runs-on: ubuntu-latest
+
+    needs: [ record-appmaps ]
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install AppMap tools
+        uses: getappmap/install-action@v1
+        with:
+          install-appmap-library: false
+      
+      - name: Merge AppMaps
+        if: (success() || failure())
+        uses: getappmap/archive-action/merge@v1
         with:
           revision: ${{ github.event.pull_request.base.sha }}
+          archive-count: 5
+
+      - name: Archive AppMaps
+        uses: getappmap/archive-action@v1
+        with:
+          revision: ${{ github.event.pull_request.base.sha }}
\ No newline at end of file