--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -172370,16 +172370,28 @@
       [
        "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055-ref.html",
        "=="
       ]
      ],
      {}
     ]
    ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056.html": [
+    [
+     "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056.html",
+     [
+      [
+       "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001.html": [
     [
      "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001.html",
      [
       [
        "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001-ref.html",
        "=="
       ]
@@ -172658,16 +172670,28 @@
       [
        "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051-ref.html",
        "=="
       ]
      ],
      {}
     ]
    ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052.html": [
+    [
+     "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052.html",
+     [
+      [
+       "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016.html": [
     [
      "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016.html",
      [
       [
        "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016-ref.html",
        "=="
       ]
@@ -173042,16 +173066,28 @@
       [
        "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025-ref.html",
        "=="
       ]
      ],
      {}
     ]
    ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032.html": [
+    [
+     "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032.html",
+     [
+      [
+       "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/text-decor-3/ruby-text-decoration-01.html": [
     [
      "/css/vendor-imports/mozilla/mozilla-central-reftests/text-decor-3/ruby-text-decoration-01.html",
      [
       [
        "/css/vendor-imports/mozilla/mozilla-central-reftests/text-decor-3/ruby-text-decoration-01-ref.html",
        "=="
       ]
@@ -268956,16 +268992,21 @@
      {}
     ]
    ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055-ref.html": [
     [
      {}
     ]
    ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001-ref.html": [
     [
      {}
     ]
    ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-002-ref.html": [
     [
      {}
@@ -269066,16 +269107,21 @@
      {}
     ]
    ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051-ref.html": [
     [
      {}
     ]
    ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016-ref.html": [
     [
      {}
     ]
    ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017-ref.html": [
     [
      {}
@@ -269226,16 +269272,26 @@
      {}
     ]
    ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025-ref.html": [
     [
      {}
     ]
    ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/support/Ahem.ttf": [
+    [
+     {}
+    ]
+   ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/sync-tests-filter": [
     [
      {}
     ]
    ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/sync-tests.sh": [
     [
      {}
@@ -398357,17 +398413,17 @@
    "525f7d93f00f11086aabc1f652cf06623e21986c",
    "support"
   ],
   "./.pyup.yml": [
    "a276808f4f41f6243ca69600d8f9b78ca7f9ed96",
    "support"
   ],
   "./.taskcluster.yml": [
-   "ad5de789abd81f88b66074c035b1533346f3a8e5",
+   "f50e12294bfb99a05c2fe9a0f288a144a2e16626",
    "support"
   ],
   "./.travis.yml": [
    "db79dd9531259cfaf670e7b780a9a205ec712369",
    "support"
   ],
   "./CODEOWNERS": [
    "27076c48623ad8788d0e0cc7679ad86be678744c",
@@ -398401,17 +398457,17 @@
    "0efa39b1f26f86d73f2fce4f9e46003d62057b41",
    "support"
   ],
   "./server-side.md": [
    "c51b17fbac2a2e3121dc74f7badbd2873ce92f61",
    "support"
   ],
   "./update-built-tests.sh": [
-   "e632acfa68de35b71b650db172ffff6d048399a7",
+   "75822374bec6ee3bd6b516027d57f9103629c6bd",
    "support"
   ],
   "./wpt": [
    "4312550682b01b597b993e75d0c521e9a26b09d9",
    "support"
   ],
   "./wpt.py": [
    "d73918dcbe679eb70beff902500df84d56ddc74b",
@@ -549749,17 +549805,17 @@
    "77a40c794be3488c77edc9528d53755dfc7214b5",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/selectors4/reftest.list": [
    "76c907a127aec740e17d009a517acccd5d3e9fd4",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/reftest.list": [
-   "c199bd6af0e3d2bbc8f87c3a768a1a8c4a17f7ab",
+   "d2d4e66a63a2545ef445b286ed0f54123cb2ab4c",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001-ref.html": [
    "f60b429f37b066f9a16dceeb19bfa8ed4f2b0623",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001.html": [
    "633f57d18aa6315c4073ecfefb9d6ab2220e0fc1",
@@ -550008,16 +550064,24 @@
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055-ref.html": [
    "d257a98d01e6225df871e3117273d533e0f51066",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055.html": [
    "3fa72763f5861efda170bc258a152b9d36c16877",
    "reftest"
   ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056-ref.html": [
+   "2d26e3249f3fff3ab6b81016784068f6433b1c6e",
+   "support"
+  ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056.html": [
+   "5bf591021864f8c0c0c1820116a67c5cd69a7bb4",
+   "reftest"
+  ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001-ref.html": [
    "dbd151f3c71007b3788fe86ca245405c8f479325",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001.html": [
    "7b4fec91767c7e9be2d3a5c9fc610af444d48930",
    "reftest"
   ],
@@ -550192,16 +550256,24 @@
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051-ref.html": [
    "1a417d04b206680ab33f866e82bc91f8ee14d67b",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051.html": [
    "74cc5ab0e72399c572059bdb0fc29bc743a93e35",
    "reftest"
   ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052-ref.html": [
+   "2d26e3249f3fff3ab6b81016784068f6433b1c6e",
+   "support"
+  ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052.html": [
+   "03fa135aca6cf9e79f6d2e988ea6c9031b05e6f0",
+   "reftest"
+  ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016-ref.html": [
    "e6cb3ee3eb3d0c521303b6010546e0b743a4090c",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016.html": [
    "9ff9f0e34c5c77188e3c7709c751d4aeaa20ff25",
    "reftest"
   ],
@@ -550448,16 +550520,28 @@
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025-ref.html": [
    "51cf20e605aa791e3d63c4902377aa3aca987ad7",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025.html": [
    "9393c2e2250dfc1bf3ffdd68f2c352890d1e0ee8",
    "reftest"
   ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032-ref.html": [
+   "890dd0754f2c985719c75200dd9ef70e8c1abe14",
+   "support"
+  ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032.html": [
+   "ea8cf594cd61a4aa284342fa895841861af3cd86",
+   "reftest"
+  ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/support/Ahem.ttf": [
+   "8cdc9e68594fbb6db8c7b4bff643ab2432b51db6",
+   "support"
+  ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/sync-tests-filter": [
    "3055eafd3bf887f11c0c386419397910ad438d23",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/sync-tests.sh": [
    "1c18dc5fdcddbbd08dbdc812f538a175e58892d7",
    "support"
   ],

--- a/testing/web-platform/tests/.taskcluster.yml
+++ b/testing/web-platform/tests/.taskcluster.yml
@@ -10,880 +10,880 @@ tasks:
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
         \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome reftest 1 10"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-chrome-dev-reftest-2, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
         \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome reftest 2 10"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-chrome-dev-reftest-3, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
         \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome reftest 3 10"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-chrome-dev-reftest-4, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
         \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome reftest 4 10"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-chrome-dev-reftest-5, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
         \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome reftest 5 10"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-chrome-dev-reftest-6, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
         \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome reftest 6 10"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-chrome-dev-reftest-7, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
         \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome reftest 7 10"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-chrome-dev-reftest-8, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
         \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome reftest 8 10"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-chrome-dev-reftest-9, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
         \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome reftest 9 10"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-chrome-dev-reftest-10, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
         \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome reftest 10 10"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-chrome-dev-wdspec-1, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
         \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome wdspec 1 1"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-chrome-dev-testharness-1, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
         \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 1 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-chrome-dev-testharness-2, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
         \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 2 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-chrome-dev-testharness-3, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
         \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 3 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-chrome-dev-testharness-4, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
         \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 4 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-chrome-dev-testharness-5, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
         \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 5 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-chrome-dev-testharness-6, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
         \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 6 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-chrome-dev-testharness-7, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
         \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 7 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-chrome-dev-testharness-8, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
         \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 8 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-chrome-dev-testharness-9, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
         \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 9 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-chrome-dev-testharness-10, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
         \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 10 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-chrome-dev-testharness-11, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
         \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 11 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-chrome-dev-testharness-12, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
         \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 12 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-chrome-dev-testharness-13, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
         \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 13 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-chrome-dev-testharness-14, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
         \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 14 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-chrome-dev-testharness-15, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
         \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 15 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-firefox-nightly-reftest-1, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
         \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox reftest 1 10"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-firefox-nightly-reftest-2, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
         \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox reftest 2 10"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-firefox-nightly-reftest-3, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
         \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox reftest 3 10"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-firefox-nightly-reftest-4, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
         \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox reftest 4 10"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-firefox-nightly-reftest-5, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
         \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox reftest 5 10"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-firefox-nightly-reftest-6, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
         \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox reftest 6 10"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-firefox-nightly-reftest-7, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
         \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox reftest 7 10"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-firefox-nightly-reftest-8, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
         \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox reftest 8 10"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-firefox-nightly-reftest-9, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
         \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox reftest 9 10"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-firefox-nightly-reftest-10, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
         \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox reftest 10 10"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-firefox-nightly-wdspec-1, owner: '{{ event.head.user.email
       }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
         \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox wdspec 1 1"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-firefox-nightly-testharness-1, owner: '{{
       event.head.user.email }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
         \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 1 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-firefox-nightly-testharness-2, owner: '{{
       event.head.user.email }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
         \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 2 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-firefox-nightly-testharness-3, owner: '{{
       event.head.user.email }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
         \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 3 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-firefox-nightly-testharness-4, owner: '{{
       event.head.user.email }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
         \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 4 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-firefox-nightly-testharness-5, owner: '{{
       event.head.user.email }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
         \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 5 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-firefox-nightly-testharness-6, owner: '{{
       event.head.user.email }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
         \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 6 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-firefox-nightly-testharness-7, owner: '{{
       event.head.user.email }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
         \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 7 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-firefox-nightly-testharness-8, owner: '{{
       event.head.user.email }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
         \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 8 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-firefox-nightly-testharness-9, owner: '{{
       event.head.user.email }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
         \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 9 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-firefox-nightly-testharness-10, owner: '{{
       event.head.user.email }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
         \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 10 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-firefox-nightly-testharness-11, owner: '{{
       event.head.user.email }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
         \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 11 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-firefox-nightly-testharness-12, owner: '{{
       event.head.user.email }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
         \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 12 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-firefox-nightly-testharness-13, owner: '{{
       event.head.user.email }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
         \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 13 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-firefox-nightly-testharness-14, owner: '{{
       event.head.user.email }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
         \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 14 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 - extra:
     github:
       branches: [master]
       events: [push]
   metadata: {description: '', name: wpt-firefox-nightly-testharness-15, owner: '{{
       event.head.user.email }}', source: '{{ event.head.repo.url }}'}
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
     command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
         \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
         \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 15 15"]
