diff --git a/.yamato/Globals.metafile b/.yamato/Globals.metafile
new file mode 100644
index 00000000000000..3918a2789a5fbb
--- /dev/null
+++ b/.yamato/Globals.metafile
@@ -0,0 +1,3 @@
+globals:
+  artifact_base_name: dotnet-unity
+  stevedore_publish_location: testing
diff --git a/.yamato/build_and_test_osx_x64.yml b/.yamato/build_and_test_osx_x64.yml
deleted file mode 100644
index a7e3ffc576fe42..00000000000000
--- a/.yamato/build_and_test_osx_x64.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: Build and Test OSX x64
-
-agent:
-  type: Unity::VM::osx
-  image: platform-foundation/mac-bokken:latest
-  flavor: m1.mac
-
-commands:
-  - mkdir artifacts
-  - curl https://public-stevedore.unity3d.com/r/public/7za-mac-x64/e6c75fb7ffda_5bd76652986a0e3756d1cfd7e84ce056a9e1dbfc5f70f0514a001f724c0fbad2.zip --output artifacts/7za-mac-x64.zip
-  - unzip artifacts/7za-mac-x64.zip -d artifacts/7za-mac-x64
-  - |
-    cd unity/unitygc
-    mkdir release
-    cd release
-    cmake -DCMAKE_BUILD_TYPE=Release ..
-    cmake --build .
-  - LD_LIBRARY_PATH=/usr/local/opt/openssl/lib ./build.sh -subset clr+libs -a x64 -c release -ci -ninja
-  - cp unity/unitygc/release/libunitygc.dylib artifacts/bin/microsoft.netcore.app.runtime.osx-x64/Release/runtimes/osx-x64/native
-  - artifacts/7za-mac-x64/7za a artifacts/unity/dotnet-runtime-unity-osx-x64.7z ./artifacts/bin/microsoft.netcore.app.runtime.osx-x64/Release/runtimes/osx-x64
-# build/run tests
-  - LD_LIBRARY_PATH=/usr/local/opt/openssl/lib ./build.sh -subset libs.tests -test -a x64 -c release -ci -ninja
-  - ./src/tests/build.sh x64 release ci
-  - ./src/tests/run.sh x64 release
-  - ./build.sh clr.paltests
-  - ./artifacts/bin/coreclr/OSX.x64.Debug/paltests/runpaltests.sh $(pwd)/artifacts/bin/coreclr/OSX.x64.Debug/paltests
-
-triggers:
-  pull_requests:
-    - targets:
-        only:
-          - "unity-main"
-
-artifacts: 
-  osx64:
-    paths:
-      - artifacts/unity/dotnet-runtime-unity-osx-x64.7z
diff --git a/.yamato/build_and_test_linux_x64.yml b/.yamato/build_linux_x64.yml
similarity index 51%
rename from .yamato/build_and_test_linux_x64.yml
rename to .yamato/build_linux_x64.yml
index c04811c9bd93dc..493fd0086fe2a0 100644
--- a/.yamato/build_and_test_linux_x64.yml
+++ b/.yamato/build_linux_x64.yml
@@ -1,10 +1,15 @@
-name: Build and Test Linux x64
+{% metadata_file .yamato/Globals.metafile %}
+---
+name: Build Linux x64
 
 agent:
   type: Unity::VM
   image: platform-foundation/linux-ubuntu-18.04-mono-bokken:0.1.7-978398
   flavor: b1.large
 
+variables:
+  ARTIFACT_FILENAME: {{globals.artifact_base_name}}-linux-x64.7z
+
 commands:
   - mkdir artifacts
   - curl https://public-stevedore.unity3d.com/r/public/7za-linux-x64/e6c75fb7ffda_e6a295cdcae3f74d315361883cf53f75141be2e739c020035f414a449d4876af.zip --output artifacts/7za-linux-x64.zip
@@ -17,22 +22,12 @@ commands:
     cmake --build .
   - ./build.sh -subset clr+libs+libs -a x64 -c release -ci -ninja
   - cp unity/unitygc/release/libunitygc.so artifacts/bin/microsoft.netcore.app.runtime.linux-x64/Release/runtimes/linux-x64/native
