diff --git a/.yamato/_abv.yml b/.yamato/_abv.yml
index 271ae738c18..3585dba5120 100644
--- a/.yamato/_abv.yml
+++ b/.yamato/_abv.yml
@@ -17,4 +17,4 @@ graphics_repo_nightly_2022.3:
              frequency: 23 ? * 7 # At 11pm every Saturday
     dependencies:
       -  path: .yamato/_templates.yml#all_template_ci_2022.3
-         rerun: on_new_revision
+         rerun: always
diff --git a/.yamato/_templates.yml b/.yamato/_templates.yml
index 4c27f74d060..cac39d9dbdd 100644
--- a/.yamato/_templates.yml
+++ b/.yamato/_templates.yml
@@ -16,7 +16,8 @@ pre_pack_hdrp_template_Win_2022.3:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  .Editor\Unity.exe -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log
     dependencies:
-      -  .yamato/_editor_priming.yml#editor:priming:2022.3:Win
+      - path: .yamato/_editor_priming.yml#editor:priming:2022.3:Win
+        rerun: always
     artifacts:
         primed:
             paths:
@@ -47,8 +48,10 @@ test_hdrp_template_Win_2022.3:
         image: package-ci/win11:v4
         flavor: b1.large
     dependencies:
-      -  .yamato/_templates.yml#pack_hdrp_template_Win_2022.3
-      -  .yamato/_editor_priming.yml#editor:priming:2022.3:Win
+      - path: .yamato/_templates.yml#pack_hdrp_template_Win_2022.3
+        rerun: always
+      - path: .yamato/_editor_priming.yml#editor:priming:2022.3:Win
+        rerun: always
     commands:
       -  npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
       -  choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
@@ -68,7 +71,8 @@ pre_pack_hdrp_template_OSX_2022.3:
       -  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 -logFile ./Editor.log
     dependencies:
-      -  .yamato/_editor_priming.yml#editor:priming:2022.3:OSX
+      - path: .yamato/_editor_priming.yml#editor:priming:2022.3:OSX
+        rerun: always
     artifacts:
         primed:
             paths:
@@ -99,8 +103,10 @@ test_hdrp_template_OSX_2022.3:
         image: package-ci/macos-13:v4
         flavor: m1.mac
     dependencies:
-      -  .yamato/_templates.yml#pack_hdrp_template_OSX_2022.3
-      -  .yamato/_editor_priming.yml#editor:priming:2022.3:OSX
+      - path: .yamato/_templates.yml#pack_hdrp_template_OSX_2022.3
+        rerun: always
+      - path: .yamato/_editor_priming.yml#editor:priming:2022.3:OSX
+        rerun: always
     commands:
       -  npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
@@ -119,10 +125,14 @@ publish_hdrp_template_2022.3:
       -  npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
       -  upm-ci template publish --project-path com.unity.template-hd
     dependencies:
-      -  .yamato/_templates.yml#test_hdrp_template_Win_2022.3
-      -  .yamato/_templates.yml#test_hdrp_template_OSX_2022.3
-      -  .yamato/_templates.yml#pack_hdrp_template_Win_2022.3
-      -  .yamato/_templates.yml#pack_hdrp_template_OSX_2022.3
+      - path: .yamato/_templates.yml#test_hdrp_template_Win_2022.3
+        rerun: always
+      - path: .yamato/_templates.yml#test_hdrp_template_OSX_2022.3
+        rerun: always
+      - path: .yamato/_templates.yml#pack_hdrp_template_Win_2022.3
+        rerun: always
+      - path: .yamato/_templates.yml#pack_hdrp_template_OSX_2022.3
+        rerun: always
     artifacts:
         packages:
             paths:
@@ -138,10 +148,14 @@ publish_hdrp_template_2022.3_dry_run:
       -  npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
       -  upm-ci template publish --project-path com.unity.template-hd --dry-run
     dependencies:
-      -  .yamato/_templates.yml#test_hdrp_template_Win_2022.3
-      -  .yamato/_templates.yml#test_hdrp_template_OSX_2022.3
-      -  .yamato/_templates.yml#pack_hdrp_template_Win_2022.3
-      -  .yamato/_templates.yml#pack_hdrp_template_OSX_2022.3
+      - path: .yamato/_templates.yml#test_hdrp_template_Win_2022.3
+        rerun: always
+      - path: .yamato/_templates.yml#test_hdrp_template_OSX_2022.3
+        rerun: always
+      - path: .yamato/_templates.yml#pack_hdrp_template_Win_2022.3
+        rerun: always
+      - path: .yamato/_templates.yml#pack_hdrp_template_OSX_2022.3
+        rerun: always
     artifacts:
         packages:
             paths:
@@ -158,7 +172,8 @@ pre_pack_hdrp_blank_template_Win_2022.3:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  .Editor\Unity.exe -projectPath com.unity.template.hdrp-blank -batchmode -quit -logFile ./Editor.log
     dependencies:
-      -  .yamato/_editor_priming.yml#editor:priming:2022.3:Win
+      - path: .yamato/_editor_priming.yml#editor:priming:2022.3:Win
+        rerun: always
     artifacts:
         primed:
             paths:
@@ -189,8 +204,10 @@ test_hdrp_blank_template_Win_2022.3:
         image: package-ci/win11:v4
         flavor: b1.large
     dependencies:
-      -  .yamato/_templates.yml#pack_hdrp_blank_template_Win_2022.3
-      -  .yamato/_editor_priming.yml#editor:priming:2022.3:Win
+      - path: .yamato/_templates.yml#pack_hdrp_blank_template_Win_2022.3
+        rerun: always
+      - path: .yamato/_editor_priming.yml#editor:priming:2022.3:Win
+        rerun: always
     commands:
       -  npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
       -  choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
