diff --git a/.yamato/_templates.yml b/.yamato/_templates.yml
index e703ba16a3f..6b8991f226d 100644
--- a/.yamato/_templates.yml
+++ b/.yamato/_templates.yml
@@ -18,7 +18,7 @@ pre_pack_hdrp_template_Win_trunk:
     commands:
       -  choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
-      -  .Editor\Unity.exe -projectPath com.unity.template-hd -batchmode -quit
+      -  .Editor\Unity.exe -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log
     dependencies:
       -  .yamato/_editor_priming.yml#editor:priming:trunk:Win
     artifacts:
@@ -27,6 +27,9 @@ pre_pack_hdrp_template_Win_trunk:
               -  "com.unity.template-hd/Library/Artifacts/**"
               -  "com.unity.template-hd/Library/ArtifactDB"
               -  "com.unity.template-hd/Library/SourceAssetDB"
+        logs:
+            paths:
+              -  "Editor.log"
 pack_hdrp_template_Win_trunk:
     name: Pack HDRP Template Win trunk
     agent:
@@ -69,7 +72,7 @@ pre_pack_hdrp_template_OSX_trunk:
         flavor: m1.mac
     commands:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
-      -  .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-hd -batchmode -quit
+      -  .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log
     dependencies:
       -  .yamato/_editor_priming.yml#editor:priming:trunk:OSX
     artifacts:
@@ -78,6 +81,9 @@ pre_pack_hdrp_template_OSX_trunk:
               -  "com.unity.template-hd/Library/Artifacts/**"
               -  "com.unity.template-hd/Library/ArtifactDB"
               -  "com.unity.template-hd/Library/SourceAssetDB"
+        logs:
+            paths:
+              -  "Editor.log"
 pack_hdrp_template_OSX_trunk:
     name: Pack HDRP Template OSX trunk
     agent:
@@ -158,7 +164,7 @@ pre_pack_hdrp_template_Win_2021.2:
     commands:
       -  choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
-      -  .Editor\Unity.exe -projectPath com.unity.template-hd -batchmode -quit
+      -  .Editor\Unity.exe -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log
     dependencies:
       -  .yamato/_editor_priming.yml#editor:priming:2021.2:Win
     artifacts:
@@ -167,6 +173,9 @@ pre_pack_hdrp_template_Win_2021.2:
               -  "com.unity.template-hd/Library/Artifacts/**"
               -  "com.unity.template-hd/Library/ArtifactDB"
               -  "com.unity.template-hd/Library/SourceAssetDB"
+        logs:
+            paths:
+              -  "Editor.log"
 pack_hdrp_template_Win_2021.2:
     name: Pack HDRP Template Win 2021.2
     agent:
@@ -209,7 +218,7 @@ pre_pack_hdrp_template_OSX_2021.2:
         flavor: m1.mac
     commands:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
-      -  .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-hd -batchmode -quit
+      -  .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log
     dependencies:
       -  .yamato/_editor_priming.yml#editor:priming:2021.2:OSX
     artifacts:
@@ -218,6 +227,9 @@ pre_pack_hdrp_template_OSX_2021.2:
               -  "com.unity.template-hd/Library/Artifacts/**"
               -  "com.unity.template-hd/Library/ArtifactDB"
               -  "com.unity.template-hd/Library/SourceAssetDB"
+        logs:
+            paths:
+              -  "Editor.log"
 pack_hdrp_template_OSX_2021.2:
     name: Pack HDRP Template OSX 2021.2
     agent:
@@ -298,7 +310,7 @@ pre_pack_hdrp_template_Win_CUSTOM-REVISION:
     commands:
       -  choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
-      -  .Editor\Unity.exe -projectPath com.unity.template-hd -batchmode -quit
+      -  .Editor\Unity.exe -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log
     dependencies:
       -  .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Win
     artifacts:
@@ -307,6 +319,9 @@ pre_pack_hdrp_template_Win_CUSTOM-REVISION:
               -  "com.unity.template-hd/Library/Artifacts/**"
               -  "com.unity.template-hd/Library/ArtifactDB"
               -  "com.unity.template-hd/Library/SourceAssetDB"
+        logs:
+            paths:
+              -  "Editor.log"
 pack_hdrp_template_Win_CUSTOM-REVISION:
     name: Pack HDRP Template Win CUSTOM-REVISION
     agent:
@@ -349,7 +364,7 @@ pre_pack_hdrp_template_OSX_CUSTOM-REVISION:
         flavor: m1.mac
     commands:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
-      -  .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-hd -batchmode -quit
+      -  .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log
     dependencies:
       -  .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:OSX
     artifacts:
@@ -358,6 +373,9 @@ pre_pack_hdrp_template_OSX_CUSTOM-REVISION:
               -  "com.unity.template-hd/Library/Artifacts/**"
               -  "com.unity.template-hd/Library/ArtifactDB"
               -  "com.unity.template-hd/Library/SourceAssetDB"
+        logs:
+            paths:
+              -  "Editor.log"
 pack_hdrp_template_OSX_CUSTOM-REVISION:
     name: Pack HDRP Template OSX CUSTOM-REVISION
     agent:
@@ -438,7 +456,7 @@ pre_pack_universal_template_Win_trunk:
     commands:
       -  choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
-      -  .Editor\Unity.exe -projectPath com.unity.template-universal -batchmode -quit
+      -  .Editor\Unity.exe -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log
     dependencies:
       -  .yamato/_editor_priming.yml#editor:priming:trunk:Win
     artifacts:
@@ -447,6 +465,9 @@ pre_pack_universal_template_Win_trunk:
               -  "com.unity.template-universal/Library/Artifacts/**"
               -  "com.unity.template-universal/Library/ArtifactDB"
               -  "com.unity.template-universal/Library/SourceAssetDB"
+        logs:
+            paths:
+              -  "Editor.log"
 pack_universal_template_Win_trunk:
     name: Pack Universal Template Win trunk
     agent:
@@ -489,7 +510,7 @@ pre_pack_universal_template_OSX_trunk:
         flavor: m1.mac
     commands:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
-      -  .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-universal -batchmode -quit
+      -  .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log
     dependencies:
       -  .yamato/_editor_priming.yml#editor:priming:trunk:OSX
     artifacts:
@@ -498,6 +519,9 @@ pre_pack_universal_template_OSX_trunk:
               -  "com.unity.template-universal/Library/Artifacts/**"
               -  "com.unity.template-universal/Library/ArtifactDB"
               -  "com.unity.template-universal/Library/SourceAssetDB"
+        logs:
+            paths:
+              -  "Editor.log"
 pack_universal_template_OSX_trunk:
     name: Pack Universal Template OSX trunk
     agent:
@@ -578,7 +602,7 @@ pre_pack_universal_template_Win_2021.2:
     commands:
       -  choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
-      -  .Editor\Unity.exe -projectPath com.unity.template-universal -batchmode -quit
+      -  .Editor\Unity.exe -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log
     dependencies:
       -  .yamato/_editor_priming.yml#editor:priming:2021.2:Win
     artifacts:
@@ -587,6 +611,9 @@ pre_pack_universal_template_Win_2021.2:
               -  "com.unity.template-universal/Library/Artifacts/**"
               -  "com.unity.template-universal/Library/ArtifactDB"
               -  "com.unity.template-universal/Library/SourceAssetDB"
+        logs:
+            paths:
+              -  "Editor.log"
 pack_universal_template_Win_2021.2:
     name: Pack Universal Template Win 2021.2
     agent:
@@ -629,7 +656,7 @@ pre_pack_universal_template_OSX_2021.2:
         flavor: m1.mac
     commands:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
-      -  .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-universal -batchmode -quit
+      -  .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log
     dependencies:
       -  .yamato/_editor_priming.yml#editor:priming:2021.2:OSX
     artifacts:
@@ -638,6 +665,9 @@ pre_pack_universal_template_OSX_2021.2:
               -  "com.unity.template-universal/Library/Artifacts/**"
               -  "com.unity.template-universal/Library/ArtifactDB"
               -  "com.unity.template-universal/Library/SourceAssetDB"
+        logs:
+            paths:
+              -  "Editor.log"
 pack_universal_template_OSX_2021.2:
     name: Pack Universal Template OSX 2021.2
     agent:
@@ -718,7 +748,7 @@ pre_pack_universal_template_Win_CUSTOM-REVISION:
     commands:
       -  choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
-      -  .Editor\Unity.exe -projectPath com.unity.template-universal -batchmode -quit
+      -  .Editor\Unity.exe -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log
     dependencies:
       -  .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Win
     artifacts:
@@ -727,6 +757,9 @@ pre_pack_universal_template_Win_CUSTOM-REVISION:
               -  "com.unity.template-universal/Library/Artifacts/**"
               -  "com.unity.template-universal/Library/ArtifactDB"
               -  "com.unity.template-universal/Library/SourceAssetDB"
+        logs:
+            paths:
+              -  "Editor.log"
 pack_universal_template_Win_CUSTOM-REVISION:
     name: Pack Universal Template Win CUSTOM-REVISION
     agent:
@@ -769,7 +802,7 @@ pre_pack_universal_template_OSX_CUSTOM-REVISION:
         flavor: m1.mac
     commands:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
-      -  .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-universal -batchmode -quit
+      -  .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log
     dependencies:
       -  .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:OSX
     artifacts:
@@ -778,6 +811,9 @@ pre_pack_universal_template_OSX_CUSTOM-REVISION:
               -  "com.unity.template-universal/Library/Artifacts/**"
               -  "com.unity.template-universal/Library/ArtifactDB"
               -  "com.unity.template-universal/Library/SourceAssetDB"
+        logs:
+            paths:
+              -  "Editor.log"
 pack_universal_template_OSX_CUSTOM-REVISION:
     name: Pack Universal Template OSX CUSTOM-REVISION
     agent:
diff --git a/.yamato/script/gfx_sdet_tools_revision.txt b/.yamato/script/gfx_sdet_tools_revision.txt
index 8dc50f9cb6b..aa07f333e88 100644
--- a/.yamato/script/gfx_sdet_tools_revision.txt
+++ b/.yamato/script/gfx_sdet_tools_revision.txt
@@ -1 +1 @@
-0443302efc7cbcd00689731e6020eb8a3a443579
+fa7cf5621e3dfe7dd2f8edbe0e313400a5fe43d7