diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml
index 4dd8d4944..fb1da7149 100644
--- a/.yamato/_triggers.yml
+++ b/.yamato/_triggers.yml
@@ -30,6 +30,17 @@ run_ci_test_against_new_ngo_version:
   name: ⚡ Run CI test against new NGO version ⚡
   dependencies:
     - .yamato/ngo_version.yml#update_ngo
+    - .yamato/project-standards.yml#standards_{{ projects.first.name }}
+{% for project in projects -%}
+{% for platform in test_platforms -%}
+    # desktop platforms
+    - .yamato/project-tests.yml#test_{{ project.name }}_{{ project.test_editors.first }}_{{ platform.name }}
+{% endfor -%}
+    # iOS
+    - .yamato/mobile-build-and-run.yml#mobile_test_ios_{{ project.name }}_{{ project.test_editors.first }}
+    # Android
+    - .yamato/mobile-build-and-run.yml#mobile_test_android_{{ project.name }}_{{ project.test_editors.first }}
+{% endfor -%}
   triggers:
     external:
       source: git@github.com:Unity-Technologies/com.unity.netcode.gameobjects.git
diff --git a/.yamato/ngo_version.yml b/.yamato/ngo_version.yml
index 4701f68cf..fa888cb9e 100644
--- a/.yamato/ngo_version.yml
+++ b/.yamato/ngo_version.yml
@@ -1,8 +1,17 @@
-{% metadata_file .yamato/project.metafile %}
----
-{% for project in projects -%}
 update_ngo:
-  name: ⚡ Update NGO YAMATO_TRIGGER_BRANCH ⚡
-  dependencies:
-    - .yamato/project-pack.yml#pack_{{ project.name }}
-{% endfor -%}
\ No newline at end of file
+  name: ⚡ Update NGO $YAMATO_TRIGGER_BRANCH ⚡
+  agent:
+    type: Unity::VM
+    image: package-ci/ubuntu-22.04:v4
+    flavor: b1.small
+  commands:
+    - command: |-
+        sudo apt-get install jq
+        sudo yum install jq
+        echo release/1.9.0 >> release.txt 
+        number_variable=$(sed -n 's/^release\/\([0-9.]*\)$/\1/p' release.txt)
+        echo $number_variable >> test1.txt
+        cat test1.txt
+        pwd
+        sed -i 's/"com\.unity\.netcode\.gameobjects": "[^"]*"/"com.unity.netcode.gameobjects": "'"$number_variable"'"/' Packages/manifest.json
+        cat Packages/manifest.json
diff --git a/.yamato/project-pack.yml b/.yamato/project-pack.yml
index 745919cd9..abd361359 100644
--- a/.yamato/project-pack.yml
+++ b/.yamato/project-pack.yml
@@ -8,21 +8,8 @@ pack_{{ project.name }}:
     image: package-ci/ubuntu:stable
     flavor: b1.small
   commands:
-{% if $YAMATO_TRIGGER_TYPE == "ExternalPush" -%}
-    - command: |-
-        sudo apt-get install jq
-        sudo yum install jq
-        echo release/1.9.0 >> release.txt 
-        number_variable=$(sed -n 's/^release\/\([0-9.]*\)$/\1/p' release.txt)
-        echo $number_variable >> test1.txt
-        cat test1.txt
-        pwd
-        sed -i 's/"com\.unity\.netcode\.gameobjects": "[^"]*"/"com.unity.netcode.gameobjects": "'"$number_variable"'"/' Packages/manifest.json
-        cat Packages/manifest.json
-        sed -i 's/YAMATO_TRIGGER_BRANCH/number_variable' .yamato/ngo_version.yml
-{% endif -%}
-    - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
-    - command: upm-ci project pack --project-path {{ project.path }}
+    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    - upm-ci project pack --project-path {{ project.path }}
   artifacts:
     packages:
       paths: