diff --git a/.github/workflows/build-tokens.yaml b/.github/workflows/build-tokens.yaml
index 9315db50b8..0771d1c30a 100644
--- a/.github/workflows/build-tokens.yaml
+++ b/.github/workflows/build-tokens.yaml
@@ -3,7 +3,7 @@ on:
   pull_request:
     types: [opened, synchronize, edited, reopened]
     paths:
-      - 'packages/tokens'
+      - 'packages/tokens/**'
 
 jobs:
   build:
@@ -16,19 +16,42 @@ jobs:
       - name: Setup
         uses: ./.github/actions/setup-pnpm
 
-      - name: Install tokens & dependencies
-        run: pnpm --filter design-system-tokens... install
+      - name: Install dependencies
+        run: pnpm --filter ...design-system-tokens... install
 
       - name: Build tokens & dependencies
-        run: pnpm --filter design-system-tokens... build
+        run: pnpm --filter ...design-system-tokens... build
+
+      # TODOs:
+      # - Add changeset to the tokens package? (not sure if this should be done manually)
+      # - Build all packages which are dependant on the tokens --filter ...design-system-tokens
+      #   (styles and components for sure, maybe more)
 
       - name: Create Summary
         id: summary
         uses: actions/github-script@v7
         with:
           script: |
-            return `# Build Tokens
-            `
+            const fs = require('fs')
+              const inputfileNames = fs.readdirSync('packages/tokens/tokensstudio-generated')
+              const inputFiles = inputfileNames.map(fileName => ({ name: fileName, content: fs.readFileSync(`packages/tokens/tokensstudio-generated/${fileName}`, 'utf8') }))
+
+              const outputFileNames = fs.readdirSync('packages/tokens/dist')
+              const outputFiles = outputFileNames.map(fileName => ({ name: fileName, content: fs.readFileSync(`packages/tokens/dist/${fileName}`, 'utf8') }))
+
+              return `# Build Tokens
+              ## Input
+              ${inputFiles.map(({ name, content }) => `<details>
+                <summary><code>${name}</code></summary>
+                <pre lang="json">${content}</pre>
+              </details>`).join('\n')}
+
+              ## Output
+              ${outputFiles.map(({ name, content }) => `<details>
+                <summary><code>${name}</code></summary>
+                <pre lang="json">${content}</pre>
+              </details>`).join('\n')}
+              `
 
       - name: Output Summary
         run: echo -e ${{ steps.summary.outputs.result }} >> $GITHUB_STEP_SUMMARY