diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index 7fccd5b..87cc106 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -37,6 +37,9 @@ target1: &target1
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
       variableValue: ci configs wayland opengl
+    - type: EnvironmentVariable
+      variableName: CHECK_COMPATIBILITY
+      variableValue: 1
   enable_if:
       condition: property
       property: target.arch
@@ -165,12 +168,8 @@ instructions:
 
       source ./poky/oe-init-build-env
 
-      for conf in ${TEST_CONFIGS}; do
-        echo "require ${SOURCE_DIR}/coin/test-${conf}.inc" >> conf/local.conf
-      done
-
       # check compatibility agaist current Yocto master
-      if [ ${MANIFEST} == "master.xml" ]; then
+      if [ -n "${CHECK_COMPATIBILITY}" ]; then
         yocto-check-layer ${SOURCE_DIR} \
           --dependency \
             ../meta-openembedded/meta-oe \
@@ -186,6 +185,10 @@ instructions:
       bitbake-layers add-layer ../meta-mingw
       bitbake-layers add-layer ${SOURCE_DIR}
 
+      for conf in ${TEST_CONFIGS}; do
+        echo "require ${SOURCE_DIR}/coin/test-${conf}.inc" >> conf/local.conf
+      done
+
       # build toolchain which should include all supported recipes
       bitbake meta-toolchain-qt6 \
           nativesdk-packagegroup-qt6-toolchain-host \