@@ -210,7 +227,8 @@ pre_pack_hdrp_blank_template_OSX_2022.3:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template.hdrp-blank -batchmode -quit -logFile ./Editor.log
     dependencies:
-      -  .yamato/_editor_priming.yml#editor:priming:2022.3:OSX
+      - path: .yamato/_editor_priming.yml#editor:priming:2022.3:OSX
+        rerun: always
     artifacts:
         primed:
             paths:
@@ -241,8 +259,10 @@ test_hdrp_blank_template_OSX_2022.3:
         image: package-ci/macos-13:v4
         flavor: m1.mac
     dependencies:
-      -  .yamato/_templates.yml#pack_hdrp_blank_template_OSX_2022.3
-      -  .yamato/_editor_priming.yml#editor:priming:2022.3:OSX
+      - path: .yamato/_templates.yml#pack_hdrp_blank_template_OSX_2022.3
+        rerun: always
+      - path: .yamato/_editor_priming.yml#editor:priming:2022.3:OSX
+        rerun: always
     commands:
       -  npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
@@ -261,10 +281,14 @@ publish_hdrp_blank_template_2022.3:
       -  npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
       -  upm-ci template publish --project-path com.unity.template.hdrp-blank
     dependencies:
-      -  .yamato/_templates.yml#test_hdrp_blank_template_Win_2022.3
-      -  .yamato/_templates.yml#test_hdrp_blank_template_OSX_2022.3
-      -  .yamato/_templates.yml#pack_hdrp_blank_template_Win_2022.3
-      -  .yamato/_templates.yml#pack_hdrp_blank_template_OSX_2022.3
+      - path: .yamato/_templates.yml#test_hdrp_blank_template_Win_2022.3
+        rerun: always
+      - path: .yamato/_templates.yml#test_hdrp_blank_template_OSX_2022.3
+        rerun: always
+      - path: .yamato/_templates.yml#pack_hdrp_blank_template_Win_2022.3
+        rerun: always
+      - path: .yamato/_templates.yml#pack_hdrp_blank_template_OSX_2022.3
+        rerun: always
     artifacts:
         packages:
             paths:
@@ -280,10 +304,14 @@ publish_hdrp_blank_template_2022.3_dry_run:
       -  npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
       -  upm-ci template publish --project-path com.unity.template.hdrp-blank --dry-run
     dependencies:
-      -  .yamato/_templates.yml#test_hdrp_blank_template_Win_2022.3
-      -  .yamato/_templates.yml#test_hdrp_blank_template_OSX_2022.3
-      -  .yamato/_templates.yml#pack_hdrp_blank_template_Win_2022.3
-      -  .yamato/_templates.yml#pack_hdrp_blank_template_OSX_2022.3
+      - path: .yamato/_templates.yml#test_hdrp_blank_template_Win_2022.3
+        rerun: always
+      - path: .yamato/_templates.yml#test_hdrp_blank_template_OSX_2022.3
+        rerun: always
+      - path: .yamato/_templates.yml#pack_hdrp_blank_template_Win_2022.3
+        rerun: always
+      - path: .yamato/_templates.yml#pack_hdrp_blank_template_OSX_2022.3
+        rerun: always
     artifacts:
         packages:
             paths:
@@ -300,7 +328,8 @@ pre_pack_universal_template_Win_2022.3:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  .Editor\Unity.exe -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log
     dependencies:
-      -  .yamato/_editor_priming.yml#editor:priming:2022.3:Win
+      - path: .yamato/_editor_priming.yml#editor:priming:2022.3:Win
+        rerun: always
     artifacts:
         primed:
             paths:
@@ -331,8 +360,10 @@ test_universal_template_Win_2022.3:
         image: package-ci/win11:v4
         flavor: b1.large
     dependencies:
-      -  .yamato/_templates.yml#pack_universal_template_Win_2022.3
-      -  .yamato/_editor_priming.yml#editor:priming:2022.3:Win
+      - path: .yamato/_templates.yml#pack_universal_template_Win_2022.3
+        rerun: always
+      - path: .yamato/_editor_priming.yml#editor:priming:2022.3:Win
+        rerun: always
     commands:
       -  npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
       -  choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
@@ -352,7 +383,8 @@ pre_pack_universal_template_OSX_2022.3:
       -  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 -logFile ./Editor.log
     dependencies:
-      -  .yamato/_editor_priming.yml#editor:priming:2022.3:OSX
+      - path: .yamato/_editor_priming.yml#editor:priming:2022.3:OSX
+        rerun: always
     artifacts:
         primed:
             paths:
@@ -383,8 +415,10 @@ test_universal_template_OSX_2022.3:
         image: package-ci/macos-13:v4
         flavor: m1.mac
     dependencies:
-      -  .yamato/_templates.yml#pack_universal_template_OSX_2022.3
-      -  .yamato/_editor_priming.yml#editor:priming:2022.3:OSX
+      - path: .yamato/_templates.yml#pack_universal_template_OSX_2022.3
+        rerun: always
+      - path: .yamato/_editor_priming.yml#editor:priming:2022.3:OSX
+        rerun: always
     commands:
       -  npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
@@ -403,10 +437,14 @@ publish_universal_template_2022.3:
       -  npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
       -  upm-ci template publish --project-path com.unity.template-universal
     dependencies:
-      -  .yamato/_templates.yml#test_universal_template_Win_2022.3
-      -  .yamato/_templates.yml#test_universal_template_OSX_2022.3
-      -  .yamato/_templates.yml#pack_universal_template_Win_2022.3
-      -  .yamato/_templates.yml#pack_universal_template_OSX_2022.3
+      - path: .yamato/_templates.yml#test_universal_template_Win_2022.3
+        rerun: always
+      - path: .yamato/_templates.yml#test_universal_template_OSX_2022.3
+        rerun: always
+      - path: .yamato/_templates.yml#pack_universal_template_Win_2022.3
+        rerun: always
+      - path: .yamato/_templates.yml#pack_universal_template_OSX_2022.3
+        rerun: always
     artifacts:
         packages:
             paths:
@@ -422,10 +460,14 @@ publish_universal_template_2022.3_dry_run:
       -  npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
       -  upm-ci template publish --project-path com.unity.template-universal --dry-run
     dependencies:
-      -  .yamato/_templates.yml#test_universal_template_Win_2022.3
-      -  .yamato/_templates.yml#test_universal_template_OSX_2022.3
-      -  .yamato/_templates.yml#pack_universal_template_Win_2022.3
-      -  .yamato/_templates.yml#pack_universal_template_OSX_2022.3
+      - path: .yamato/_templates.yml#test_universal_template_Win_2022.3
+        rerun: always
+      - path: .yamato/_templates.yml#test_universal_template_OSX_2022.3
+        rerun: always
+      - path: .yamato/_templates.yml#pack_universal_template_Win_2022.3
+        rerun: always
+      - path: .yamato/_templates.yml#pack_universal_template_OSX_2022.3
+        rerun: always
     artifacts:
         packages:
             paths:
@@ -438,12 +480,18 @@ all_template_ci_2022.3:
         image: package-ci/win10:v4
         flavor: b1.large
     dependencies:
-      -  .yamato/_templates.yml#test_hdrp_template_Win_2022.3
-      -  .yamato/_templates.yml#test_hdrp_blank_template_Win_2022.3
-      -  .yamato/_templates.yml#test_universal_template_Win_2022.3
-      -  .yamato/_templates.yml#test_hdrp_template_OSX_2022.3
-      -  .yamato/_templates.yml#test_hdrp_blank_template_OSX_2022.3
-      -  .yamato/_templates.yml#test_universal_template_OSX_2022.3
+      - path: .yamato/_templates.yml#test_hdrp_template_Win_2022.3
+        rerun: always
+      - path: .yamato/_templates.yml#test_hdrp_blank_template_Win_2022.3
+        rerun: always
+      - path: .yamato/_templates.yml#test_universal_template_Win_2022.3
+        rerun: always
+      - path: .yamato/_templates.yml#test_hdrp_template_OSX_2022.3
+        rerun: always
+      - path: .yamato/_templates.yml#test_hdrp_blank_template_OSX_2022.3
+        rerun: always
+      - path: .yamato/_templates.yml#test_universal_template_OSX_2022.3
+        rerun: always
     commands:
       -  npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
       -  upm-ci package izon -t
