diff --git a/.forgejo/workflows/pr.yml b/.forgejo/workflows/pr.yml
index f24d8b23..be3295ed 100644
--- a/.forgejo/workflows/pr.yml
+++ b/.forgejo/workflows/pr.yml
@@ -26,7 +26,7 @@ jobs:
       - name: release-schedule
         run: |
           pnpm run update-schedule
-          git diff --exit-code
+          git diff --exit-code || (echo "Error: Run 'pnpm run update-schedule' to generate the markdown release schedule and commit it" && false)
       - name: get forgejo.org and move the docs
         run: |
           git clone --recursive --depth 1 https://codeberg.org/forgejo/website/ /tmp/website
diff --git a/docs/admin/release-schedule.md b/docs/admin/release-schedule.md
index d6ba8933..2ad1f5ef 100644
--- a/docs/admin/release-schedule.md
+++ b/docs/admin/release-schedule.md
@@ -7,15 +7,15 @@ Forgejo stable releases are published on a fixed schedule, every quarter. The mo
 
 <!-- lines below are replaced -->
 
-| **LTS** | **Version** | **Cut branch** | **Release date** | **End Of Life** |
-| ------- | ----------- | -------------- | ---------------- | --------------- |
-| true    | 7.0         | 01-04-2024     | 23-04-2024       | 16-07-2024      |
-| false   | 8.0         | 01-07-2024     | 30-07-2024       | 16-10-2024      |
-| false   | 9.0         | 25-09-2024     | 16-10-2024       | 15-01-2025      |
-| false   | 10.0        | 25-12-2024     | 15-01-2025       | 16-04-2025      |
-| true    | 11.0        | 26-03-2025     | 16-04-2025       | 14-07-2026      |
-| false   | 12.0        | 25-06-2025     | 16-07-2025       | 15-10-2025      |
-| false   | 13.0        | 24-09-2025     | 15-10-2025       | 14-01-2026      |
-| false   | 14.0        | 24-12-2025     | 14-01-2026       | 15-04-2026      |
-| true    | 15.0        | 25-03-2026     | 15-04-2026       | 14-07-2027      |
-| false   | 16.0        | 24-06-2026     | 15-07-2026       | 14-10-2026      |
+| **Version** | **Cut branch**    | **Release date** | **End Of Life**  |
+| ----------- | ----------------- | ---------------- | ---------------- |
+| 7.0 (LTS)   | 1 April 2024      | 23 April 2024    | **16 July 2025** |
+| 8.0         | 1 July 2024       | 30 July 2024     | 16 October 2024  |
+| 9.0         | 25 September 2024 | 16 October 2024  | 15 January 2025  |
+| 10.0        | 25 December 2024  | 15 January 2025  | 16 April 2025    |
+| 11.0 (LTS)  | 26 March 2025     | 16 April 2025    | **15 July 2026** |
+| 12.0        | 25 June 2025      | 16 July 2025     | 15 October 2025  |
+| 13.0        | 24 September 2025 | 15 October 2025  | 14 January 2026  |
+| 14.0        | 24 December 2025  | 14 January 2026  | 15 April 2026    |
+| 15.0 (LTS)  | 25 March 2026     | 15 April 2026    | **14 July 2027** |
+| 16.0        | 24 June 2026      | 15 July 2026     | 14 October 2026  |
diff --git a/release-schedule.json b/release-schedule.json
index 2d8ce766..362cbc3c 100644
--- a/release-schedule.json
+++ b/release-schedule.json
@@ -1,12 +1,12 @@
 [
-  { "major": "7", "minor": "0", "cut": "01-04-2024", "release": "23-04-2024", "eol": "16-07-2024", "lts": true },
-  { "major": "8", "minor": "0", "cut": "01-07-2024", "release": "30-07-2024", "eol": "16-10-2024", "lts": false },
-  { "major": "9", "minor": "0", "cut": "25-09-2024", "release": "16-10-2024", "eol": "15-01-2025", "lts": false },
-  { "major": "10", "minor": "0", "cut": "25-12-2024", "release": "15-01-2025", "eol": "16-04-2025", "lts": false },
-  { "major": "11", "minor": "0", "cut": "26-03-2025", "release": "16-04-2025", "eol": "14-07-2026", "lts": true },
-  { "major": "12", "minor": "0", "cut": "25-06-2025", "release": "16-07-2025", "eol": "15-10-2025", "lts": false },
-  { "major": "13", "minor": "0", "cut": "24-09-2025", "release": "15-10-2025", "eol": "14-01-2026", "lts": false },
-  { "major": "14", "minor": "0", "cut": "24-12-2025", "release": "14-01-2026", "eol": "15-04-2026", "lts": false },
-  { "major": "15", "minor": "0", "cut": "25-03-2026", "release": "15-04-2026", "eol": "14-07-2027", "lts": true },
-  { "major": "16", "minor": "0", "cut": "24-06-2026", "release": "15-07-2026", "eol": "14-10-2026", "lts": false }
+  { "major": "7", "minor": "0", "cut": "2024-04-01", "release": "2024-04-23", "eol": "2025-07-16", "lts": true },
+  { "major": "8", "minor": "0", "cut": "2024-07-01", "release": "2024-07-30", "eol": "2024-10-16", "lts": false },
+  { "major": "9", "minor": "0", "cut": "2024-09-25", "release": "2024-10-16", "eol": "2025-01-15", "lts": false },
+  { "major": "10", "minor": "0", "cut": "2024-12-25", "release": "2025-01-15", "eol": "2025-04-16", "lts": false },
+  { "major": "11", "minor": "0", "cut": "2025-03-26", "release": "2025-04-16", "eol": "2026-07-15", "lts": true },
+  { "major": "12", "minor": "0", "cut": "2025-06-25", "release": "2025-07-16", "eol": "2025-10-15", "lts": false },
+  { "major": "13", "minor": "0", "cut": "2025-09-24", "release": "2025-10-15", "eol": "2026-01-14", "lts": false },
+  { "major": "14", "minor": "0", "cut": "2025-12-24", "release": "2026-01-14", "eol": "2026-04-15", "lts": false },
+  { "major": "15", "minor": "0", "cut": "2026-03-25", "release": "2026-04-15", "eol": "2027-07-14", "lts": true },
+  { "major": "16", "minor": "0", "cut": "2026-06-24", "release": "2026-07-15", "eol": "2026-10-14", "lts": false }
 ]
