diff --git a/automation/taskcluster/lib/__init__.py b/automation/taskcluster/lib/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/automation/taskcluster/lib/tasks.py b/automation/taskcluster/lib/tasks.py
deleted file mode 100644
index 917b9c8c1..000000000
--- a/automation/taskcluster/lib/tasks.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Bug 1558456 - Stop tracking youtube-playback-test on motoG5 for >1080p cases
-ARM_RAPTOR_URL_PARAMS = [
-    "exclude=1,2,9,10,17,18,21,22,26,28,30,32,39,40,47,"
-    "48,55,56,63,64,71,72,79,80,83,84,89,90,95,96",
-]
diff --git a/taskcluster/ci/raptor/kind.yml b/taskcluster/ci/raptor/kind.yml
index f49beaff3..f96688ff2 100644
--- a/taskcluster/ci/raptor/kind.yml
+++ b/taskcluster/ci/raptor/kind.yml
@@ -204,3 +204,9 @@ jobs:
         test-name: raptor-youtube-playback
         treeherder:
             symbol: 'Rap(ytp)'
+        args:
+            by-abi:
+                # Bug 1558456 - Stop tracking youtube-playback-test on motoG5 for >1080p cases
+                armeabi-v7a:
+                    - '--test-url-params=exclude=1,2,9,10,17,18,21,22,26,28,30,32,39,40,47,48,55,56,63,64,71,72,79,80,83,84,89,90,95,96'
+                default: []
diff --git a/taskcluster/fenix_taskgraph/transforms/raptor.py b/taskcluster/fenix_taskgraph/transforms/raptor.py
index f8fab1069..5a816381a 100644
--- a/taskcluster/fenix_taskgraph/transforms/raptor.py
+++ b/taskcluster/fenix_taskgraph/transforms/raptor.py
@@ -58,7 +58,7 @@ def build_raptor_task(config, tasks):
         task["name"] = "{}-{}-{}".format(task["name"], build_type, abi)
         task["description"] = "{}-{}".format(build_type, abi)
 
-        for key in ("worker-type", "treeherder.platform"):
+        for key in ("args", "treeherder.platform", "worker-type"):
             resolve_keyed_by(task, key, item_name=task["name"], **{"abi": abi})
 
         task["treeherder"] = inherit_treeherder_from_dep(task, signing)