diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 4417049ea2..0d286227a5 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -33,8 +33,8 @@ jobs:
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
 
-  Build-Cabal-Arm:
-    name: Build aarch64 (Cabal, GHC 9.4.8)
+  arm:
+    name: Build / Cabal - aarch64 GHC 9.4.8
     runs-on: ubuntu-latest
     outputs:
       remotepath: ${{ steps.Remote-Dir.outputs.remotepath }}
@@ -101,15 +101,15 @@ jobs:
           if-no-files-found: error
 
 
-  Prepare-Release:
-    name: Prepare release
+  prepare:
+    name: Release / Prepare
     if: startsWith(github.ref, 'refs/tags/v')
     runs-on: ubuntu-latest
     needs:
       - docs
       - test
       - build
-      - Build-Cabal-Arm
+      - arm
     outputs:
       version: ${{ steps.Identify-Version.outputs.version }}
       isprerelease: ${{ steps.Identify-Version.outputs.isprerelease }}
@@ -158,14 +158,14 @@ jobs:
           if-no-files-found: error
 
 
-  Release-GitHub:
-    name: Release on GitHub
+  github:
+    name: Release / GitHub
     permissions:
       contents: write
     runs-on: ubuntu-latest
-    needs: Prepare-Release
+    needs: prepare
     env:
-      VERSION: ${{ needs.Prepare-Release.outputs.version }}
+      VERSION: ${{ needs.prepare.outputs.version }}
     steps:
       - uses: actions/checkout@v4
       - name: Download all artifacts
@@ -204,7 +204,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          isprerelease="${{ needs.Prepare-Release.outputs.isprerelease }}"
+          isprerelease="${{ needs.prepare.outputs.isprerelease }}"
           echo "Releasing version v$VERSION on GitHub (isprerelease=$isprerelease)..."
 
           gh release delete "v$VERSION" || true
@@ -214,18 +214,18 @@ jobs:
             release-bundle/*
 
 
-  Release-Docker:
-    name: Release on Docker Hub
+  docker:
+    name: Release / Docker Hub
     runs-on: ubuntu-latest
     needs:
-      - Prepare-Release
+      - prepare
     env:
       GITHUB_COMMIT: ${{ github.sha }}
       DOCKER_REPO: postgrest
       DOCKER_USER: stevechavez
       DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
-      VERSION: ${{ needs.Prepare-Release.outputs.version }}
-      ISPRERELEASE: ${{ needs.Prepare-Release.outputs.isprerelease }}
+      VERSION: ${{ needs.prepare.outputs.version }}
+      ISPRERELEASE: ${{ needs.prepare.outputs.isprerelease }}
     steps:
       - uses: actions/checkout@v4
       - name: Setup Nix Environment
@@ -267,26 +267,26 @@ jobs:
 #          fi
 
 
-  Release-Docker-Arm:
-    name: Release Arm Builds on Docker Hub
+  docker-arm:
+    name: Release / Docker Hub Arm
     runs-on: ubuntu-latest
     needs:
-      - Build-Cabal-Arm
-      - Prepare-Release
-      - Release-Docker
+      - arm
+      - prepare
+      - docker
     env:
       GITHUB_COMMIT: ${{ github.sha }}
       DOCKER_REPO: postgrest
       DOCKER_USER: stevechavez
       DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
-      VERSION: ${{ needs.Prepare-Release.outputs.version }}
-      ISPRERELEASE: ${{ needs.Prepare-Release.outputs.isprerelease }}
+      VERSION: ${{ needs.prepare.outputs.version }}
+      ISPRERELEASE: ${{ needs.prepare.outputs.isprerelease }}
     steps:
       - uses: actions/checkout@v4
       - name: Publish images for ARM builds on Docker Hub
         uses: appleboy/ssh-action@master
         env:
-          REMOTE_DIR: ${{ needs.Build-Cabal-Arm.outputs.remotepath }}
+          REMOTE_DIR: ${{ needs.arm.outputs.remotepath }}
         with:
           host: ${{ secrets.SSH_ARM_HOST }}
           username: ubuntu
@@ -297,15 +297,15 @@ jobs:
           script: bash ~/$REMOTE_DIR/docker-publish.sh "$GITHUB_COMMIT" "$DOCKER_REPO" "$DOCKER_USER" "$DOCKER_PASS" "$REMOTE_DIR" "$VERSION" "$ISPRERELEASE"
 
 
-  Clean-Arm-Server:
-    name: Remove copied files from server
+  clean-arm:
+    name: Build / Cleanup
     needs:
-      - Build-Cabal-Arm
-      - Release-Docker-Arm
+      - arm
+      - docker-arm
     if: startsWith(github.ref, 'refs/tags/v')
     runs-on: ubuntu-latest
     env:
-      REMOTE_DIR: ${{ needs.Build-Cabal-Arm.outputs.remotepath }}
+      REMOTE_DIR: ${{ needs.arm.outputs.remotepath }}
     steps:
       - uses: actions/checkout@v4
       - name: Remove uploaded files from server
diff --git a/.github/workflows/report.yaml b/.github/workflows/report.yaml
index 573fc38cd4..658221a8a5 100644
--- a/.github/workflows/report.yaml
+++ b/.github/workflows/report.yaml
@@ -7,7 +7,7 @@ on:
       - completed
 
 jobs:
-  upload:
+  loadtest:
     name: Loadtest
     permissions:
       checks: write