diff --git a/scripts/release-schedule.sh b/scripts/release-schedule.sh
index 32451ce5..9cb8e7f7 100755
--- a/scripts/release-schedule.sh
+++ b/scripts/release-schedule.sh
@@ -16,8 +16,17 @@ schedule="$(sed -e "/$tag/,20000d" <$dir/release-schedule.md)"
 $schedule
 $tag
 
-| **LTS** | **Version** | **Cut branch** | **Release date** | **End Of Life** |
-| ------- | ----------- | -------------- | ---------------- | --------------- |
+| **Version** | **Cut branch** | **Release date** | **End Of Life** |
+| ----------- | -------------- | ---------------- | --------------- |
 EOF
-	jq --raw-output '.[] | "| \(.lts) | \(.major).\(.minor) | \(.cut) | \(.release) | \(.eol) |"' <release-schedule.json
+	jq --raw-output '
+def date: .|strptime("%Y-%m-%d")|strftime("%e %B %Y");
+def bold: "**\(.)**";
+
+.[] | "| "
++ "\(.major).\(.minor)\(if .lts then " (LTS)" else "" end) |"
++ "\(.cut|date) |"
++ "\(.release|date) |"
++ "\(if .lts then .eol|date|bold else .eol|date end) |"
+' release-schedule.json
 ) >$dir/release-schedule.md