diff --git a/taskcluster/ci/test/web-platform.yml b/taskcluster/ci/test/web-platform.yml
index c127a5cb1311..b4c3949cc0b8 100644
--- a/taskcluster/ci/test/web-platform.yml
+++ b/taskcluster/ci/test/web-platform.yml
@@ -210,8 +210,16 @@ web-platform-tests-webgpu:
     treeherder-symbol: W(webgpu)
     virtualization: virtual-with-gpu
     tier: default
-    chunks: 2
-    max-run-time: 7200
+    # Choice of `chunks`:
+    # Time-to-TEST-START on Windows is ~7m (~9m for debug).
+    # (though we're working on reducing this!)
+    # Devs would love ~10-15m runs, but we don't want to be more than
+    # 50% overhead, so let's aim for 15m (20m debug)
+    chunks: 10
+    max-run-time:
+        by-test-platform:
+            .*/debug: 1800  # 30m
+            default: 1200  # 20m
     variants: []  # We don't need sw or nofis testing.
     run-on-projects:
         by-test-platform: