diff --git a/coin/instructions/coin_module_build_template_v2.yaml b/coin/instructions/coin_module_build_template_v2.yaml
index e7f47328e8d..a07119b8d50 100644
--- a/coin/instructions/coin_module_build_template_v2.yaml
+++ b/coin/instructions/coin_module_build_template_v2.yaml
@@ -70,11 +70,11 @@ instructions:
         - condition: and
           conditions:
             - condition: property
-              property: host.compiler
-              equals_value: MSVC2019
+              property: target.os
+              equals_value: Windows
             - condition: property
               property: target.arch
-              equals_value: ARM64
+              not_equals_property: host.arch
             - condition: property
               property: features
               not_contains_value: "DebianPackaging"
diff --git a/coin/instructions/coin_qtbase_build_template_v2.yaml b/coin/instructions/coin_qtbase_build_template_v2.yaml
index bcba7427817..e7a8329ffc4 100644
--- a/coin/instructions/coin_qtbase_build_template_v2.yaml
+++ b/coin/instructions/coin_qtbase_build_template_v2.yaml
@@ -61,11 +61,11 @@ instructions:
         - condition: and
           conditions:
             - condition: property
-              property: host.compiler
-              equals_value: MSVC2019
+              property: target.os
+              equals_value: Windows
             - condition: property
               property: target.arch
-              equals_value: ARM64
+              not_equals_property: host.arch
             - condition: property
               property: features
               not_contains_value: "DebianPackaging"
diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml
index b48bd153474..fc6928f08f6 100644
--- a/coin/instructions/prepare_building_env.yaml
+++ b/coin/instructions/prepare_building_env.yaml
@@ -347,11 +347,11 @@ instructions:
       condition: and
       conditions:
         - condition: property
-          property: host.compiler
-          equals_value: MSVC2019
+          property: target.os
+          equals_value: Windows
         - condition: property
           property: target.arch
-          equals_value: ARM64
+          not_equals_property: host.arch
     instructions:
       - type: EnvironmentVariable
         variableName: TARGET_ENV_PREFIX