diff --git a/.pr_agent.toml b/.pr_agent.toml
new file mode 100644
index 0000000000..49734d8c44
--- /dev/null
+++ b/.pr_agent.toml
@@ -0,0 +1,2 @@
+[github_app]
+pr_commands = []
diff --git a/.yamato/desktop-standalone-tests.yml b/.yamato/desktop-standalone-tests.yml
index 7f26534cf6..6114fbff59 100644
--- a/.yamato/desktop-standalone-tests.yml
+++ b/.yamato/desktop-standalone-tests.yml
@@ -54,7 +54,7 @@ desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
         - "artifacts/**/*"
   dependencies:
     - .yamato/_run-all.yml#run_quick_checks # initial checks to perform fast validation of common errors
-    - .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }}
+    - .yamato/package-pack.yml#package_pack_-_ngo_ubuntu
 {% endfor -%}
 {% endfor -%}
 {% endfor -%}
diff --git a/.yamato/project-tests.yml b/.yamato/project-tests.yml
index e61ee790bc..49b4d1467a 100644
--- a/.yamato/project-tests.yml
+++ b/.yamato/project-tests.yml
@@ -46,7 +46,8 @@ test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
         - "upm-ci~/test-results/**/*"
   dependencies:
     - .yamato/_run-all.yml#run_quick_checks # initial checks to perform fast validation of common errors
-    - .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }}{% endfor -%}
+    - .yamato/package-pack.yml#package_pack_-_ngo_ubuntu
+{% endfor -%}
 {% endfor -%}
 {% endif -%}
 {% endfor -%}
diff --git a/.yamato/project-updated-dependencies-test.yml b/.yamato/project-updated-dependencies-test.yml
index 1b3175443f..d8b09ff3a0 100644
--- a/.yamato/project-updated-dependencies-test.yml
+++ b/.yamato/project-updated-dependencies-test.yml
@@ -42,7 +42,28 @@ updated-dependencies_{{ project.name }}_NGO_{{ platform.name }}_{{ editor }}:
       paths:
         - "upm-ci~/test-results/**/*"
   dependencies:
-    - .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }}
+    - .yamato/project-updated-dependencies-test.yml#project_pack_-_{{ project.name }}_{{ platform.name }}
 {% endfor -%}
 {% endfor -%}
 {% endfor -%}
+  
+  
+# TODO: This job was removed on PR-3711 but the above job somehow can find proper artifacts with package pack job. 
+# This job should be removed when issue will be resolved since it's not used anywhere
+{% for project in projects.all -%}
+{% for platform in test_platforms.desktop -%}
+project_pack_-_{{ project.name }}_{{ platform.name }}:
+  name: Project Pack - {{ project.name }} [{{ platform.name }}]
+  agent:
+    type: {{ platform.type }}
+    image: {{ platform.image }}
+    flavor: {{ platform.flavor }}
+  commands:
+    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm # upm-ci is not preinstalled on the image so we need to download it
+    - upm-ci project pack --project-path {{ project.path }}
+  artifacts:
+    packages:
+      paths:
+        - "upm-ci~/packages/**/*"
+{% endfor -%}
+{% endfor -%}
\ No newline at end of file
diff --git a/.yamato/project.metafile b/.yamato/project.metafile
index 47a2f8f3ce..81733a3303 100644
--- a/.yamato/project.metafile
+++ b/.yamato/project.metafile
@@ -59,7 +59,7 @@ test_platforms:
         - name: mac
           type: Unity::VM::osx
           image: package-ci/macos-13-arm64:v4 # ARM64 to support M1 model (below)
-          smaller_flavor: m1.mac # mac doesn't have a smaller vm size. We define it anyway as it simplifies the yaml templating to have it defined.
+          flavor: m1.mac # mac doesn't have a smaller vm size. We define it anyway as it simplifies the yaml templating to have it defined.
           smaller_flavor: b1.medium
           standalone: StandaloneOSX
           model: M1 # The default model (an x64 Intel Mac VM) quite often caused a known issue of doing all the bitflips in packages resulting in failures