diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
new file mode 100644
index 0000000..d1ad113
--- /dev/null
+++ b/.github/CONTRIBUTING.md
@@ -0,0 +1 @@
+Please see the [WHATWG Contributor Guidelines](https://github.com/whatwg/meta/blob/main/CONTRIBUTING.md).
diff --git a/PULL_REQUEST_TEMPLATE.md b/.github/pull_request_template.md
similarity index 85%
rename from PULL_REQUEST_TEMPLATE.md
rename to .github/pull_request_template.md
index 47dad46..03428db 100644
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/.github/pull_request_template.md
@@ -1,6 +1,8 @@
 <!--
 Thank you for contributing to the URL Pattern Standard! Please describe the change you are making and complete the checklist below if your change is not editorial.
-When editing this comment after the PR is created, check that PR-Preview doesn't overwrite your changes.
+
+When you submit this PR, and each time you edit this comment (including checking a checkbox through the UI!), PR Preview will run and update it. As such make any edits in one go and only after PR Preview has run.
+
 If you think your PR is ready to land, please double-check that the build is passing and the checklist is complete before pinging.
 -->
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 66fe55b..f6bf113 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,14 +12,14 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 2
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v6
       with:
-        python-version: "3.11"
+        python-version: "3.14"
     - run: pip install bikeshed && bikeshed update
     # Note: `make deploy` will do a deploy dry run on PRs.
     - run: make deploy
diff --git a/Makefile b/Makefile
index 0d51c5e..dcd981b 100644
--- a/Makefile
+++ b/Makefile
@@ -2,13 +2,15 @@ SHELL=/bin/bash -o pipefail
 .PHONY: local remote deploy
 
 remote: spec.bs
-	@ (HTTP_STATUS=$$(curl https://api.csswg.org/bikeshed/ \
+	@ (HTTP_STATUS=$$(curl https://www.w3.org/publications/spec-generator/ \
 	                       --output spec.html \
 	                       --write-out "%{http_code}" \
 	                       --header "Accept: text/plain, text/html" \
 	                       -F die-on=warning \
 	                       -F md-Text-Macro="COMMIT-SHA LOCAL COPY" \
-	                       -F file=@spec.bs) && \
+	                       -F file=@spec.bs \
+	                       -F type=bikeshed-spec \
+	                       -F output=html) && \
 	[[ "$$HTTP_STATUS" -eq "200" ]]) || ( \
 		echo ""; cat spec.html; echo ""; \
 		rm -f spec.html; \