diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 2641498..1c5f860 100755
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,23 +1,27 @@
-name: Build and Deploy
+name: Build, and publish spec to GitHub Pages and /TR/
+
 on:
+  pull_request: {}
   push:
-    branches:
-      - main
+    branches: [main]
+    paths:
+      - '**png'
+      - 'logo/**'
+      - 'index.bs'
+
 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.
-        with:
-          persist-credentials: false
-
-      - 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
+      - uses: actions/checkout@v2
+      - uses: w3c/spec-prod@v2
         with:
-          BRANCH: gh-pages # The branch the action should deploy to.
-          FOLDER: deploy # The folder the action should deploy.
+          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/XXXX
+#          W3C_BUILD_OVERRIDE: |
+#            status: CRD
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e69de29..0000000
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 1aae000..0000000
--- a/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-.PHONY: all index.html
-
-all: index.html
-
-# build using api.csswg.org but not local bikeshed
-index.html: index.bs
-	curl https://api.csswg.org/bikeshed/ -F file=@index.bs -F output=err
-	curl https://api.csswg.org/bikeshed/ -F file=@index.bs -F force=1 > 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