diff --git a/.github/workflows/sqa-build.yaml b/.github/workflows/sqa-build.yaml
index 1fd68ff7..9243ea3e 100644
--- a/.github/workflows/sqa-build.yaml
+++ b/.github/workflows/sqa-build.yaml
@@ -28,38 +28,46 @@ jobs:
             family: series-3
             suffix: thread
             app_type: ota-v2
+            addAppComponent: ""
+            configs: [ 'CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:2,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\\"2\\"' ]
           - board: brd1019a
             app: zigbee-matter
             family: series-3
-            suffix: thread
+            suffix: light
             app_type: ota-v2
             addAppComponent: matter_zigbee_concurrent;matter
+            configs: [ 'CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:2,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\\"2\\"' ]
           - board: brd1019a
             app: zigbee-matter
             family: series-3
-            suffix: thread
+            suffix: light
             app_type: ota-v2
             addAppComponent: matter_zigbee_sequential;matter
+            configs: [ 'CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:2,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\\"2\\"' ]
           - board: brd4116a
             app: zigbee-matter
-            suffix: thread
+            suffix: light
             app_type: ota-v2
             addAppComponent: matter_zigbee_concurrent;matter
+            configs: [ 'CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:2,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\\"2\\"' ]
           - board: brd4116a
             app: zigbee-matter
-            suffix: thread
+            suffix: light
             app_type: ota-v2
             addAppComponent: matter_zigbee_sequential;matter
+            configs: [ 'CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:2,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\\"2\\"' ]
           - board: brd4187c
             app: zigbee-matter
-            suffix: thread
+            suffix: light
             app_type: ota-v2
             addAppComponent: matter_zigbee_concurrent;matter
+            configs: [ 'CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:2,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\\"2\\"' ]
           - board: brd4187c
             app: zigbee-matter
-            suffix: thread
+            suffix: light
             app_type: ota-v2
             addAppComponent: matter_zigbee_sequential;matter
+            configs: [ 'CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:2,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\\"2\\"' ]
 
     name: ${{ matrix.app }}-${{ matrix.suffix }} ${{ matrix.addAppComponent}} ${{ matrix.board }} ${{ matrix.app_type }}
 
@@ -87,24 +95,28 @@ jobs:
         include:
           - board: brd4116a
             app: zigbee-matter
-            suffix: thread
+            suffix: light
             app_type: ota-v3
             addAppComponent: matter_zigbee_concurrent;matter
+            configs: [ 'CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:3,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\\"3\\"' ]
           - board: brd4116a
             app: zigbee-matter
-            suffix: thread
+            suffix: light
             app_type: ota-v3
             addAppComponent: matter_zigbee_sequential;matter
+            configs: [ 'CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:3,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\\"3\\"' ]
           - board: brd4187c
             app: zigbee-matter
-            suffix: thread
+            suffix: light
             app_type: ota-v3
             addAppComponent: matter_zigbee_concurrent;matter
+            configs: [ 'CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:3,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\\"3\\"' ]
           - board: brd4187c
             app: zigbee-matter
-            suffix: thread
+            suffix: light
             app_type: ota-v3
             addAppComponent: matter_zigbee_sequential;matter
+            configs: [ 'CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:3,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\\"3\\"' ]
 
     name: ${{ matrix.app }}-${{ matrix.suffix }} ${{ matrix.addAppComponent}} ${{ matrix.board }} ${{ matrix.app_type }}
 
@@ -133,24 +145,32 @@ jobs:
         include:
           - board: brd4116a
             app: zigbee-matter
-            suffix: thread
+            suffix: light
             app_type: ota-lz4-v2
             addAppComponent: matter_zigbee_concurrent;matter
+            addBlComponent: ",bootloader_gbl_compression_lz4"
+            configs: 'CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:2,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\\"2\\"'
           - board: brd4116a
             app: zigbee-matter
-            suffix: thread
+            suffix: light
             app_type: ota-lz4-v2
             addAppComponent: matter_zigbee_sequential;matter
+            addBlComponent: ",bootloader_gbl_compression_lz4"
+            configs: 'CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:2,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\\"2\\"'
           - board: brd4187c
             app: zigbee-matter
-            suffix: thread
+            suffix: light
             app_type: ota-lz4-v2
             addAppComponent: matter_zigbee_concurrent;matter
+            addBlComponent: ",bootloader_gbl_compression_lz4"
+            configs: 'CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:2,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\\"2\\"'
           - board: brd4187c
             app: zigbee-matter
-            suffix: thread
+            suffix: light
             app_type: ota-lz4-v2
             addAppComponent: matter_zigbee_sequential;matter
+            addBlComponent: ",bootloader_gbl_compression_lz4"
+            configs: 'CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:2,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\\"2\\"'
 
     name: ${{ matrix.app }}-${{ matrix.suffix }} ${{ matrix.addAppComponent}} ${{ matrix.board }} ${{ matrix.app_type }}
 
@@ -180,24 +200,32 @@ jobs:
         include:
           - board: brd4116a
             app: zigbee-matter
-            suffix: thread
+            suffix: light
             app_type: ota-lz4-v3
             addAppComponent: matter_zigbee_concurrent;matter
+            addBlComponent: ",bootloader_gbl_compression_lz4"
+            configs: 'CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:3,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\\"3\\"'
           - board: brd4116a
             app: zigbee-matter
-            suffix: thread
+            suffix: light
             app_type: ota-lz4-v3
             addAppComponent: matter_zigbee_sequential;matter
+            addBlComponent: ",bootloader_gbl_compression_lz4"
+            configs: 'CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:3,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\\"3\\"'
           - board: brd4187c
             app: zigbee-matter
