diff --git a/.github/workflows/auto-publish.yml b/.github/workflows/auto-publish.yml
new file mode 100644
index 0000000..877ebc8
--- /dev/null
+++ b/.github/workflows/auto-publish.yml
@@ -0,0 +1,15 @@
+name: CI
+on:
+  pull_request: {}
+  push:
+    branches: [main]
+jobs:
+  main:
+    name: Build, Validate and Deploy
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: w3c/spec-prod@v2
+        with:
+          TOOLCHAIN: bikeshed
+          GH_PAGES_BRANCH: gh-pages
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index e857b5b..0000000
--- a/.github/workflows/build.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Build
-on:
-  pull_request:
-    branches:
-    - main
-  push:
-    branches:
-    - main
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build
-      run: make ci
-    - name: Deploy
-      if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
-      uses: peaceiris/actions-gh-pages@v3
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: ./out
-
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 7bce901..0000000
--- a/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-SHELL=/bin/bash
-
-local: index.bs
-	bikeshed --die-on=warning spec index.bs index.html
-
-index.html: index.bs
-	@ (HTTP_STATUS=$$(curl https://api.csswg.org/bikeshed/ \
-	                       --output index.html \
-	                       --write-out "%{http_code}" \
-	                       --header "Accept: text/plain, text/html" \
-	                       -F die-on=warning \
-	                       -F file=@index.bs) && \
-	[[ "$$HTTP_STATUS" -eq "200" ]]) || ( \
-		echo ""; cat index.html; echo ""; \
-		rm -f index.html; \
-		exit 22 \
-	);
-
-remote: index.html
-
-ci: index.bs
-	mkdir -p out
-	make remote
-	mv index.html out/index.html
-
-clean:
-	rm index.html
-
-
diff --git a/index.bs b/index.bs
index ef4f74c..b2f4c20 100644
--- a/index.bs
+++ b/index.bs
@@ -13,6 +13,10 @@ Status Text: If you wish to make comments regarding this document, please create
 Default Highlight: js
 </pre>
 
+<pre class=link-defaults>
+spec:hr-time-3; type:dfn; text:duration
+</pre>
+
 <style>
 dl {
     margin-left: 2em;
@@ -288,7 +292,7 @@ The {{PerformanceScriptTiming/invoker}} attribute's getter steps are:
             1. If |this|'s [=PerformanceScriptTiming/timing info=]'s [=script timing info/event target element id=] is not the empty string, then:
                 Set |targetName| to the [=concatenate|concatenation=] of « |targetName|, "#", |this|'s [=PerformanceScriptTiming/timing info=]'s [=script timing info/event target element id=] ».
             1. Otherwise, If |this|'s [=PerformanceScriptTiming/timing info=]'s [=script timing info/event target element src attribute=] is not the empty string, then:
-                Set |targetName| to the [=concatenate|concatenation=] of « |targetName|, '[src=', |this|'s [=PerformanceScriptTiming/timing info=]'s [=script timing info/event target element src attribute=], ']' ».
+                Set |targetName| to the [=concatenate|concatenation=] of « |targetName|, "[src=", |this|'s [=PerformanceScriptTiming/timing info=]'s [=script timing info/event target element src attribute=], "]" ».
             1. Return the [=concatenate|concatenation=] of « |targetName|, ".on", [=this=]'s [=PerformanceScriptTiming/timing info=]'s [=script timing info/event type=] ».
 
             Issue: this feels a bit custom, need to discuss name generation.
@@ -347,7 +351,7 @@ It has the following [=struct/items=]:
     : <dfn>first ui event timestamp</dfn>
     : <dfn>end time</dfn>
     :: A {{DOMHighResTimeStamp}}, initially 0.
-        Note: all the above are [=monotonic clock/unsafe current time=|unsafe=],
+        Note: all the above are [=monotonic clock/unsafe current time|unsafe=],
         and should be [=coarsen time|coarsened=] when exposed via an API.
 
     : <dfn>task durations</dfn>