diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 2641498..1543a04 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,23 +1,29 @@
 name: Build and Deploy
 on:
+  pull_request: {}
   push:
-    branches:
-      - main
+    branches: [main]
+    paths:
+      - 'favicon**'
+      - 'index.bs'
+      - 'sample_test.html'
+
 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-immersive-web-wg/2021Sep/0004.html
+#          W3C_BUILD_OVERRIDE: |
+#            status: WD
 
-      - 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.
+# not set /TR/ publication, but having for future placeholder
+# not set 'warning' to BUILD_FAIL_ON (not to cause error by bikeshed warning?)
diff --git a/Makefile b/Makefile
deleted file mode 100644
index b3e0b45..0000000
--- a/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_BIKESHED := $(shell command -v bikeshed 2> /dev/null)
-
-.PHONY: all index.html
-
-all: index.html
-
-index.html: index.bs
-ifndef LOCAL_BIKESHED
-	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
-else
-	bikeshed spec index.bs index.html
-endif
diff --git a/w3c.json b/w3c.json
index 336c5e8..88dea23 100644
--- a/w3c.json
+++ b/w3c.json
@@ -1,5 +1,5 @@
  {
-    "group":      109735
-,   "contacts":   ["dontcallmedom", "himorin"]
+    "group":      87846
+,   "contacts":   [ "himorin" ]
 ,   "repo-type":  "tests"
 }