diff --git a/.gitea/workflows/update-check.yaml b/.gitea/workflows/update-check.yaml
index f8a0ab4..eeb9798 100644
--- a/.gitea/workflows/update-check.yaml
+++ b/.gitea/workflows/update-check.yaml
@@ -70,11 +70,19 @@ jobs:
 
           ARCH_BADGES='<img src="https://img.shields.io/badge/amd64-E65100" alt="amd64"> <img src="https://img.shields.io/badge/arm64-2e7d32" alt="arm64">'
 
-          # Build version rows from API data (sorted by major descending)
-          README_ROWS=""
-          DOCKERHUB_ROWS=""
-          BADGE_VERSIONS=""
+          # Table headers
+          README_HEADER='| Version | <a href="https://hub.docker.com/r/svrnty/dotnet/tags?name=runtime-" target="_blank"><img src="https://img.shields.io/badge/runtime-blue?logo=docker" alt="runtime"></a> | <a href="https://hub.docker.com/r/svrnty/dotnet/tags?name=runtime-invariant-" target="_blank"><img src="https://img.shields.io/badge/runtime--invariant-blue?logo=docker" alt="runtime-invariant"></a> | <a href="https://hub.docker.com/r/svrnty/dotnet/tags?name=sdk-" target="_blank"><img src="https://img.shields.io/badge/sdk-blue?logo=docker" alt="sdk"></a> | Arch | EOL |'
+          README_SEP='|---------|---------|-------------------|-----|------|-----|'
+          DOCKERHUB_HEADER='| Version | `runtime` | `runtime-invariant` | `sdk` | Arch | EOL |'
+          DOCKERHUB_SEP='|---------|-----------|---------------------|-------|------|-----|'
 
+          echo "$README_HEADER" > /tmp/readme_rows.txt
+          echo "$README_SEP" >> /tmp/readme_rows.txt
+          echo "$DOCKERHUB_HEADER" > /tmp/dockerhub_rows.txt
+          echo "$DOCKERHUB_SEP" >> /tmp/dockerhub_rows.txt
+          > /tmp/badge_versions.txt
+
+          # Build version rows from API data (sorted by major descending)
           echo "$SUPPORTED" | jq -r 'sort_by(.["channel-version"] | split(".") | map(tonumber)) | reverse | .[] | "\(.["channel-version"]) \(.["latest-runtime"]) \(.["latest-sdk"]) \(.["release-type"]) \(.["eol-date"] // "TBD")"' | \
           while read -r CHANNEL RUNTIME SDK TYPE EOL; do
             MAJOR=$(echo "$CHANNEL" | cut -d. -f1)
diff --git a/DOCKERHUB.md b/DOCKERHUB.md
index f7728c9..21e0467 100644
--- a/DOCKERHUB.md
+++ b/DOCKERHUB.md
@@ -7,9 +7,9 @@ Minimal .NET Docker images for production and CI/CD. Built on [Wolfi](https://wo
 
 ## Images
 
+<!-- BEGIN_VERSION_TABLE -->
 | Version | `runtime` | `runtime-invariant` | `sdk` | Arch | EOL |
 |---------|-----------|---------------------|-------|------|-----|
-<!-- BEGIN_VERSION_TABLE -->
 | **.NET 10** (LTS) | `runtime-10` `runtime-lts` | `runtime-invariant-10` `runtime-invariant-lts` | `sdk-10` `sdk-lts` | amd64 arm64 | 2028-11-14 |
 | **.NET 9** (STS) | `runtime-9` `runtime-sts` | `runtime-invariant-9` `runtime-invariant-sts` | `sdk-9` `sdk-sts` | amd64 arm64 | 2026-11-10 |
 | **.NET 8** | `runtime-8` | `runtime-invariant-8` | `sdk-8` | amd64 arm64 | 2026-11-10 |
diff --git a/README.md b/README.md
index 3ad389e..3f66846 100644
--- a/README.md
+++ b/README.md
@@ -10,9 +10,9 @@ Minimal .NET Docker images for production and CI/CD. Built on [Wolfi](https://wo
 
 ## Images
 
+<!-- BEGIN_VERSION_TABLE -->
 | Version | <a href="https://hub.docker.com/r/svrnty/dotnet/tags?name=runtime-" target="_blank"><img src="https://img.shields.io/badge/runtime-blue?logo=docker" alt="runtime"></a> | <a href="https://hub.docker.com/r/svrnty/dotnet/tags?name=runtime-invariant-" target="_blank"><img src="https://img.shields.io/badge/runtime--invariant-blue?logo=docker" alt="runtime-invariant"></a> | <a href="https://hub.docker.com/r/svrnty/dotnet/tags?name=sdk-" target="_blank"><img src="https://img.shields.io/badge/sdk-blue?logo=docker" alt="sdk"></a> | Arch | EOL |
 |---------|---------|-------------------|-----|------|-----|
-<!-- BEGIN_VERSION_TABLE -->
 | **.NET 10** (LTS) | `runtime-10` `runtime-lts` | `runtime-invariant-10` `runtime-invariant-lts` | `sdk-10` `sdk-lts` | <img src="https://img.shields.io/badge/amd64-E65100" alt="amd64"> <img src="https://img.shields.io/badge/arm64-2e7d32" alt="arm64"> | 2028-11-14 |
 | **.NET 9** (STS) | `runtime-9` `runtime-sts` | `runtime-invariant-9` `runtime-invariant-sts` | `sdk-9` `sdk-sts` | <img src="https://img.shields.io/badge/amd64-E65100" alt="amd64"> <img src="https://img.shields.io/badge/arm64-2e7d32" alt="arm64"> | 2026-11-10 |
 | **.NET 8** | `runtime-8` | `runtime-invariant-8` | `sdk-8` | <img src="https://img.shields.io/badge/amd64-E65100" alt="amd64"> <img src="https://img.shields.io/badge/arm64-2e7d32" alt="arm64"> | 2026-11-10 |