diff --git a/.yamato/_run-all.yml b/.yamato/_run-all.yml
index 24daf40665..5f9e320670 100644
--- a/.yamato/_run-all.yml
+++ b/.yamato/_run-all.yml
@@ -16,7 +16,7 @@ run_quick_checks:
   name: Run Quick Initial Checks
   dependencies:
     # Ensure the code is running to our current standards
-    - .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.default }}
+    - .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.standards }}
     # This is needed for most of the jobs to execute tests + it runs xray PVP checks (all fast checks)
     - .yamato/package-pack.yml#package_pack_-_ngo_win
 
@@ -115,7 +115,7 @@ run_all_projects_standards:
   dependencies:
 {% for platform in test_platforms.default -%}
 {% for project in projects.all -%}
-{% for editor in validation_editors.default -%}
+{% for editor in validation_editors.standards -%}
     - .yamato/project-standards.yml#standards_{{ platform.name }}_{{ project.name }}_{{ editor }}
 {% endfor -%}
 {% endfor -%}
diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml
index e86359bc3e..6734445a9e 100644
--- a/.yamato/_triggers.yml
+++ b/.yamato/_triggers.yml
@@ -51,7 +51,7 @@
 pr_minimal_required_checks:
   name: Minimal PR checks
   dependencies:
-    - .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.default }}
+    - .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.standards }}
     - .yamato/package-pack.yml#package_pack_-_ngo_win
   triggers:
     expression: |-
@@ -132,7 +132,7 @@ develop_nightly:
         rerun: always
   dependencies:
     # Run project standards to verify package/default project
-    - .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.default }}
+    - .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.standards }}
     # Run APV jobs to make sure the change won't break any dependants
     - .yamato/wrench/preview-a-p-v.yml#all_preview_apv_jobs
     # Run package EditMode and Playmode tests on desktop platforms on trunk and 6000.0
diff --git a/.yamato/project-standards.yml b/.yamato/project-standards.yml
index 24380a152e..2ebae81b5e 100644
--- a/.yamato/project-standards.yml
+++ b/.yamato/project-standards.yml
@@ -30,7 +30,7 @@
 
 {% for project in projects.all -%}
 {% for platform in test_platforms.default -%}
-{% for editor in validation_editors.default -%}
+{% for editor in validation_editors.standards -%}
 standards_{{ platform.name }}_{{ project.name }}_{{ editor }}:
   name: Standards Check - NGO {{ project.name }} [{{ platform.name }}, {{ editor }}]
   agent:
@@ -48,8 +48,7 @@ standards_{{ platform.name }}_{{ project.name }}_{{ editor }}:
     - unity-downloader-cli --fast --wait -u {{ editor }} -c editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Downloads basic editor
     - .Editor/Unity -batchmode -nographics -logFile - -executeMethod Packages.Rider.Editor.RiderScriptEditor.SyncSolution -projectPath {{ project.path }} -quit # This command is used to invoke Unity in a "headless" mode. It's used to sync the project
     - dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --fix # Auto-fix formatting issues
-    - git checkout -- {{ project.path }}/Packages/manifest.json {{ project.path }}/Packages/packages-lock.json {{ project.path }}/ProjectSettings/ProjectVersion.txt 2>/dev/null || true # Restore files that Unity may have modified (we only want to check code formatting)
-    - 'git diff --exit-code || (echo "ERROR: Code formatting issues found. Run dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --fix locally and commit the changes." && exit 1)' # Fail if formatter made any changes
+    - 'git diff --exit-code || (echo "ERROR: Code formatting issues found. Run dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --fix locally and commit the changes. Note that dotnet version that was used in this check depends on the image that was used so local results may differ (see the first command of this job to know which dotnet version was used)" && exit 1)' # Fail if formatter made any changes
 {% endfor -%}
 {% endfor -%}
 {% endfor -%}
\ No newline at end of file
diff --git a/.yamato/project.metafile b/.yamato/project.metafile
index e839b89a74..c169fe6f9d 100644
--- a/.yamato/project.metafile
+++ b/.yamato/project.metafile
@@ -176,6 +176,7 @@ test_platforms:
 # EDITOR CONFIGURATIONS-------------------------------------------------------------------------------
 # Editors to be used for testing. NGOv2.X official support started from 6000.0 editor
 # TODO: When a new editor will be released it should be added to this list
+# standards editor is used for standards check so we won't get random manifest changes due to newer editor being used
 
 validation_editors:
     default:
@@ -188,6 +189,8 @@ validation_editors:
         - 5fe7931aab8c4fff9274e15ef0800125c68b8d6a
     minimal:
         - 6000.0
+    standards:
+        - 6000.3.21f1
 pinnedTrunk:  5fe7931aab8c4fff9274e15ef0800125c68b8d6a