diff --git a/.yamato/config/__shared.metafile b/.yamato/config/__shared.metafile
index 68d152eaab9..a08e475228b 100644
--- a/.yamato/config/__shared.metafile
+++ b/.yamato/config/__shared.metafile
@@ -505,7 +505,7 @@ platforms:
     agents_project:
       default:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
       standalone_build:
diff --git a/.yamato/shadergraph-android-opengles3.yml b/.yamato/shadergraph-android-opengles3.yml
index 3ca0a705d5e..e3f032b957a 100644
--- a/.yamato/shadergraph-android-opengles3.yml
+++ b/.yamato/shadergraph-android-opengles3.yml
@@ -11,7 +11,7 @@ ShaderGraph_Android_OpenGLES3_Standalone_il2cpp_Linear_trunk:
     name: ShaderGraph on Android_OpenGLES3_Standalone_il2cpp_Linear on version trunk
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -88,7 +88,7 @@ ShaderGraph_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION:
     name: ShaderGraph on Android_OpenGLES3_Standalone_il2cpp_Linear on version CUSTOM-REVISION
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
diff --git a/.yamato/shadergraph-android-vulkan.yml b/.yamato/shadergraph-android-vulkan.yml
index c19d0da5e77..744b8710392 100644
--- a/.yamato/shadergraph-android-vulkan.yml
+++ b/.yamato/shadergraph-android-vulkan.yml
@@ -11,7 +11,7 @@ ShaderGraph_Android_Vulkan_Standalone_il2cpp_Linear_trunk:
     name: ShaderGraph on Android_Vulkan_Standalone_il2cpp_Linear on version trunk
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -88,7 +88,7 @@ ShaderGraph_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION:
     name: ShaderGraph on Android_Vulkan_Standalone_il2cpp_Linear on version CUSTOM-REVISION
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
diff --git a/.yamato/urp_2d-android-opengles3.yml b/.yamato/urp_2d-android-opengles3.yml
index 1cb2fc9ec7f..52995072045 100644
--- a/.yamato/urp_2d-android-opengles3.yml
+++ b/.yamato/urp_2d-android-opengles3.yml
@@ -11,7 +11,7 @@ URP_2D_Android_OpenGLES3_Standalone_il2cpp_Linear_trunk:
     name: URP_2D on Android_OpenGLES3_Standalone_il2cpp_Linear on version trunk
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -88,7 +88,7 @@ URP_2D_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION:
     name: URP_2D on Android_OpenGLES3_Standalone_il2cpp_Linear on version CUSTOM-REVISION
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
diff --git a/.yamato/urp_2d-android-vulkan.yml b/.yamato/urp_2d-android-vulkan.yml
index ba46ba5422b..f80a63e52da 100644
--- a/.yamato/urp_2d-android-vulkan.yml
+++ b/.yamato/urp_2d-android-vulkan.yml
@@ -11,7 +11,7 @@ URP_2D_Android_Vulkan_Standalone_il2cpp_Linear_trunk:
     name: URP_2D on Android_Vulkan_Standalone_il2cpp_Linear on version trunk
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -88,7 +88,7 @@ URP_2D_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION:
     name: URP_2D on Android_Vulkan_Standalone_il2cpp_Linear on version CUSTOM-REVISION
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
diff --git a/.yamato/urp_foundation-android-opengles3.yml b/.yamato/urp_foundation-android-opengles3.yml
index af5a2ba0255..3f8e23d163c 100644
--- a/.yamato/urp_foundation-android-opengles3.yml
+++ b/.yamato/urp_foundation-android-opengles3.yml
@@ -11,7 +11,7 @@ URP_Foundation_Android_OpenGLES3_Standalone_il2cpp_Linear_trunk:
     name: URP_Foundation on Android_OpenGLES3_Standalone_il2cpp_Linear on version trunk
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -88,7 +88,7 @@ URP_Foundation_Android_OpenGLES3_Standalone_XR_il2cpp_Linear_trunk:
     name: URP_Foundation on Android_OpenGLES3_Standalone_XR_il2cpp_Linear on version trunk
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -165,7 +165,7 @@ URP_Foundation_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION:
     name: URP_Foundation on Android_OpenGLES3_Standalone_il2cpp_Linear on version CUSTOM-REVISION
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -242,7 +242,7 @@ URP_Foundation_Android_OpenGLES3_Standalone_XR_il2cpp_Linear_CUSTOM-REVISION:
     name: URP_Foundation on Android_OpenGLES3_Standalone_XR_il2cpp_Linear on version CUSTOM-REVISION
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
diff --git a/.yamato/urp_foundation-android-vulkan.yml b/.yamato/urp_foundation-android-vulkan.yml
index f9c9b75c115..299b7efe632 100644
--- a/.yamato/urp_foundation-android-vulkan.yml
+++ b/.yamato/urp_foundation-android-vulkan.yml
@@ -11,7 +11,7 @@ URP_Foundation_Android_Vulkan_Standalone_il2cpp_Linear_trunk:
     name: URP_Foundation on Android_Vulkan_Standalone_il2cpp_Linear on version trunk
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -88,7 +88,7 @@ URP_Foundation_Android_Vulkan_Standalone_XR_il2cpp_Linear_trunk:
     name: URP_Foundation on Android_Vulkan_Standalone_XR_il2cpp_Linear on version trunk
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -165,7 +165,7 @@ URP_Foundation_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION:
     name: URP_Foundation on Android_Vulkan_Standalone_il2cpp_Linear on version CUSTOM-REVISION
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -242,7 +242,7 @@ URP_Foundation_Android_Vulkan_Standalone_XR_il2cpp_Linear_CUSTOM-REVISION:
     name: URP_Foundation on Android_Vulkan_Standalone_XR_il2cpp_Linear on version CUSTOM-REVISION
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
diff --git a/.yamato/urp_lighting-android-opengles3.yml b/.yamato/urp_lighting-android-opengles3.yml
index 755de7235fd..d0255342d39 100644
--- a/.yamato/urp_lighting-android-opengles3.yml
+++ b/.yamato/urp_lighting-android-opengles3.yml
@@ -11,7 +11,7 @@ URP_Lighting_Android_OpenGLES3_Standalone_il2cpp_Linear_trunk:
     name: URP_Lighting on Android_OpenGLES3_Standalone_il2cpp_Linear on version trunk
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -88,7 +88,7 @@ URP_Lighting_Android_OpenGLES3_Standalone_XR_il2cpp_Linear_trunk:
     name: URP_Lighting on Android_OpenGLES3_Standalone_XR_il2cpp_Linear on version trunk
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -165,7 +165,7 @@ URP_Lighting_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION:
     name: URP_Lighting on Android_OpenGLES3_Standalone_il2cpp_Linear on version CUSTOM-REVISION
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -242,7 +242,7 @@ URP_Lighting_Android_OpenGLES3_Standalone_XR_il2cpp_Linear_CUSTOM-REVISION:
     name: URP_Lighting on Android_OpenGLES3_Standalone_XR_il2cpp_Linear on version CUSTOM-REVISION
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
diff --git a/.yamato/urp_lighting-android-vulkan.yml b/.yamato/urp_lighting-android-vulkan.yml
index 2dd6f307a8b..bcae5a9ecb2 100644
--- a/.yamato/urp_lighting-android-vulkan.yml
+++ b/.yamato/urp_lighting-android-vulkan.yml
@@ -11,7 +11,7 @@ URP_Lighting_Android_Vulkan_Standalone_il2cpp_Linear_trunk:
     name: URP_Lighting on Android_Vulkan_Standalone_il2cpp_Linear on version trunk
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -88,7 +88,7 @@ URP_Lighting_Android_Vulkan_Standalone_XR_il2cpp_Linear_trunk:
     name: URP_Lighting on Android_Vulkan_Standalone_XR_il2cpp_Linear on version trunk
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -165,7 +165,7 @@ URP_Lighting_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION:
     name: URP_Lighting on Android_Vulkan_Standalone_il2cpp_Linear on version CUSTOM-REVISION
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -242,7 +242,7 @@ URP_Lighting_Android_Vulkan_Standalone_XR_il2cpp_Linear_CUSTOM-REVISION:
     name: URP_Lighting on Android_Vulkan_Standalone_XR_il2cpp_Linear on version CUSTOM-REVISION
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
diff --git a/.yamato/urp_postpro-android-opengles3.yml b/.yamato/urp_postpro-android-opengles3.yml
index 7259a75657f..8334a679899 100644
--- a/.yamato/urp_postpro-android-opengles3.yml
+++ b/.yamato/urp_postpro-android-opengles3.yml
@@ -11,7 +11,7 @@ URP_PostPro_Android_OpenGLES3_Standalone_il2cpp_Linear_trunk:
     name: URP_PostPro on Android_OpenGLES3_Standalone_il2cpp_Linear on version trunk
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -88,7 +88,7 @@ URP_PostPro_Android_OpenGLES3_Standalone_XR_il2cpp_Linear_trunk:
     name: URP_PostPro on Android_OpenGLES3_Standalone_XR_il2cpp_Linear on version trunk
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -165,7 +165,7 @@ URP_PostPro_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION:
     name: URP_PostPro on Android_OpenGLES3_Standalone_il2cpp_Linear on version CUSTOM-REVISION
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -242,7 +242,7 @@ URP_PostPro_Android_OpenGLES3_Standalone_XR_il2cpp_Linear_CUSTOM-REVISION:
     name: URP_PostPro on Android_OpenGLES3_Standalone_XR_il2cpp_Linear on version CUSTOM-REVISION
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
diff --git a/.yamato/urp_postpro-android-vulkan.yml b/.yamato/urp_postpro-android-vulkan.yml
index c62fd85954f..d3ebed8c651 100644
--- a/.yamato/urp_postpro-android-vulkan.yml
+++ b/.yamato/urp_postpro-android-vulkan.yml
@@ -11,7 +11,7 @@ URP_PostPro_Android_Vulkan_Standalone_il2cpp_Linear_trunk:
     name: URP_PostPro on Android_Vulkan_Standalone_il2cpp_Linear on version trunk
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -88,7 +88,7 @@ URP_PostPro_Android_Vulkan_Standalone_XR_il2cpp_Linear_trunk:
     name: URP_PostPro on Android_Vulkan_Standalone_XR_il2cpp_Linear on version trunk
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -165,7 +165,7 @@ URP_PostPro_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION:
     name: URP_PostPro on Android_Vulkan_Standalone_il2cpp_Linear on version CUSTOM-REVISION
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -242,7 +242,7 @@ URP_PostPro_Android_Vulkan_Standalone_XR_il2cpp_Linear_CUSTOM-REVISION:
     name: URP_PostPro on Android_Vulkan_Standalone_XR_il2cpp_Linear on version CUSTOM-REVISION
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
diff --git a/.yamato/urp_terrain-android-opengles3.yml b/.yamato/urp_terrain-android-opengles3.yml
index 4301f34200c..f714361f2fe 100644
--- a/.yamato/urp_terrain-android-opengles3.yml
+++ b/.yamato/urp_terrain-android-opengles3.yml
@@ -11,7 +11,7 @@ URP_Terrain_Android_OpenGLES3_Standalone_il2cpp_Linear_trunk:
     name: URP_Terrain on Android_OpenGLES3_Standalone_il2cpp_Linear on version trunk
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -88,7 +88,7 @@ URP_Terrain_Android_OpenGLES3_Standalone_XR_il2cpp_Linear_trunk:
     name: URP_Terrain on Android_OpenGLES3_Standalone_XR_il2cpp_Linear on version trunk
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -165,7 +165,7 @@ URP_Terrain_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION:
     name: URP_Terrain on Android_OpenGLES3_Standalone_il2cpp_Linear on version CUSTOM-REVISION
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -242,7 +242,7 @@ URP_Terrain_Android_OpenGLES3_Standalone_XR_il2cpp_Linear_CUSTOM-REVISION:
     name: URP_Terrain on Android_OpenGLES3_Standalone_XR_il2cpp_Linear on version CUSTOM-REVISION
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
diff --git a/.yamato/urp_terrain-android-vulkan.yml b/.yamato/urp_terrain-android-vulkan.yml
index 185bfa91c06..51847e97793 100644
--- a/.yamato/urp_terrain-android-vulkan.yml
+++ b/.yamato/urp_terrain-android-vulkan.yml
@@ -11,7 +11,7 @@ URP_Terrain_Android_Vulkan_Standalone_il2cpp_Linear_trunk:
     name: URP_Terrain on Android_Vulkan_Standalone_il2cpp_Linear on version trunk
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -88,7 +88,7 @@ URP_Terrain_Android_Vulkan_Standalone_XR_il2cpp_Linear_trunk:
     name: URP_Terrain on Android_Vulkan_Standalone_XR_il2cpp_Linear on version trunk
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -165,7 +165,7 @@ URP_Terrain_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION:
     name: URP_Terrain on Android_Vulkan_Standalone_il2cpp_Linear on version CUSTOM-REVISION
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables:
@@ -242,7 +242,7 @@ URP_Terrain_Android_Vulkan_Standalone_XR_il2cpp_Linear_CUSTOM-REVISION:
     name: URP_Terrain on Android_Vulkan_Standalone_XR_il2cpp_Linear on version CUSTOM-REVISION
     agent:
         type: Unity::mobile::samsung
-        model: s10e-eu
+        model: s21-eu
         image: mobile/android-execution-r19:stable
         flavor: b1.large
     variables: