diff --git a/.yamato/com.unity.ml-agents-test.yml b/.yamato/com.unity.ml-agents-test.yml
index 9cd4ae56b0..45ee3f0aad 100644
--- a/.yamato/com.unity.ml-agents-test.yml
+++ b/.yamato/com.unity.ml-agents-test.yml
@@ -7,10 +7,8 @@ test_editors:
       testProject: DevProject
       enableNoDefaultPackages: !!bool true
 
-# Pinning to 6000.5 instead of `trunk`.
-# Bump back to `trunk` once the CI image's pinned UTR understands UTF-1.8.
 trunk_editor:
-    - version: 6000.5
+    - version: trunk
       testProject: DevProject
 
 test_platforms:
@@ -115,17 +113,11 @@ test_{{ package.name }}_{{ platform.name }}_{{ editor.version}}_{{ editor.testPr
     name : {{ package.name }} test {{ editor.version }} on {{ platform.name }} in {{ editor.testProject }}
     agent:
         type: {{ platform.type }}
-        image: {{ platform.image }}
+        image: {% if platform.name == "linux" %}package-ci/ubuntu-22.04:v4{% else %}{{ platform.image }}{% endif %}
         flavor: {{ platform.flavor}}
     commands:
-        - |
-{% if platform.name == "linux" %}
-          conda activate python3.10
-{% endif %}
-          python -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
-          unity-downloader-cli -u {{ editor.version }} -c editor --wait --fast
-          npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
-          upm-ci project test -u {{ editor.version }} --project-path {{ editor.testProject }} --package-filter {{ package.name }} --extra-create-project-arg="-upmNoDefaultPackages" --extra-utr-arg "reruncount=2"
+        - unity-downloader-cli -u {{ editor.version }} -c editor --wait --fast
+        - UnifiedTestRunner --suite=editor --suite=playmode --editor-location=.Editor --testproject={{ editor.testProject }} --artifacts-path=upm-ci~/test-results --reruncount=2
     artifacts:
         logs:
             paths: