diff --git a/.yamato/publish_to_stevedore_linux.yml b/.yamato/publish_to_stevedore_linux.yml
deleted file mode 100644
index f9945553af0d92..00000000000000
--- a/.yamato/publish_to_stevedore_linux.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: Publish To Stevedore Linux
-
-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: testing
-
-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.yml b/.yamato/publish_to_stevedore_osx.yml
deleted file mode 100644
index 89f9fbd37ada72..00000000000000
--- a/.yamato/publish_to_stevedore_osx.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Publish To Stevedore OSX
-
-agent:
-  type: Unity::VM::osx
-  image: platform-foundation/mac-bokken:latest
-  flavor: m1.mac
-
-# build_osx_x64arm64.yml will end up with artifacts for x64, ARM64, and x64+ARM64
-dependencies:
-  - path: .yamato/build_osx_x64arm64.yml
-
-variables:
-  STEVEDORE_REPO: testing
-
-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_public.yml b/.yamato/publish_to_stevedore_public.yml
index 6b7acda3afe83a..4992443e4bdbfe 100644
--- a/.yamato/publish_to_stevedore_public.yml
+++ b/.yamato/publish_to_stevedore_public.yml
@@ -1,9 +1,20 @@
 name: Publish To Stevedore (Public)
 
+agent:
+  type: Unity::VM
+  image: platform-foundation/linux-ubuntu-18.04-mono-bokken:latest
+  flavor: b1.large
+
 variables:
   STEVEDORE_REPO: public
 
 dependencies:
-  - .yamato/publish_to_stevedore_linux.yml
-  - .yamato/publish_to_stevedore_osx.yml
-  - .yamato/publish_to_stevedore_windows.yml
+  - .yamato/build_linux_x64.yml
+  - .yamato/build_osx_x64arm64.yml
+  - .yamato/build_windows_x86.yml
+  - .yamato/build_windows_x64.yml
+
+commands:
+  - 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_testing.yml b/.yamato/publish_to_stevedore_testing.yml
index b0a845b6b34d2f..f5f036178a944b 100644
--- a/.yamato/publish_to_stevedore_testing.yml
+++ b/.yamato/publish_to_stevedore_testing.yml
@@ -1,9 +1,20 @@
 name: Publish To Stevedore (Testing)
 
+agent:
+  type: Unity::VM
+  image: platform-foundation/linux-ubuntu-18.04-mono-bokken:latest
+  flavor: b1.large
+
 variables:
   STEVEDORE_REPO: testing
 
 dependencies:
-  - .yamato/publish_to_stevedore_linux.yml
-  - .yamato/publish_to_stevedore_osx.yml
-  - .yamato/publish_to_stevedore_windows.yml
+  - .yamato/build_linux_x64.yml
+  - .yamato/build_osx_x64arm64.yml
+  - .yamato/build_windows_x86.yml
+  - .yamato/build_windows_x64.yml
+
+commands:
+  - curl -sSo StevedoreUpload "$STEVEDORE_UPLOAD_TOOL_LINUX_X64_URL"
+  - chmod +x StevedoreUpload
+  - ./StevedoreUpload --version-len=12 --repo=$STEVEDORE_REPO --version="$GIT_REVISION" artifacts/unity/*
\ No newline at end of file
diff --git a/.yamato/publish_to_stevedore_windows.yml b/.yamato/publish_to_stevedore_windows.yml
deleted file mode 100644
index 1aef55848e86bd..00000000000000
--- a/.yamato/publish_to_stevedore_windows.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: Publish To Stevedore Windows
-
-agent:
-  type: Unity::VM
-  image: platform-foundation/windows-vs2019-il2cpp-bokken:latest
-  flavor: b1.xlarge
-
-dependencies:
-  - path: .yamato/build_windows_x86.yml
-  - path: .yamato/build_windows_x64.yml
-
-variables:
-  STEVEDORE_REPO: testing
-
-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/scripts/build_windows_x64.cmd b/.yamato/scripts/build_windows_x64.cmd
index 9a0129e174cd6f..626ddc58d8a6f7 100755
--- a/.yamato/scripts/build_windows_x64.cmd
+++ b/.yamato/scripts/build_windows_x64.cmd
@@ -5,7 +5,7 @@ cmake .
 cmake --build . --config Release
 cd ../../
 rem build subset library and core clr
-build.cmd -subset clr+libs -a x64 -c release -ci
+cmd /c 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
 copy artifacts\bin\unity-embed-host\Release\net6.0\unity-embed-host.dll artifacts\bin\microsoft.netcore.app.runtime.win-x64\Release\runtimes\win-x64\lib\net7.0
 copy artifacts\bin\unity-embed-host\Release\net6.0\unity-embed-host.pdb artifacts\bin\microsoft.netcore.app.runtime.win-x64\Release\runtimes\win-x64\lib\net7.0
diff --git a/.yamato/scripts/build_windows_x86.cmd b/.yamato/scripts/build_windows_x86.cmd
index 2518496a5c1c51..1e1a3a2ab3247e 100755
--- a/.yamato/scripts/build_windows_x86.cmd
+++ b/.yamato/scripts/build_windows_x86.cmd
@@ -5,7 +5,7 @@ cmake . -A Win32
 cmake --build . --config Release
 cd ../../
 rem build subset library and core clr
-build.cmd -subset clr+libs -a x86 -c release -ci
+cmd /c 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
 copy artifacts\bin\unity-embed-host\Release\net6.0\unity-embed-host.dll artifacts\bin\microsoft.netcore.app.runtime.win-x86\Release\runtimes\win-x86\lib\net7.0
 copy artifacts\bin\unity-embed-host\Release\net6.0\unity-embed-host.pdb artifacts\bin\microsoft.netcore.app.runtime.win-x86\Release\runtimes\win-x86\lib\net7.0