diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 2641498..37276ef 100755
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,23 +1,31 @@
-name: Build and Deploy
+name: Build, and publish spec to GitHub Pages and /TR/
+
 on:
+  pull_request: {}
   push:
-    branches:
-      - main
+    branches: [main]
+    paths:
+      - 'images/**'
+      - 'logo/**'
+      - 'index.bs'
+      - 'anchors-w3c.txt'
+
 jobs:
-  build-and-deploy:
+  main:
+    name: Build, Validate and Deploy
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout 🛎️
-        uses: actions/checkout@v2.3.1 # If you're using actions/checkout@v2 you must set persist-credentials to false in most cases for the deployment to work correctly.
+      - uses: actions/checkout@v6
+      - uses: w3c/spec-prod@v2
         with:
-          persist-credentials: false
+          TOOLCHAIN: bikeshed
+          SOURCE: index.bs
+          DESTINATION: index.html
+          GH_PAGES_BRANCH: gh-pages
+          W3C_ECHIDNA_TOKEN: ${{ secrets.W3C_TR_TOKEN }}
+          W3C_WG_DECISION_URL: https://lists.w3.org/Archives/Public/public-tt/2026Apr/0002.html
+          W3C_BUILD_OVERRIDE: |
+            status: CRD
+
+# not set 'warning' to BUILD_FAIL_ON (not to cause error by bikeshed warning?)
 
-      - name: Install and Build 🔧 # This example project is built using npm and outputs the result to the 'build' folder. Replace with the commands required to build your project, or remove this step entirely if your site is pre-built.
-        run: make
-      - name: Prepare Deploy folder
-        run: mkdir deploy && rsync -av --exclude=.git --exclude=.gitignore --exclude=deploy . deploy/
-      - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@4.0.0
-        with:
-          BRANCH: gh-pages # The branch the action should deploy to.
-          FOLDER: deploy # The folder the action should deploy.
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e69de29..0000000
diff --git a/.htaccess b/.htaccess
deleted file mode 100644
index b5dd4d2..0000000
--- a/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Redirect 301 / https://w3c.github.io/webvtt/
diff --git a/Makefile b/Makefile
deleted file mode 100644
index effcf38..0000000
--- a/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-.PHONY: all index.html
-
-all: index.html
-
-# build using spec-generator but not local bikeshed
-index.html: index.bs
-	curl https://www.w3.org/publications/spec-generator/ -F file=@index.bs -F type=bikeshed-spec -F output=messages
-	curl https://www.w3.org/publications/spec-generator/ -F file=@index.bs -F type=bikeshed-spec -F die-on=nothing > index.html | tee
diff --git a/W3CTRMANIFEST.txt b/W3CTRMANIFEST.txt
deleted file mode 100644
index dbcefe6..0000000
--- a/W3CTRMANIFEST.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-index.html?specStatus=WD&shortName=webvtt1 respec
-webvtt-region-diagram.png
diff --git a/webvtt-region-diagram.png b/images/webvtt-region-diagram.png
similarity index 100%
rename from webvtt-region-diagram.png
rename to images/webvtt-region-diagram.png
diff --git a/index.bs b/index.bs
index a9cf7a9..c2bf36c 100644
--- a/index.bs
+++ b/index.bs
@@ -9,7 +9,7 @@ Group: texttracks
 ED: https://w3c.github.io/webvtt/
 TR: https://www.w3.org/TR/webvtt1/
 Level: none
-Editor: Gary Katsevman, Invited Expert, w3c@gkatsev.com
+Editor: Gary Katsevman 102836, Invited Expert, w3c@gkatsev.com
 Former Editor: Silvia Pfeiffer, NICTA CSIRO https://www.csiro.au/, silviapfeiffer1@gmail.com
 Former Editor: Simon Pieters, Opera Software AS http://www.opera.com/, simonp@opera.com
 Former Editor: Philip Jägenstedt, Opera Software ASA http://www.opera.com/, philipj@opera.com
