diff --git a/.github/workflows/generate_firmware.yaml b/.github/workflows/generate_firmware.yaml
index 9db000e5..613408cc 100644
--- a/.github/workflows/generate_firmware.yaml
+++ b/.github/workflows/generate_firmware.yaml
@@ -27,14 +27,10 @@ jobs:
       TOOL_DIRS: arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-eabi/bin
       COMPILER: GCC
       TOOL_CHAINS: GCC
-      PLATFORM: MG12
-      APP_TYPE: SecureApp
-      SECURITY: APP_SECURE=false
-      COMMAND: all
+      TASK: gen-only
       COMPONENT: all
       ADAPTER_SN: 440133193
       CHIP: EFR32MG24BXXXF1536
-      OPTION_INTEGRATION_TEST: -DENABLE_CAL_CRC_32=ON -DENABLE_CRC_USE_SW=ON -DTEST_SECURE_PERIPHERALS_ENABLE=ON -DINTEGRATION_TEST_WDOG1_ENABLE=ON - INTEGRATION_TEST_USE_MARCHX_DISABLE=ON
     steps:
     - name: Checkout
       uses: actions/checkout@v4.1.7
@@ -145,7 +141,7 @@ jobs:
         export LST_PATH=$PWD/test/integration_test/build/brd4187c/integration_test_iec60730_watchdog/S
         export JLINK_PATH=/opt/SEGGER/JLink/libjlinkarm.so
         export HOST_IP=192.168.1.69
-        bash execute_test.sh $BOARD_NAME $TASK $COMPONENT $ADAPTER_SN $GCC $OPTION_INTEGRATION_TEST
+        bash execute_integration_test.sh $BOARD_NAME $TASK $COMPONENTS $ADAPTER_SN $COMPILER
     - name: Upload firmware
       uses: actions/upload-artifact@v4.3.4
       with:
@@ -166,13 +162,10 @@ jobs:
       COMPILER: GCC
       TOOL_CHAINS: GCC
       PLATFORM: MG12
-      APP_TYPE: SecureApp
-      SECURITY: APP_SECURE=false
-      COMMAND: all
+      TASK: gen-only
       COMPONENT: all
       ADAPTER_SN: 440189400
       CHIP: EFR32MG12
-      OPTION_INTEGRATION_TEST: -DENABLE_CAL_CRC_32=ON -DENABLE_CRC_USE_SW=ON -DTEST_SECURE_PERIPHERALS_ENABLE=ON -DINTEGRATION_TEST_WDOG1_ENABLE=ON - INTEGRATION_TEST_USE_MARCHX_DISABLE=ON
     steps:
     - name: Checkout
       uses: actions/checkout@v4.1.7
@@ -283,7 +276,7 @@ jobs:
         export LST_PATH=$PWD/test/integration_test/build/brd4187c/integration_test_iec60730_watchdog/S
         export JLINK_PATH=/opt/SEGGER/JLink/libjlinkarm.so
         export HOST_IP=192.168.1.69
-        bash execute_test.sh $BOARD_NAME $TASK $COMPONENT $ADAPTER_SN $GCC $OPTION_INTEGRATION_TEST
+        bash execute_integration_test.sh $BOARD_NAME $TASK $COMPONENTS $ADAPTER_SN $COMPILER
     - name: Upload firmware
       uses: actions/upload-artifact@v4.3.4
       with:
diff --git a/.github/workflows/integration_test_auto.yaml b/.github/workflows/integration_test_auto.yaml
index 0ff1355e..b2a7a4b5 100644
--- a/.github/workflows/integration_test_auto.yaml
+++ b/.github/workflows/integration_test_auto.yaml
@@ -83,6 +83,8 @@ jobs:
   job2:
     name: Integration test for mg12 with gcc
     runs-on: [self-hosted, ds-sqa-hn-iec]
+    if: ${{ always() }}
+    needs: [job1]
     permissions:
       contents: read
       pull-requests: write
diff --git a/.github/workflows/unit_test_auto.yaml b/.github/workflows/unit_test_auto.yaml
index 427ae44e..6d940b3a 100644
--- a/.github/workflows/unit_test_auto.yaml
+++ b/.github/workflows/unit_test_auto.yaml
@@ -85,6 +85,8 @@ jobs:
   job2:
     name: Unit test for mg12 with gcc
     runs-on: [self-hosted, ds-sqa-hn-iec]
+    if: ${{ always() }}
+    needs: [job1]
     permissions:
       contents: read
       pull-requests: write