diff --git a/.yamato/promotion.yml b/.yamato/promotion.yml
index 24f0530c917f3cb64cb099792a15837947fdbf50..4d2c6aea655339b712977b6238adbb01bc35d49e 100644
--- a/.yamato/promotion.yml
+++ b/.yamato/promotion.yml
@@ -7,13 +7,16 @@ test_platforms:
     flavor: b1.large
 packages:
   - name: webrtc
+    packagename: com.unity.webrtc
   - name: renderstreaming
----
+    packagename: com.unity.renderstreaming
 
+---
+{% for package in packages %}
 {% for editor in test_editors %}
 {% for platform in test_platforms %}
-promotion_test_{{ platform.name }}_{{ editor.version }}:
-  name : Promotion Test {{ editor.version }} on {{ platform.name }}
+promotion_test_{{ package.name }}_{{ platform.name }}_{{ editor.version }}:
+  name : Promotion Test {{ package.packagename }} {{ editor.version }} on {{ platform.name }}
   agent:
     type: {{ platform.type }}
     image: {{ platform.image }}
@@ -22,63 +25,13 @@ promotion_test_{{ platform.name }}_{{ editor.version }}:
     UPMCI_PROMOTION: 1
   commands:
     - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
-    - upm-ci package test --unity-version {{ editor.version }}
+    - upm-ci package test --unity-version {{ editor.version }} --package-path Packages/{{ package.packagename }}
   artifacts:
     logs:
       paths:
         - "upm-ci~/test-results/**/*"
   dependencies:
-{% for package in packages %}
-    - .yamato/upm-ci-renderstreaming-packages.yml#pack_{{ package.name }}
-{% endfor %}
-{% endfor %}
-{% endfor %}
-
-promotion_test_trigger:
-  name: Promotion Tests Trigger
-  agent:
-    type: Unity::VM
-    image: package-ci/win10:stable
-    flavor: b1.large
-  artifacts:
-    logs:
-      paths:
-        - "upm-ci~/test-results/**/*"
-    packages:
-      paths:
-        - "upm-ci~/packages/**/*"
-  dependencies:
-{% for editor in test_editors %}
-{% for platform in test_platforms %}
-    - .yamato/promotion.yml#promotion_test_{{platform.name}}_{{editor.version}}
-{% endfor %}
-{% endfor %}
-
-promote:
-  name: Promote to Production
-  agent:
-    type: Unity::VM
-    image: package-ci/win10:stable
-    flavor: b1.large
-  variables:
-    UPMCI_PROMOTION: 1
-  commands:
-    - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
-    - upm-ci package promote
-  triggers:
-    tags:
-      only:
-        - /^(r|R)elease-\d+\.\d+\.\d+(-preview(\.\d+)?)?$/
-  artifacts:
-    artifacts:
-      paths:
-        - "upm-ci~/packages/*.tgz"
-  dependencies:
-{% for package in packages %}
     - .yamato/upm-ci-renderstreaming-packages.yml#pack_{{ package.name }}
 {% endfor %}
-{% for editor in test_editors %}
-{% for platform in test_platforms %}
-    - .yamato/promotion.yml#promotion_test_{{ platform.name }}_{{ editor.version }}
 {% endfor %}
 {% endfor %}
\ No newline at end of file