diff --git a/.github/labels.json b/.github/labels.json
index 35006bd35db..db9f904bd83 100644
--- a/.github/labels.json
+++ b/.github/labels.json
@@ -50,5 +50,6 @@
 	{ "name": "x⁴ ⋅ hold", "color": "#CFD8DC" },
 	{ "name": "x⁵ ⋅ in progress", "color": "#4CAF50" },
 	{ "name": "x⁶ ⋅ invalid", "color": "#CFD8DC" },
-	{ "name": "x⁷ ⋅ wontfix", "color": "#CFD8DC" }
+	{ "name": "x⁷ ⋅ wontfix", "color": "#CFD8DC" },
+	{ "name": "x8 ⚙️ build repl artefacts", "color": "#4CAF50" }
 ]
diff --git a/.github/workflows/repl-artefacts.yml b/.github/workflows/repl-artefacts.yml
index 46be3135023..d1f87643351 100644
--- a/.github/workflows/repl-artefacts.yml
+++ b/.github/workflows/repl-artefacts.yml
@@ -2,9 +2,11 @@ name: Upload REPL artefacts
 
 on:
   pull_request_target:
+    types: [synchronize, opened, reopened, labeled]
 
 jobs:
   upload:
+    if: ${{ github.event.pull_request.head.repo.full_name == 'rollup/rollup' || contains( toJson(github.event.pull_request.labels), 'x8 ⚙️ build repl artefacts' ) }}
     runs-on: ubuntu-latest
     name: Upload
     steps:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 771742169b1..43f271a08cc 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -5,11 +5,12 @@ on:
     branches:
       - master
   pull_request:
+    types: [synchronize, opened, reopened]
 
 jobs:
-  linux14:
+  linux16:
     runs-on: ubuntu-latest
-    name: Node 14 + Coverage (Linux)
+    name: Node 16 + Coverage (Linux)
     steps:
       - name: Checkout Commit
         uses: actions/checkout@v2
@@ -18,7 +19,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v2
         with:
-          node-version: '14'
+          node-version: '16'
       - name: Install dependencies
         run: npm ci --ignore-scripts
       - name: Run tests with coverage
@@ -29,16 +30,16 @@ jobs:
         with:
           commit_parent: ${{ github.event.pull_request.head.sha }}
 
-  linux12:
+  linux14:
     runs-on: ubuntu-latest
-    name: Node 12 + Extra Tests (Linux)
+    name: Node 14 + Extra Tests (Linux)
     steps:
       - name: Checkout Commit
         uses: actions/checkout@v2
       - name: Setup Node
         uses: actions/setup-node@v2
         with:
-          node-version: '12'
+          node-version: '14'
       - name: Install dependencies
         run: npm ci --ignore-scripts
       - name: Lint
@@ -50,16 +51,19 @@ jobs:
         env:
           CI: true
 
-  linux10:
+  linux:
     runs-on: ubuntu-latest
-    name: Node 10 (Linux)
+    strategy:
+      matrix:
+        node: ['10', '12']
+    name: Node ${{ matrix.node }} (Linux)
     steps:
       - name: Checkout Commit
         uses: actions/checkout@v2
       - name: Setup Node
         uses: actions/setup-node@v2
         with:
-          node-version: '10'
+          node-version: ${{ matrix.node }}
       - name: Install dependencies
         run: npm ci --ignore-scripts
       - name: Run tests
@@ -71,7 +75,7 @@ jobs:
     runs-on: windows-2019
     strategy:
       matrix:
-        node: ['10', '12', '14', '16']
+        node: ['10', '16']
     name: Node ${{ matrix.node }} (Windows)
     steps:
       - name: Configure git line-breaks