-  - artifacts/7za-linux-x64/7za a artifacts/unity/dotnet-runtime-unity-linux-x64.7z ./artifacts/bin/microsoft.netcore.app.runtime.linux-x64/Release/runtimes/linux-x64
-# build/run tests
-  - ./build.sh -subset libs.tests -test -a x64 -c release -ci -ninja
-  - command: ./src/tests/build.sh x64 release ci
-    retries: 1
-  - ./src/tests/run.sh x64 release
-  - ./build.sh clr.paltests
-  - ./artifacts/bin/coreclr/$(uname).x64.Debug/paltests/runpaltests.sh $(pwd)/artifacts/bin/coreclr/$(uname).x64.Debug/paltests
-
-triggers:
-  pull_requests:
-    - targets:
-        only:
-          - "unity-main"
+  - artifacts/7za-linux-x64/7za a artifacts/unity/$ARTIFACT_FILENAME ./artifacts/bin/microsoft.netcore.app.runtime.linux-x64/Release/runtimes/linux-x64
 
-artifacts: 
-  linux64:
+artifacts:
+  linux-x64-7z:
+    paths:
+      - artifacts/unity/**
+  linux-x64:
     paths:
-      - artifacts/unity/dotnet-runtime-unity-linux-x64.7z
+      - artifacts/bin/**
diff --git a/.yamato/build_osx_x64.yml b/.yamato/build_osx_x64.yml
new file mode 100644
index 00000000000000..d01b77d305e3e6
--- /dev/null
+++ b/.yamato/build_osx_x64.yml
@@ -0,0 +1,33 @@
+{% metadata_file .yamato/Globals.metafile %}
+---
+name: Build OSX x64
+
+agent:
+  type: Unity::VM::osx
+  image: platform-foundation/mac-bokken:v0.1.8-972754
+  flavor: m1.mac
+
+variables:
+  ARTIFACT_FILENAME: {{globals.artifact_base_name}}-osx-x64.7z
+
+commands:
+  - mkdir artifacts
+  - curl https://public-stevedore.unity3d.com/r/public/7za-mac-x64/e6c75fb7ffda_5bd76652986a0e3756d1cfd7e84ce056a9e1dbfc5f70f0514a001f724c0fbad2.zip --output artifacts/7za-mac-x64.zip
+  - unzip artifacts/7za-mac-x64.zip -d artifacts/7za-mac-x64
+  - |
+    cd unity/unitygc
+    mkdir release
+    cd release
+    cmake -DCMAKE_BUILD_TYPE=Release ..
+    cmake --build .
+  - LD_LIBRARY_PATH=/usr/local/opt/openssl/lib ./build.sh -subset clr+libs -a x64 -c release -ci -ninja
+  - cp unity/unitygc/release/libunitygc.dylib artifacts/bin/microsoft.netcore.app.runtime.osx-x64/Release/runtimes/osx-x64/native
+  - artifacts/7za-mac-x64/7za a artifacts/unity/$ARTIFACT_FILENAME ./artifacts/bin/microsoft.netcore.app.runtime.osx-x64/Release/runtimes/osx-x64
+
+artifacts:
+  osx-x64-7z:
+    paths:
+      - artifacts/unity/**
+  osx-x64:
+    paths:
+      - artifacts/bin/**
diff --git a/.yamato/build_windows.yml b/.yamato/build_windows.yml
index e8bd46bcc241c8..7d3470bbbc427f 100644
--- a/.yamato/build_windows.yml
+++ b/.yamato/build_windows.yml
@@ -1,10 +1,15 @@
-name: Build and Test Windows x86
+{% metadata_file .yamato/Globals.metafile %}
+---
+name: Build Windows x86
 
 agent:
   type: Unity::VM
-  image: platform-foundation/windows-vs2019-il2cpp-bokken:latest
+  image: platform-foundation/windows-vs2019-il2cpp-bokken:v1.1.6-1025111
   flavor: b1.xlarge
 
+variables:
+  ARTIFACT_FILENAME: {{globals.artifact_base_name}}-win-x86.7z
+
 commands:
   - |
     cd unity\unitygc
@@ -13,19 +18,12 @@ commands:
   - build.cmd -subset clr+libs -a x86 -c release -ci
   - copy unity\unitygc\Release\unitygc.dll artifacts\bin\microsoft.netcore.app.runtime.win-x86\Release\runtimes\win-x86\native 
   - powershell .yamato\scripts\download_7z.ps1
-  - artifacts\7za-win-x64\7za.exe a artifacts\unity\dotnet-runtime-unity-win-x86.7z .\artifacts\bin\microsoft.netcore.app.runtime.win-x86\Release\runtimes\win-x86
-# build/run tests
-  - build.cmd libs.tests -test -a x86 -c release -ci
-  - src\tests\build.cmd x86 release ci
-  - src\tests\run.cmd x86 release
-
-triggers:
-  pull_requests:
-    - targets:
-        only:
-          - "unity-main"
+  - artifacts\7za-win-x64\7za.exe a artifacts\unity\%ARTIFACT_FILENAME% .\artifacts\bin\microsoft.netcore.app.runtime.win-x86\Release\runtimes\win-x86
 
-artifacts: 
-  win64:
+artifacts:
+  win-x86-7z:
+    paths:
+      - artifacts\unity\**
+  win-x86:
     paths:
-      - artifacts\unity\dotnet-runtime-unity-win-x86.7z
+      - artifacts\bin\**
diff --git a/.yamato/build_windows_x64.yml b/.yamato/build_windows_x64.yml
index 246e58a1bdd81e..21f8363220f456 100644
--- a/.yamato/build_windows_x64.yml
+++ b/.yamato/build_windows_x64.yml
@@ -1,10 +1,15 @@
-name: Build and Test Windows x64
+{% metadata_file .yamato/Globals.metafile %}
+---
+name: Build Windows x64
 
 agent:
   type: Unity::VM
-  image: platform-foundation/windows-vs2019-il2cpp-bokken:latest
+  image: platform-foundation/windows-vs2019-il2cpp-bokken:v1.1.6-1025111
   flavor: b1.xlarge
 
+variables:
+  ARTIFACT_FILENAME: {{globals.artifact_base_name}}-win-x64.7z
+
 commands:
   - |
     cd unity\unitygc
@@ -13,19 +18,12 @@ commands:
   - build.cmd -subset clr+libs -a x64 -c release -ci
   - copy unity\unitygc\Release\unitygc.dll artifacts\bin\microsoft.netcore.app.runtime.win-x64\Release\runtimes\win-x64\native 
   - powershell .yamato\scripts\download_7z.ps1
-  - artifacts\7za-win-x64\7za.exe a artifacts\unity\dotnet-runtime-unity-win-x64.7z .\artifacts\bin\microsoft.netcore.app.runtime.win-x64\Release\runtimes\win-x64
-# build/run tests
-  - build.cmd libs.tests -test -a x64 -c release -ci
-  - src\tests\build.cmd x64 release ci
-  - src\tests\run.cmd x64 release
-
-triggers:
-  pull_requests:
-    - targets:
-        only:
-          - "unity-main"
+  - artifacts\7za-win-x64\7za.exe a artifacts\unity\%ARTIFACT_FILENAME% .\artifacts\bin\microsoft.netcore.app.runtime.win-x64\Release\runtimes\win-x64
 
-artifacts: 
-  win64:
+artifacts:
+  win-x64-7z:
+    paths:
+      - artifacts\unity\**
+  win-x64:
     paths:
-      - artifacts\unity\dotnet-runtime-unity-win-x64.7z
+      - artifacts\bin\**
diff --git a/.yamato/publish_to_stevedore.yml b/.yamato/publish_to_stevedore.yml
new file mode 100644
index 00000000000000..abcc0b53f9cea1
--- /dev/null
+++ b/.yamato/publish_to_stevedore.yml
@@ -0,0 +1,7 @@
+all:
+  name: Publish To Stevedore
+  dependencies:
+    - .yamato/publish_to_stevedore_windows.yml
+    - .yamato/publish_to_stevedore_windows_x64.yml
+    - .yamato/publish_to_stevedore_osx_x64.yml
+    - .yamato/publish_to_stevedore_linux_x64.yml
diff --git a/.yamato/publish_to_stevedore_linux_x64.yml b/.yamato/publish_to_stevedore_linux_x64.yml
new file mode 100644
index 00000000000000..bd5a55fab1a175
--- /dev/null
+++ b/.yamato/publish_to_stevedore_linux_x64.yml
@@ -0,0 +1,20 @@
+{% metadata_file .yamato/Globals.metafile %}
+---
+name: Publish To Stevedore Linux x64
+
+agent:
+  type: Unity::VM
+  image: platform-foundation/linux-ubuntu-18.04-mono-bokken:latest
+  flavor: b1.large
+
+dependencies:
+  - path: .yamato/build_linux_x64.yml
+
+variables:
+  STEVEDORE_REPO: {{globals.stevedore_publish_location}}
+
+commands:
+# upload to stevedore
+  - curl -sSo StevedoreUpload "$STEVEDORE_UPLOAD_TOOL_LINUX_X64_URL"
+  - chmod +x StevedoreUpload
+  - ./StevedoreUpload --version-len=12 --repo=$STEVEDORE_REPO --version="$GIT_REVISION" artifacts/unity/*
diff --git a/.yamato/publish_to_stevedore_osx_x64.yml b/.yamato/publish_to_stevedore_osx_x64.yml
new file mode 100644
index 00000000000000..328a0673536c10
--- /dev/null
+++ b/.yamato/publish_to_stevedore_osx_x64.yml
@@ -0,0 +1,20 @@
+{% metadata_file .yamato/Globals.metafile %}
+---
+name: Publish To Stevedore OSX x64
+
+agent:
+  type: Unity::VM::osx
+  image: platform-foundation/mac-bokken:latest
+  flavor: m1.mac
+
+dependencies:
+  - path: .yamato/build_osx_x64.yml
+
+variables:
+  STEVEDORE_REPO: {{globals.stevedore_publish_location}}
+
+commands:
+# upload to stevedore
+  - curl -sSo StevedoreUpload "$STEVEDORE_UPLOAD_TOOL_MAC_X64_URL"
+  - chmod +x StevedoreUpload
+  - ./StevedoreUpload --version-len=12 --repo=$STEVEDORE_REPO --version="$GIT_REVISION" artifacts/unity/*
diff --git a/.yamato/publish_to_stevedore_windows.yml b/.yamato/publish_to_stevedore_windows.yml
new file mode 100644
index 00000000000000..13df43148192ab
--- /dev/null
+++ b/.yamato/publish_to_stevedore_windows.yml
@@ -0,0 +1,19 @@
+{% metadata_file .yamato/Globals.metafile %}
+---
+name: Publish To Stevedore Windows x86
+
+agent:
+  type: Unity::VM
+  image: platform-foundation/windows-vs2019-il2cpp-bokken:latest
+  flavor: b1.xlarge
+
+dependencies:
+  - path: .yamato/build_windows.yml
+
+variables:
+  STEVEDORE_REPO: {{globals.stevedore_publish_location}}
+
+commands:
+# upload to stevedore
+  - curl -sSo StevedoreUpload.exe "%STEVEDORE_UPLOAD_TOOL_WINDOWS_X64_URL%"
+  - StevedoreUpload.exe --version-len=12 --repo=%STEVEDORE_REPO% --version="%GIT_REVISION%" artifacts\unity\*
diff --git a/.yamato/publish_to_stevedore_windows_x64.yml b/.yamato/publish_to_stevedore_windows_x64.yml
new file mode 100644
index 00000000000000..ebaebda21dab45
--- /dev/null
+++ b/.yamato/publish_to_stevedore_windows_x64.yml
@@ -0,0 +1,19 @@
+{% metadata_file .yamato/Globals.metafile %}
+---
+name: Publish To Stevedore Windows x64
+
+agent:
+  type: Unity::VM
+  image: platform-foundation/windows-vs2019-il2cpp-bokken:latest
+  flavor: b1.xlarge
+
+dependencies:
+  - path: .yamato/build_windows_x64.yml
+
+variables:
+  STEVEDORE_REPO: {{globals.stevedore_publish_location}}
+
+commands:
+# upload to stevedore
+  - curl -sSo StevedoreUpload.exe "%STEVEDORE_UPLOAD_TOOL_WINDOWS_X64_URL%"
+  - StevedoreUpload.exe --version-len=12 --repo=%STEVEDORE_REPO% --version="%GIT_REVISION%" artifacts\unity\*
diff --git a/.yamato/test_linux_x64.yml b/.yamato/test_linux_x64.yml
new file mode 100644
index 00000000000000..b9eb9970a13ebe
--- /dev/null
+++ b/.yamato/test_linux_x64.yml
@@ -0,0 +1,26 @@
+{% metadata_file .yamato/Globals.metafile %}
+---
+name: Test Linux x64
+
+agent:
+  type: Unity::VM
+  image: platform-foundation/linux-ubuntu-18.04-mono-bokken:0.1.7-978398
+  flavor: b1.large
+
+dependencies:
+  - path: .yamato/build_linux_x64.yml
+
+commands:
+# build/run tests
+  - ./build.sh -subset libs.tests -test -a x64 -c release -ci -ninja
+  - command: ./src/tests/build.sh x64 release ci
+    retries: 1
+  - ./src/tests/run.sh x64 release
+  - ./build.sh clr.paltests
+  - ./artifacts/bin/coreclr/$(uname).x64.Debug/paltests/runpaltests.sh $(pwd)/artifacts/bin/coreclr/$(uname).x64.Debug/paltests
+
+triggers:
+  pull_requests:
+    - targets:
+        only:
+          - "unity-main"
diff --git a/.yamato/test_osx_x64.yml b/.yamato/test_osx_x64.yml
new file mode 100644
index 00000000000000..5c485bf07d4543
--- /dev/null
+++ b/.yamato/test_osx_x64.yml
@@ -0,0 +1,25 @@
+{% metadata_file .yamato/Globals.metafile %}
+---
+name: Test OSX x64
+
+agent:
+  type: Unity::VM::osx
+  image: platform-foundation/mac-bokken:v0.1.8-972754
+  flavor: m1.mac
+
+dependencies:
+  - path: .yamato/build_osx_x64.yml
+
+commands:
+# build/run tests
+  - LD_LIBRARY_PATH=/usr/local/opt/openssl/lib ./build.sh -subset libs.tests -test -a x64 -c release -ci -ninja
+  - ./src/tests/build.sh x64 release ci
+  - ./src/tests/run.sh x64 release
+  - ./build.sh clr.paltests
+  - ./artifacts/bin/coreclr/OSX.x64.Debug/paltests/runpaltests.sh $(pwd)/artifacts/bin/coreclr/OSX.x64.Debug/paltests
+
+triggers:
+  pull_requests:
+    - targets:
+        only:
+          - "unity-main"
diff --git a/.yamato/test_windows.yml b/.yamato/test_windows.yml
new file mode 100644
index 00000000000000..a57e7be31494ab
--- /dev/null
+++ b/.yamato/test_windows.yml
@@ -0,0 +1,23 @@
+{% metadata_file .yamato/Globals.metafile %}
+---
+name: Test Windows x86
+
+agent:
+  type: Unity::VM
+  image: platform-foundation/windows-vs2019-il2cpp-bokken:v1.1.6-1025111
+  flavor: b1.xlarge
+
+dependencies:
+  - path: .yamato/build_windows.yml
+
+commands:
+# build/run tests
+  - build.cmd libs.tests -test -a x86 -c release -ci
+  - src\tests\build.cmd x86 release ci
+  - src\tests\run.cmd x86 release
+
+triggers:
+  pull_requests:
+    - targets:
+        only:
+          - "unity-main"
diff --git a/.yamato/test_windows_x64.yml b/.yamato/test_windows_x64.yml
new file mode 100644
index 00000000000000..131d92feb46555
--- /dev/null
+++ b/.yamato/test_windows_x64.yml
@@ -0,0 +1,23 @@
+{% metadata_file .yamato/Globals.metafile %}
+---
+name: Test Windows x64
+
+agent:
+  type: Unity::VM
+  image: platform-foundation/windows-vs2019-il2cpp-bokken:v1.1.6-1025111
+  flavor: b1.xlarge
+
+dependencies:
+  - path: .yamato/build_windows_x64.yml
+
+commands:
+# build/run tests
+  - build.cmd libs.tests -test -a x64 -c release -ci
+  - src\tests\build.cmd x64 release ci
+  - src\tests\run.cmd x64 release
+
+triggers:
+  pull_requests:
+    - targets:
+        only:
+          - "unity-main"