diff --git a/.github/workflows/build-pr.yaml b/.github/workflows/build-pr.yaml
index e84a562c86..41c84eabbf 100644
--- a/.github/workflows/build-pr.yaml
+++ b/.github/workflows/build-pr.yaml
@@ -19,6 +19,8 @@ jobs:
 
       - name: Configure Build X
         uses: docker/setup-buildx-action@v3
+        with:
+          buildkitd-flags: --debug
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -33,7 +35,7 @@ jobs:
           context: .
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          tags: ghcr.io/xibosignage/xibo-cms:test-pr
+          tags: ghcr.io/xibosignage/xibo-cms:test-${{ github.event.pull_request.number }}
           build-args: GIT_COMMIT=${{ github.event.head.sha }}
           push: true
           load: false