@@ -1413,7 +1413,7 @@ together, which is particularly important when scrolling up.</p>
  <p>The following diagram illustrates how anchoring of a region to a video viewport works. The black
  cross is the anchor, orange explains the anchor's offset within the region and green the anchor's
  offset within the video viewport. Think of it as sticking a pin through a note onto a board:</p>
- <p><img src="webvtt-region-diagram.png" alt="visual explanation of WebVTT regions"
+ <p><img src="images/webvtt-region-diagram.png" alt="visual explanation of WebVTT regions"
  longdesc=#regionsExplained width="862" height="499"></p>
  <p id=regionsExplained>Image description: Within the video viewport, there is a WebVTT region.
  Inside the region, there is an anchor point marked with a black cross. The vertical and horizontal
diff --git a/snapshot.sh b/snapshot.sh
deleted file mode 100755
index 75f6037..0000000
--- a/snapshot.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-# Generates a snapshot in archives/
-
-STATUS=$1
-NEW_DATE=$2
-PREV_URL=$(echo $3 | sed -e 's#/#\\/#g')
-
-USAGE="\n\nUsage: $0 <status> <date> <prevurl>\n\
-For example: $0 WD 2015-10-31 http://www.w3.org/TR/2014/WD-webvtt1-20141113/"
-
-case $(uname) in
-  *Darwin*)
-    DARWIN=1
-    ;;
-esac
-
-function replace {
-  if [ -n "$DARWIN" ] ; then
-    sed -i "" "$1" "$2"
-  else
-    sed -i "$1" "$2"
-  fi
-}
-
-function check {
-  if [ $? != 0 ] ; then
-    echo "* $1: Failed (!)"
-    exit 1
-  fi
-  echo "* $1: Done"
-}
-
-if [ $# -lt 2 ] ; then
-  echo -e "Too few arguments. $USAGE"
-  exit 1
-fi
-
-cp index.bs index.temp.bs
-check "Make temporary copy of source file"
-
-mkdir -p "archives/$NEW_DATE/"
-check "Create directory archives/$NEW_DATE/"
-
-cp *.png "archives/$NEW_DATE/"
-check "Copy images to archives/$NEW_DATE/"
-
-replace "s/^Status: .*$/Status: $STATUS/" index.temp.bs
-check "Replace Status metadata"
-
-replace "1,/^$/s/^$/Date: $NEW_DATE/" index.temp.bs
-check "Add Date metadata"
-
-replace "1,/^$/s/^$/Previous Version: $PREV_URL/" index.temp.bs
-check "Add Previous Version metadata"
-
-
-replace "1,/^Prepare For TR: false$/s/^$/Prepare For TR: true/" index.temp.bs
-check "Prepare For TR"
-replace "s/^Default Ref Status: current$/Default Ref Status: snapshot/" index.temp.bs
-check "Default Ref Status"
-replace "s/\[\[!WEBIDL/\[\[!WEBIDL-1/" index.temp.bs
-check "Replace WEBIDL ref with W3C snapshot"
-replace "s/\[\[!HTML/\[\[!HTML51/g" index.temp.bs
-check "Replace HTML ref with W3C snapshot"
-
-replace "/<pre class=link-defaults>/,/<.pre>/d" index.temp.bs
-replace "/<pre class=biblio>/,/<.pre>/d" index.temp.bs
-replace "/<pre class=anchors>/,/<.pre>/{
-  /<pre class=anchors>/{
-    r anchors-w3c.txt
-  }
-  d
-}" index.temp.bs
-check "Replacing anchors with W3C anchors"
-
-bikeshed spec index.temp.bs archives/$NEW_DATE/Overview.html
-check "Generate with bikeshed"
-
-rm index.temp.bs
-check "Remove temporary source file"
-
-echo "*** Done ***"
-
-exit 0