-    image: harjgam/web-platform-tests:0.11
+    image: harjgam/web-platform-tests:0.12
     maxRunTime: 7200
-  provisionerId: '{{ taskcluster.docker.provisionerId }}'
-  workerType: '{{ taskcluster.docker.workerType }}'
+  provisionerId: aws-provisioner-v1
+  workerType: wpt-docker-worker
 version: 0

--- a/testing/web-platform/tests/tools/ci/taskgraph.py
+++ b/testing/web-platform/tests/tools/ci/taskgraph.py
@@ -4,17 +4,17 @@ import os
 import six
 
 import yaml
 
 
 here = os.path.dirname(__file__)
 wpt_root = os.path.abspath(os.path.join(here, os.pardir, os.pardir))
 
-docker_image = "harjgam/web-platform-tests:0.11"
+docker_image = "harjgam/web-platform-tests:0.12"
 
 task_template = {
     "provisionerId": "aws-provisioner-v1",
     "workerType": "wpt-docker-worker",
     "extra": {
         "github": {
             "events": ["push"],
             "branches": ["master"],

--- a/testing/web-platform/tests/tools/docker/start.sh
+++ b/testing/web-platform/tests/tools/docker/start.sh
@@ -1,8 +1,21 @@
+# This script is embedded in the docker image, and so the image must be updated when changes
+# to the script are made. To do this, assuming you have docker installed:
+# In tools/docker/ :
+#   docker build .
+#   docker ps # and look for the id of the image you just built
+#   docker tag <image> <tag>
+#   docker push <tag>
+# Edit tools/ci/taskgraph.py and update the docker_image = "<tag>" line
+# In the project root:
+#   ./wpt make-tasks
+# Commit the changes with .taskcluster.yml changes in a separate commit for easier review
+
+
 #!/bin/bash
 set -ex
 
 REMOTE=${1:-https://github.com/w3c/web-platform-tests}
 BRANCH=${2:-master}
 REV=${3:-FETCH_HEAD}
 BROWSER=${4:-all}
 

--- a/testing/web-platform/tests/update-built-tests.sh
+++ b/testing/web-platform/tests/update-built-tests.sh
@@ -1,8 +1,11 @@
 #!/usr/bin/env sh
 set -ex
 
 2dcontext/tools/build.sh
 infrastructure/assumptions/tools/build.sh
 html/tools/build.sh
 offscreen-canvas/tools/build.sh
 python mimesniff/mime-types/resources/generated-mime-types.py
+
+# Infrastucture
+python wpt make-tasks