-            suffix: thread
+            suffix: light
             app_type: ota-lz4-v3
             addAppComponent: matter_zigbee_concurrent;matter
+            addBlComponent: ",bootloader_gbl_compression_lz4"
+            configs: 'CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:3,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\\"3\\"'
           - board: brd4187c
             app: zigbee-matter
-            suffix: thread
+            suffix: light
             app_type: ota-lz4-v3
             addAppComponent: matter_zigbee_sequential;matter
+            addBlComponent: ",bootloader_gbl_compression_lz4"
+            configs: 'CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:3,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\\"3\\"'
 
     name: ${{ matrix.app }}-${{ matrix.suffix }} ${{ matrix.addAppComponent}} ${{ matrix.board }} ${{ matrix.app_type }}
 
@@ -229,16 +257,19 @@ jobs:
             app_type: ota-v2
             suffix: 917-ncp
             family: series-2
+            configs: 'CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:2,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\\"2\\"'
           - board: brd4187c
             app: lock-app
             app_type: ota-v2
             suffix: wf200
             family: series-2
+            configs: 'CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:2,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\\"2\\"'
           - board: brd4187c
             app: lock-app
             app_type: ota-v2
             suffix: rs911x
             family: series-2
+            configs: 'CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION:2,CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING:\\"2\\"'
 
     name: ${{ matrix.app }}-${{ matrix.suffix }} ${{ matrix.addAppComponent}} ${{ matrix.board }} ${{ matrix.app_type }}
 
@@ -262,7 +293,7 @@ jobs:
         app_type: [ m-ota ]
         family: [ series-2 ]
         addAppComponent: [ ',matter_multi_image_ota;matter,matter_multi_image_custom_processor;matter' ]
-        removeAppComponent: [ '--without "matter_ota_support;matter"' ]
+        removeAppComponent: [ '"matter_ota_support;matter"' ]
 
     name: ${{ matrix.app }}-${{ matrix.suffix }} ${{ matrix.addAppComponent}} ${{ matrix.removeAppComponent}} ${{ matrix.board }} ${{ matrix.app_type }}
 
@@ -287,7 +318,7 @@ jobs:
         app_type: [ m-ota-enc ]
         family: [ series-2 ]
         addAppComponent: [ ',matter_multi_image_ota;matter,matter_multi_image_ota_encryption;matter,matter_multi_image_custom_processor;matter' ]
-        removeAppComponent: [ '--without "matter_ota_support;matter"' ]
+        removeAppComponent: [ '"matter_ota_support;matter"' ]
 
     name: ${{ matrix.app }}-${{ matrix.suffix }} ${{ matrix.addAppComponent}} ${{ matrix.removeAppComponent}} ${{ matrix.board }} ${{ matrix.app_type }}
 
@@ -313,13 +344,15 @@ jobs:
         family: [ series-2 ]
         addAppComponent: [ ",matter_platform_low_power;matter" ]
         # TODO: do we add the idle time 60 to this?
-        removeAppComponent: [ '--without "matter_shell;matter,matter_qr_code;matter,matter_lcd;matter,matter_lcd_917SOC;matter,matter_thread_cli;matter,matter_default_lcd_configs;matter"' ]
+        removeAppComponent: [ '"matter_shell;matter,matter_qr_code;matter,matter_lcd;matter,matter_lcd_917SOC;matter,matter_thread_cli;matter,matter_default_lcd_configs;matter"' ]
         include:
           - board: brd4338a
             suffix: 917-soc
             family: siwx917
             app: lock-app
             app_type: low-power
+            addAppComponent: [ ",matter_platform_low_power;matter" ]
+            removeAppComponent: [ '"matter_shell;matter,matter_qr_code;matter,matter_lcd;matter,matter_lcd_917SOC;matter,matter_thread_cli;matter,matter_default_lcd_configs;matter"' ]
 
     name: ${{ matrix.app }}-${{ matrix.suffix }} ${{ matrix.addAppComponent}} ${{ matrix.removeAppComponent}} ${{ matrix.board }} ${{ matrix.app_type }}
 
@@ -362,7 +395,7 @@ jobs:
     strategy:
       matrix:
         # Every app builds for every board and suffix
-        app: [ lock-app, light-switch-app, multi-sensor-app ]
+        app: [ lock-app, light-switch-app, sensor-app ]
         board: [ brd4186c, brd4187c, brd4116a, brd4338a ]
         suffix: [ thread ]
         app_type: [ icd-idm60 ]
@@ -374,11 +407,13 @@ jobs:
             suffix: thread
             app_type: icd-idm60
             family: series-2
+            configs: 'SL_IDLE_MODE_DURATION_S:60'
           - board: brd4338a
             app: lock-app
             app_type: icd-idm60
             suffix: 917-soc
             family: siwx917
+            configs: 'SL_IDLE_MODE_DURATION_S:60'
 
     name: ${{ matrix.app }}-${{ matrix.suffix }} ${{ matrix.addAppComponent}} ${{ matrix.removeAppComponent}} ${{ matrix.board }} ${{ matrix.app_type }}
 
@@ -406,8 +441,9 @@ jobs:
           - board: brd4338a
             app: lock-app
             app_type: icd-sync-false
-            suffix: [ 917-soc ]
-            family: [ siwx917 ]
+            suffix: 917-soc
+            family: siwx917
+            configs: 'SL_IDLE_MODE_DURATION_S:60,CHIP_CONFIG_SYNCHRONOUS_REPORTS_ENABLED:0'
 
     name: ${{ matrix.app }}-${{ matrix.suffix }} ${{ matrix.addAppComponent}} ${{ matrix.removeAppComponent}} ${{ matrix.board }} ${{ matrix.app_type }}