diff --git a/CMakePresets.json b/CMakePresets.json
index 916429de659..1dbd259ce91 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -22,7 +22,7 @@
       },
       "condition": {
         "type": "inList",
-        "string": "$env{Platform}",
+        "string": "$env{VSCMD_ARG_TGT_ARCH}",
         "list": [
           "x64",
           ""
@@ -39,7 +39,7 @@
       },
       "condition": {
         "type": "inList",
-        "string": "$env{Platform}",
+        "string": "$env{VSCMD_ARG_TGT_ARCH}",
         "list": [
           "x86",
           ""
@@ -56,7 +56,7 @@
       },
       "condition": {
         "type": "inList",
-        "string": "$env{Platform}",
+        "string": "$env{VSCMD_ARG_TGT_ARCH}",
         "list": [
           "arm64",
           ""
@@ -76,7 +76,7 @@
       },
       "condition": {
         "type": "inList",
-        "string": "$env{Platform}",
+        "string": "$env{VSCMD_ARG_TGT_ARCH}",
         "list": [
           "arm64",
           ""
diff --git a/tests/utils/stl-lit/stl-lit.in b/tests/utils/stl-lit/stl-lit.in
index aa8f832e2f9..9f7494bb382 100644
--- a/tests/utils/stl-lit/stl-lit.in
+++ b/tests/utils/stl-lit/stl-lit.in
@@ -30,8 +30,8 @@ builtin_parameters= {}
 builtin_parameters['config_map'] = config_map
 
 def assert_same_platform_for_build_and_test():
-    build_platform = '$ENV{Platform}'
-    test_platform = os.getenv('Platform', default='')
+    build_platform = '$ENV{VSCMD_ARG_TGT_ARCH}'
+    test_platform = os.getenv('VSCMD_ARG_TGT_ARCH', default='')
     if build_platform != '' and test_platform != '' and build_platform != test_platform:
         exit(f'Target platform mismatch: the STL was built for {build_platform} but tested for {test_platform}.')