diff --git a/.yamato/config/__shared.metafile b/.yamato/config/__shared.metafile
deleted file mode 100644
index 7f7639642d1..00000000000
--- a/.yamato/config/__shared.metafile
+++ /dev/null
@@ -1,452 +0,0 @@
-target_branch: 2022.3/staging # specifies the branch on which recurrent or pr triggers are created, etc
-target_editor: 2022.3 # specifies the target editor used for some package/preview publish jobs
-conditional_jobs: # some jobs are relevent only depending on the branch
-  preview_publish: True
-  formatting: True
-  packages.package_publish_all: True
-  packages.project_publish_all: True
-editors: # applied for all yml files
-  - track: 2022.3
-    name: 2022.3
-    rerun_strategy: on_new_revision
-    ono_branch_var: ONO_BRANCH_TRUNK
-    editor_pinning:
-      enabled: False
-      nr_commits_to_retrieve: 1
-    allow_triggers: True
-    variables:
-      CACHE_ARGS: '{{cache.flags}}'
-build_configs:
-  - name: il2cpp_apiNet2
-    scripting_backend: IL2CPP
-    api_level: NET_2_0
-  - name: il2cpp_apiNet4
-    scripting_backend: IL2CPP
-    api_level: NET_4_6
-  - name: mono_apiNet2
-    scripting_backend: Mono2x
-    api_level: NET_2_0
-  - name: mono_apiNet4
-    scripting_backend: Mono2x
-    api_level: NET_4_6
-  - name: il2cpp
-    scripting_backend: IL2CPP
-    api_level: '' # uses the project default
-  - name: mono
-    scripting_backend: Mono2x
-    api_level: '' # uses the project default
-color_spaces:
-  - Linear
-  - gamma
-test_platforms:
-  - type: Standalone
-    allow_cache: False
-    disable_split_build_run_for: [OSX_Metal, OSX_Apple_Silicon_Metal]
-    utr_flags:
-      - [OSX_Metal, OSX_Apple_Silicon_Metal]: '%CACHE_ARGS%'
-      - [all]: --suite=playmode
-      - [all]: --timeout=1200
-      # - [all]: --reruncount=2
-
-      - [Win_DX11, Win_DX12, Win_Vulkan, Win_]: --platform=StandaloneWindows64
-      - [Linux_Vulkan]: --platform=StandaloneLinux64
-      - [OSX_Metal, OSX_Apple_Silicon_Metal]: --platform=StandaloneOSX
-
-      - [Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_Vulkan]: --player-load-path=players
-
-      - [all]: --artifacts_path=TestProjects/<PROJECT_FOLDER>/test-results
-      - [OSX_Metal, OSX_Apple_Silicon_Metal]: --artifacts_path=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>/test-results
-
-      - [OSX_Metal, OSX_Apple_Silicon_Metal]: --editor-location=.Editor
-
-      - [OSX_Metal, OSX_Apple_Silicon_Metal]: --scripting-backend=<SCRIPTING_BACKEND>
-      - [OSX_Metal, OSX_Apple_Silicon_Metal]: --testfilter=%TEST_FILTER%
-
-      - [OSX_Apple_Silicon_Metal]: --architecture=ARM64
-      - [OSX_Metal, OSX_Apple_Silicon_Metal]: --testproject=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>
-      - [Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_Vulkan]: --player-connection-ip=auto
-
-    utr_flags_build:
-      - [all]: '%CACHE_ARGS%'
-      - [all]: --testfilter=%TEST_FILTER%
-      - [all]: --suite=playmode
-      - [all]: --build-only
-      - [all]: --scripting-backend=<SCRIPTING_BACKEND>
-      - [all]: --extra-editor-arg="-colorspace=<COLORSPACE>"
-
-      - [Win_DX11, Win_DX12, Win_Vulkan, Win_]: --platform=StandaloneWindows64
-      - [Linux_Vulkan]: --platform=StandaloneLinux64
-      - [OSX_Metal]: --platform=StandaloneOSX
-
-      - [all]: --testproject=./TestProjects/<PROJECT_FOLDER>
-
-      - [all]: --editor-location=.Editor
-
-      - [all]: --artifacts_path=TestProjects/<PROJECT_FOLDER>/test-results
-
-      - [Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_Vulkan]: --player-save-path=players
-
-      - [all]: --timeout=1200
-
-      ### The method and values live in /com.unity.testframework.graphics/.../Editor/SetupProject.cs
-      - [Win_DX11]: --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="d3d11" --extra-editor-arg="<COLORSPACE>"
-      - [Win_DX12]: --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="d3d12" --extra-editor-arg="<COLORSPACE>"
-      - [Win_Vulkan, Linux_Vulkan]: --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="<COLORSPACE>"
-
-      - [Win_DX11]: --extra-editor-arg="-playergraphicsapi=Direct3D11"
-      - [Win_DX12]: --extra-editor-arg="-playergraphicsapi=Direct3D12"
-      - [Win_Vulkan, Linux_Vulkan]: --extra-editor-arg="-playergraphicsapi=Vulkan"
-      - [OSX_Metal]: --extra-editor-arg="-playergraphicsapi=Metal"
-
-    commands:
-      - [all]: <shared.platform.commands.setup_utr>
-      - [OSX_Metal, OSX_Apple_Silicon_Metal]: <shared.platform.commands.unity_downloader_cli>
-      - [all]: <shared.platform.commands.call_utr>
-        env_vars:
-          - [OSX_Metal]: YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME'
-          - [OSX_Metal]: YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME'
-          - [OSX_Metal]: YAMATO_JOB_ID='$YAMATO_JOB_ID'
-          - [OSX_Metal]: YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME'
-          - [OSX_Metal]: YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID'
-          - [OSX_Metal]: GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL'
-          - [OSX_Metal]: GIT_BRANCH='$GIT_BRANCH'
-          - [OSX_Metal]: GIT_REVISION='$GIT_REVISION'
-          - [OSX_Metal]: GIT_COMMIT_TIME='$GIT_COMMIT_TIME'
-    commands_build:
-      - [all]: <shared.platform.commands.setup_utr>
-      - [all]: <shared.platform.commands.unity_downloader_cli>
-      - [all]: <shared.platform.commands.call_utr>
-        env_vars:
-          - [OSX_Metal]: YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME'
-          - [OSX_Metal]: YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME'
-          - [OSX_Metal]: YAMATO_JOB_ID='$YAMATO_JOB_ID'
-          - [OSX_Metal]: YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME'
-          - [OSX_Metal]: YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID'
-          - [OSX_Metal]: GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL'
-          - [OSX_Metal]: GIT_BRANCH='$GIT_BRANCH'
-          - [OSX_Metal]: GIT_REVISION='$GIT_REVISION'
-          - [OSX_Metal]: GIT_COMMIT_TIME='$GIT_COMMIT_TIME'
-    after:
-      - [OSX_Metal, OSX_Apple_Silicon_Metal, Linux_Vulkan]: <shared.platform.commands.log_parser>
-    after_build:
-      - [Linux_Vulkan]: <shared.platform.commands.log_parser>
-  - type: playmode
-    allow_cache: False
-    utr_flags:
-      - [all]: '%CACHE_ARGS%'
-      - [all]: --testfilter=%TEST_FILTER%
-      - [all]: --suite=playmode
-      - [all]: --scripting-backend=<SCRIPTING_BACKEND>
-      # - [all]: --reruncount=2
-      - [all]: --extra-editor-arg="-colorspace=<COLORSPACE>"
-
-      - [all]: --testproject=./TestProjects/<PROJECT_FOLDER>
-      - [OSX_Metal, OSX_Apple_Silicon_Metal]: --testproject=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>
-
-      - [all]: --editor-location=.Editor
-      - [OSX_Metal]: --editor-location=/Users/bokken/.Editor
-      - [OSX_Apple_Silicon_Metal]: --editor-location=.Editor
-
-      - [all]: --artifacts_path=TestProjects/<PROJECT_FOLDER>/test-results
-      - [OSX_Metal, OSX_Apple_Silicon_Metal]: --artifacts_path=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>/test-results
-
-      - [Win_DX11]: --extra-editor-arg="-force-d3d11"
-      - [Win_DX12]: --extra-editor-arg="-force-d3d12"
-      - [Win_Vulkan, Linux_Vulkan]: --extra-editor-arg="-force-vulkan"
-      - [OSX_Apple_Silicon_Metal]: --extra-editor-arg="-force-metal"
-
-      - [OSX_Apple_Silicon_Metal]: --architecture=ARM64
-    commands:
-      - [all]: <shared.platform.commands.setup_utr>
-      - [all]: <shared.platform.commands.unity_downloader_cli>
-      - [all]: <shared.platform.commands.call_utr>
-        env_vars:
-          - [OSX_Metal]: YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME'
-          - [OSX_Metal]: YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME'
-          - [OSX_Metal]: YAMATO_JOB_ID='$YAMATO_JOB_ID'
-          - [OSX_Metal]: YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME'
-          - [OSX_Metal]: YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID'
-          - [OSX_Metal]: GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL'
-          - [OSX_Metal]: GIT_BRANCH='$GIT_BRANCH'
-          - [OSX_Metal]: GIT_REVISION='$GIT_REVISION'
-          - [OSX_Metal]: GIT_COMMIT_TIME='$GIT_COMMIT_TIME'
-    after:
-      - [OSX_Metal, OSX_Apple_Silicon_Metal, Linux_Vulkan]: <shared.platform.commands.log_parser>
-
-  - type: editmode
-    allow_cache: False
-    utr_flags:
-      - [all]: '%CACHE_ARGS%'
-      - [all]: --testfilter=%TEST_FILTER%
-      - [all]: --suite=editor
-      # - [all]: --reruncount=2
-      - [all]: --scripting-backend=<SCRIPTING_BACKEND>
-      - [all]: --platform=editmode
-      - [all]: --extra-editor-arg="-colorspace=<COLORSPACE>"
-
-      - [all]: --testproject=./TestProjects/<PROJECT_FOLDER>
-      - [OSX_Metal, OSX_Apple_Silicon_Metal]: --testproject=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>
-
-      - [all]: --editor-location=.Editor
-      - [OSX_Metal]: --editor-location=/Users/bokken/.Editor
-      - [OSX_Apple_Silicon_Metal]: --editor-location=.Editor
-
-      - [all]: --artifacts_path=TestProjects/<PROJECT_FOLDER>/test-results
-      - [OSX_Metal, OSX_Apple_Silicon_Metal]: --artifacts_path=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>/test-results
-
-      - [Win_DX11]: --extra-editor-arg="-force-d3d11"
-      - [Win_DX12]: --extra-editor-arg="-force-d3d12"
-      - [Win_Vulkan, Linux_Vulkan]: --extra-editor-arg="-force-vulkan"
-      - [OSX_Metal, OSX_Apple_Silicon_Metal]: --extra-editor-arg="-force-metal"
-
-      - [Win_DX11]: --extra-editor-arg="-playergraphicsapi=Direct3D11"
-      - [Win_DX12]: --extra-editor-arg="-playergraphicsapi=Direct3D12"
-      - [Win_Vulkan, Linux_Vulkan]: --extra-editor-arg="-playergraphicsapi=Vulkan"
-      - [OSX_Metal, OSX_Apple_Silicon_Metal]: --extra-editor-arg="-playergraphicsapi=Metal"
-    commands:
-      - [all]: <shared.platform.commands.setup_utr>
-      - [all]: <shared.platform.commands.unity_downloader_cli>
-      - [all]: <shared.platform.commands.call_utr>
-        env_vars:
-          - [OSX_Metal]: YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME'
-          - [OSX_Metal]: YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME'
-          - [OSX_Metal]: YAMATO_JOB_ID='$YAMATO_JOB_ID'
-          - [OSX_Metal]: YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME'
-          - [OSX_Metal]: YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID'
-          - [OSX_Metal]: GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL'
-          - [OSX_Metal]: GIT_BRANCH='$GIT_BRANCH'
-          - [OSX_Metal]: GIT_REVISION='$GIT_REVISION'
-          - [OSX_Metal]: GIT_COMMIT_TIME='$GIT_COMMIT_TIME'
-    after:
-      - [OSX_Metal, OSX_Apple_Silicon_Metal, Linux_Vulkan]: <shared.platform.commands.log_parser>
-
-platforms:
-  Win:
-    name: Win
-    os: windows
-    components:
-      - editor
-      - il2cpp
-    agents_project:
-      default:
-        type: Unity::VM::GPU
-        image: automation-tooling/win10-21H1:v2.2309361
-        flavor: b1.large
-      standalone_build:
-        type: Unity::VM
-        image: automation-tooling/win10-21H1:v2.2309361
-        flavor: b1.xlarge
-      editmode:
-        type: Unity::VM
-        image: automation-tooling/win10-21H1:v2.2309361
-        flavor: b1.large
-    agent_package:
-      type: Unity::VM
-      image: package-ci/win11:v4
-      flavor: b1.large
-    copycmd: copy upm-ci~\packages\*.tgz .Editor\Data\Resources\PackageManager\Editor
-    editorpath: .\.Editor
-    commands:
-      [DX11, DX12, Vulkan, '']:
-        setup_utr:
-          - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
-            retries: 2
-        call_utr:
-          - command: |5-
-                    git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp
-                    set /p GIT_REVISIONDATE=<revdate.tmp
-                    echo %GIT_REVISIONDATE%
-                    del revdate.tmp
-                    utr <UTR_FLAGS>
-        call_utr_without_git:
-          - command: utr <UTR_FLAGS>
-        call_utr_and_exit_0:
-          - command: |5-
-                    git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp
-                    set /p GIT_REVISIONDATE=<revdate.tmp
-                    echo %GIT_REVISIONDATE%
-                    del revdate.tmp
-                    utr <UTR_FLAGS> & exit 0
-        unity_downloader_cli:
-          - command: gsudo choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
-            retries: 2
-          - command: unity-downloader-cli <EDITOR_REVISION_CMD> -c editor -c il2cpp  --wait --published-only
-            retries: 2
-        log_parser:
-          - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0
-          - command: find_instabilities || exit 0
-
-  OSX:
-    name: OSX
-    os: macos
-    components:
-      - editor
-      - il2cpp
-    agents_project_Metal:
-      default:
-        type: Unity::metal::macmini
-        image: automation-tooling/macos-11:v2.1987114
-        flavor: m1.mac
-    agent_package:
-      type: Unity::VM::osx
-      image: package-ci/macos-13:v4
-      flavor: m1.mac
-    copycmd: cp ./upm-ci~/packages/*.tgz ./.Editor/Unity.app/Contents/Resources/PackageManager/Editor
-    editorpath: "$(pwd)/.Editor/Unity.app/Contents/MacOS/Unity"
-    commands:
-      [Metal]:
-        setup_remote_ssh_keys_for_github_cds:
-          - command: sed -i '' 's/172\.28\.218\.\*/172\.28\.224\.\*/g' ~/.ssh/config
-          - command: ssh bokken@$BOKKEN_DEVICE_IP "chmod 600 ~/.ssh/*"
-          - command: |
-                     ssh bokken@$BOKKEN_DEVICE_IP "echo \"
-                     host github.cds.internal.unity3d.com
-                       HostName github.cds.internal.unity3d.com
-                       IdentityFile /Users/bokken/.ssh/id_rsa_cds_github
-                       StrictHostKeyChecking no
-                       User git\" >> ~/.ssh/config"
-          - command: echo $GITHUB_CDS_SSH_PRIVKEY | base64 -D -i - -o id_rsa_cds_github
-          - command: scp id_rsa_cds_github bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_cds_github && rm id_rsa_cds_github
-          - command: ssh bokken@$BOKKEN_DEVICE_IP "chmod 400 ~/.ssh/*"
-        setup_utr:
-          - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
-            retries: 2
-          - chmod +x utr
-          - command: rsync -aq -e 'ssh -i ~/.ssh/id_rsa_macmini' --append --timeout=30 $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/
-            retries: 2
-          - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
-            retries: 2
-        call_utr:
-          - command: |5-
-                    export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI`
-                    ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; <env_vars> ~/Graphics/utr  <UTR_FLAGS> "
-                    UTR_RESULT=$?
-                    scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>/test-results/ TestProjects/<PROJECT_FOLDER>
-                    exit $UTR_RESULT
-        call_utr_without_git:
-          - command: |5-
-                    ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; <env_vars> ~/Graphics/utr  <UTR_FLAGS> "
-                    UTR_RESULT=$?
-                    scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>/test-results/ TestProjects/<PROJECT_FOLDER>
-                    exit $UTR_RESULT
-        unity_downloader_cli:
-          - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'"
-            retries: 2
-          - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli <EDITOR_REVISION_CMD> -c editor -c il2cpp  --wait --published-only'
-            retries: 2
-          - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP ".Editor/Unity.app/Contents/MacOS/Unity -version"
-        log_parser:
-          - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0
-          - command: find_instabilities || exit 0
-
-  OSX_Apple_Silicon:
-    name: OSX_Apple_Silicon
-    os: macos
-    components:
-      - editor
-      - il2cpp
-    agents_project_Metal:
-      default:
-        type: Unity::metal::macmini
-        image: automation-tooling/macos-11:v2.1987114
-        model: M1
-        flavor: m1.mac
-    agent_package:
-      type: Unity::VM::osx
-      image: macos-13-arm64:v4
-      flavor: m1.mac
-    commands:
-      [Metal]:
-        setup_utr:
-          - curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
-          - chmod +x ./utr
-          - rsync -az $YAMATO_SOURCE_DIR/ bokken@$BOKKEN_DEVICE_IP:~/Graphics
-          - scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
-        call_utr:
-          - |5-
-                     ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; cd ~/Graphics; ./utr <UTR_FLAGS>"
-                     UTR_RESULT=$?
-                     scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>/test-results/ TestProjects/<PROJECT_FOLDER>
-                     exit $UTR_RESULT
-        call_utr_without_git:
-          - ./utr <UTR_FLAGS>
-        unity_downloader_cli:
-          - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git
-          - brew install unity-downloader-cli
-          - unity-downloader-cli <EDITOR_REVISION_CMD> -c editor -c il2cpp  --wait --published-only
-          - rsync -az .Editor/ bokken@$BOKKEN_DEVICE_IP:~/Graphics/.Editor
-        log_parser:
-          - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0
-          - command: find_instabilities || exit 0
-
-  Linux:
-    name: Linux
-    os: linux
-    components:
-      - editor
-      - il2cpp
-    agents_project:
-      default:
-        type: Unity::VM::GPU
-        image: desktop/ubuntu-20.04-desktop:v2.1348791
-        flavor: b1.large
-      editmode:
-        type: Unity::VM
-        image: desktop/ubuntu-20.04-desktop:v2.1348791
-        flavor: b1.large
-      standalone_build:
-        type: Unity::VM
-        image: desktop/ubuntu-20.04-desktop:v2.1348791
-        flavor: b1.xlarge
-    commands:
-      [Vulkan]:
-        setup_utr:
-          - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
-            retries: 2
-          - command: chmod +x utr
-        set_screen_resolution:
-          - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/Linux/2560x1440.bin --output 2560x1440.bin
-            retries: 2
-          - command: sudo rm /etc/edid.txt
-          - command: sudo mv 2560x1440.bin /etc/edid.txt
-          - command: sudo pkill Xorg && sudo systemctl restart gdm3
-        call_utr:
-          - command: |5-
-                    export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI`
-                    DISPLAY=:0.0 ./utr <UTR_FLAGS>
-        call_utr_without_git:
-          - command: DISPLAY=:0.0 ./utr <UTR_FLAGS>
-        unity_downloader_cli:
-          - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}*
-          - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -
-          - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list"
-          - command: sudo apt update
-          - command: sudo apt install unity-downloader-cli
-            retries: 2
-          - command: sudo unity-downloader-cli <EDITOR_REVISION_CMD> -c editor -c il2cpp  --wait --published-only
-            retries: 2
-        log_parser:
-          - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0
-          - command: find_instabilities || exit 0
-
-non_project_agents:
-  package_ci_ubuntu_large:
-    type: Unity::VM
-    image: package-ci/ubuntu-22.04:v4
-    flavor: b1.large
-  package_ci_ubuntu_xlarge:
-    type: Unity::VM
-    image: package-ci/ubuntu-22.04:v4
-    flavor: b1.xlarge
-  package_ci_ubuntu_small:
-    type: Unity::VM
-    image: package-ci/ubuntu-22.04:v4
-    flavor: b1.small
-  package_ci_win_large:
-    type: Unity::VM
-    image: package-ci/win10:v4
-    flavor: b1.large
-  package_ci_mac:
-    type: Unity::VM::osx
-    image: package-ci/macos-13:v4
-    flavor: m1.mac
diff --git a/.yamato/config/_editor.metafile b/.yamato/config/_editor.metafile
deleted file mode 100644
index b57211ed049..00000000000
--- a/.yamato/config/_editor.metafile
+++ /dev/null
@@ -1,21 +0,0 @@
-editor_priming_agent: package_ci_ubuntu_small
-editor_pin_agent: package_ci_ubuntu_small
-
-editor_priming_config:
-  use_predefined_variables: True
-  variables:
-    CUSTOM_REVISION: "2022.3"
-  agent:
-    type: Unity::VM
-    image: package-ci/ubuntu-22.04:v4
-    flavor: b1.small
-  skip_checkout: true
-  commands:
-    - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}*
-    - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -
-    - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list"
-    - sudo apt update
-    - sudo apt install unity-downloader-cli
-    - unity-downloader-cli -u $CUSTOM_REVISION -o <PLATFORM_OS> --wait --skip-download <COMPONENTS> > unity_revision.txt
-  add_artifacts:
-    - artifacts.revisions.paths: "unity_revision.txt"
diff --git a/.yamato/config/_templates.metafile b/.yamato/config/_templates.metafile
deleted file mode 100644
index 266cb5e6cab..00000000000
--- a/.yamato/config/_templates.metafile
+++ /dev/null
@@ -1,32 +0,0 @@
-templates:
-  - name: HDRP Template
-    id: hdrp_template
-    packagename: com.unity.template-hd
-    dependencies:
-      - core
-      - shadergraph
-      - vfx
-      - config
-      - hdrp
-    include_prepack_step: False
-  - name: HDRP Blank Template
-    id: hdrp_blank_template
-    packagename: com.unity.template.hdrp-blank
-    dependencies:
-      - hdrp
-    include_prepack_step: False
-  - name: Universal Template
-    id: universal_template
-    packagename: com.unity.template-universal
-    dependencies:
-      - core
-      - shadergraph
-      - universal
-    include_prepack_step: False
-platforms:
-  - name: Win
-  - name: OSX
-agent_pack: package_ci_win_large
-agent_test:  package_ci_win_large
-agent_publish:  package_ci_win_large
-agent_all_ci: package_ci_win_large
diff --git a/.yamato/config/abv.metafile b/.yamato/config/abv.metafile
deleted file mode 100644
index 6b69099f777..00000000000
--- a/.yamato/config/abv.metafile
+++ /dev/null
@@ -1,12 +0,0 @@
-project:
-  name: ABV
-
-jobs:
-  - name: Pack & Test all templates
-    job_id: graphics_repo_nightly
-    dependencies:
-      - .yamato/_templates.yml#all_template_ci_<TRACK>
-    triggers:
-        recurring:
-          - branch: 2022.3/staging
-            frequency: 23 ? * 7 # At 11pm every Saturday
diff --git a/.yamato/script/editor_scripts/get_minimum_editor_version.py b/.yamato/script/editor_scripts/get_minimum_editor_version.py
deleted file mode 100644
index 8a5dfbf832c..00000000000
--- a/.yamato/script/editor_scripts/get_minimum_editor_version.py
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/python
-
-# From a set of packages (root of the repository), retrieve all package.json files.
-# Collect all unityRelease fields and verify that all package ship with the same one (ie the minimum compatible editor version)
-# Store the version in unity_revision.txt
-
-import sys, glob, os, subprocess, json, urllib.request, logging
-
-SUPPORTED_PACKAGES=[
-    "com.unity.shadergraph", 
-    "com.unity.render-pipelines.core",
-    "com.unity.render-pipelines.high-definition",
-    "com.unity.render-pipelines.high-definition-config",
-    "com.unity.render-pipelines.universal",
-    "com.unity.visualeffectgraph"
-]
-
-def retrieve_unity_release(working_dir):
-    unity_release = ""
-    for directory in SUPPORTED_PACKAGES:
-        package_file_path = os.path.join(working_dir, directory, "package.json")
-        with open(package_file_path) as package_file:
-            package_data = json.load(package_file)
-            tmp_unity_release = package_data["unity"] + "." + package_data["unityRelease"]
-            if unity_release != "" and unity_release != tmp_unity_release:
-                logging.error('%s is requiring %s as the minimum version while other packages are using %s.', directory, tmp_unity_release, unity_release)
-                raise Exception('[ERROR] Not all packages are requiring the same minimum unity version (package.json > unityRelease).')
-            else:
-                unity_release = tmp_unity_release
-    return unity_release
-
-
-def store_version(tmp_revision_file_path, unity_release):
-    tmp_revision_file = open(tmp_revision_file_path, "w")
-    tmp_revision_file.write(unity_release)
-    tmp_revision_file.close()
-
-
-def main(tmp_revision_file_path):
-    
-    logging.info('RUNNING: git rev-parse --show-toplevel')
-    working_dir = subprocess.check_output(["git", "rev-parse", "--show-toplevel"])
-    working_dir = working_dir.decode('utf-8').rstrip()
-    
-    logging.info('Working directory: %s', working_dir)
-    unity_release = retrieve_unity_release(working_dir)
-
-    logging.info('Unity release used by all the packages: %s', unity_release)
-    store_version(os.path.join(working_dir, tmp_revision_file_path), unity_release)
-
-
-if __name__ == "__main__":
-    logging.basicConfig(level=logging.INFO, format='[%(levelname)s] %(message)s')
-
-    if len(sys.argv) < 2:
-        logging.error('Usage: python3 %s [tmp_unity_revision_file_path]', sys.argv[0])
-        exit(1)
-    sys.exit(main(sys.argv[1]))
\ No newline at end of file
diff --git a/.yamato/script/editor_scripts/util/subprocess_helpers.py b/.yamato/script/editor_scripts/util/subprocess_helpers.py
deleted file mode 100644
index 14ebe7ef519..00000000000
--- a/.yamato/script/editor_scripts/util/subprocess_helpers.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# Taken from https://github.com/Unity-Technologies/dots/blob/master/Tools/CI/util/subprocess_helpers.py
-
-"""
-Helper functions around subprocess
-"""
-import logging
-import subprocess
-
-
-def run_cmd(cmd, cwd=None):
-    """Runs a command and returns its output as an UTF-8 string.
-    NOTICE: The output normally ends with a newline that might need to be stripped.
-    NOTICE: This does not return any stderr if the command succeeds, only on
-        non-zero exit code when the error is raised.
-    Args:
-        cmd: Command line as a string or a list (if any item contains spaces).
-        cwd: Working directory to run the command in. If omitted the
-            interpreter's working dir will be used.
-    Raises: subprocess.CalledProcessError similar to subprocess.check_output.
-    """
-    if isinstance(cmd, str):
-        cmd = cmd.split()
-    assert isinstance(cmd, list), 'cmd must be of list type, but was "{}"'.format(type(cmd))
-    logging.info("  Running: {0} (cwd: {1})".format(' '.join(cmd), cwd))
-    return subprocess.check_output(cmd, cwd=cwd, universal_newlines=True)
-
-
-def npm_cmd(cmd, registry=None, cwd=None):
-    """Runs a npm command and returns its output as an UTF-8 string.
-    NOTICE: The command shall not include 'npm', since it will be added.
-    NOTICE: The output normally ends with a newline that might need to be stripped.
-    Args:
-        cmd: Command line as a string or a list (if any item contains spaces).
-        registry: NPM registry to use, if specified (otherwise default will be used).
-        cwd: Working directory to run the command in. If omitted the
-            interpreter's working dir will be used.
-    Raises: subprocess.CalledProcessError similar to subprocess.check_output.
-    """
-    if isinstance(cmd, str):
-        cmd = cmd.split()
-    assert isinstance(cmd, list), 'cmd must be of list type, but was "{}"'.format(type(cmd))
-    assert cmd[0] != 'npm', 'Please omit "npm" from the command: {0}'.format(' '.join(cmd))
-    commands = ['npm'] + cmd[:]  # Use a new list to avoid modifying passed object.
-    if registry:
-        commands.append(['--registry', registry])
-    logging.info("  Running: {0} (cwd: {1})".format(' '.join(commands), cwd))
-    return subprocess.check_output(commands, cwd=cwd, universal_newlines=True,
-                                   stderr=subprocess.STDOUT)
-
-
-def git_cmd(cmd, cwd=None):
-    """Runs a git command and returns its output as an UTF-8 string.
-    NOTICE: The command shall not include 'git', since it will be added.
-    NOTICE: The output normally ends with a newline that might need to be stripped.
-    Args:
-        cmd: Command line as a string or a list (if any item contains spaces).
-        cwd: Working directory to run the command in. If omitted the
-            interpreter's working dir will be used.
-    Raises: subprocess.CalledProcessError similar to subprocess.check_output.
-    """
-    if isinstance(cmd, str):
-        cmd = cmd.split()
-    assert isinstance(cmd, list), 'cmd must be of list type, but was "{}"'.format(type(cmd))
-    assert cmd[0] != 'git', 'Please omit "git" from the command: {0}'.format(' '.join(cmd))
-    commands = ['git'] + cmd[:]  # Use a new list to avoid modifying passed object.
-    logging.info("  Running: {0} (cwd: {1})".format(' '.join(commands), cwd))
-    return subprocess.check_output(commands, cwd=cwd, universal_newlines=True,
-                                   stderr=subprocess.STDOUT)
\ No newline at end of file
diff --git a/.yamato/script/editor_scripts/util/utils.py b/.yamato/script/editor_scripts/util/utils.py
deleted file mode 100644
index c31aa3367c6..00000000000
--- a/.yamato/script/editor_scripts/util/utils.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import ruamel.yaml
-from collections import OrderedDict
-yaml = ruamel.yaml.YAML()
-
-def load_yml(filepath):
-    '''Returns either yml content of a file, or an empty dict {} if file is empty'''
-    with open(filepath) as f:
-        yml_body = yaml.load(f)
-        return yml_body if yml_body else {}
-
-def ordereddict_to_dict(d):
-    '''Handles dumping nested dictionaries'''
-    return {k: ordereddict_to_dict(v) for k, v in d.items()} if isinstance(d, OrderedDict) else d
diff --git a/.yamato/script/figures/test_architecture.jpg b/.yamato/script/figures/test_architecture.jpg
deleted file mode 100644
index 40a2b8524a5..00000000000
--- a/.yamato/script/figures/test_architecture.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:83e02fabe049f0b9006bee3a6c7c685ecdc08bb31fe85578ee907a7670096a4e
-size 334410
diff --git a/.yamato/script/readme.md b/.yamato/script/readme.md
deleted file mode 100644
index ea6d8b121a8..00000000000
--- a/.yamato/script/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-### Yaml-generation
-
-All .ymls in this repository starting with `# This file is generated by ...` are generated by the yaml-generation package. 
-To set up yaml-generation locally, follow the steps in https://github.cds.internal.unity3d.com/unity/ant-yaml-generation.
-
-
-All other .ymls (without the above-mentioned header) are added manually, support liquid syntax, and don't require the script above.
-
-### Test architecture
-The current architecture corresponds to the structure below: 
-![alt text](figures/test_architecture.jpg)