diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35c054279..0f14b8879 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -255,8 +255,6 @@ build_esp_matter_examples_pytest_C3_idf_v4_4:
   variables:
         IDF_VERSION: "v4.4.3"
   script:
-    - cd ${IDF_PATH}
-    - rm -rf components/cbor
     - cd ${ESP_MATTER_PATH}
     - pip install -r tools/ci/requirements-build.txt
     - python tools/ci/build_apps.py ./examples --pytest_c3
diff --git a/components/esp_matter/zap_common/zap-generated/gen_config.h b/components/esp_matter/zap_common/zap-generated/gen_config.h
index 5f3787aa7..1b3602219 100644
--- a/components/esp_matter/zap_common/zap-generated/gen_config.h
+++ b/components/esp_matter/zap_common/zap-generated/gen_config.h
@@ -186,8 +186,7 @@
 #define EMBER_AF_MEDIA_PLAYBACK_CLUSTER_SERVER_ENDPOINT_COUNT FIXED_ENDPOINT_COUNT     // used in media playback
 #define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT FIXED_ENDPOINT_COUNT             // used in on off
 #define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT FIXED_ENDPOINT_COUNT   // used in ota
-#define EMBER_AF_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT FIXED_ENDPOINT_COUNT
- // used in power source
+#define EMBER_AF_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT FIXED_ENDPOINT_COUNT       // used in power source
 #define EMBER_AF_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT FIXED_ENDPOINT_COUNT   // used in target navigator
 #define EMBER_AF_WAKE_ON_LAN_CLUSTER_SERVER_ENDPOINT_COUNT FIXED_ENDPOINT_COUNT        // used in wake on lan
 #define EMBER_AF_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT FIXED_ENDPOINT_COUNT    // used in window covering
diff --git a/examples/mfg_test_app/sdkconfig.defaults.esp32h2 b/examples/mfg_test_app/sdkconfig.defaults.esp32h2
index e6252d356..271c452d9 100644
--- a/examples/mfg_test_app/sdkconfig.defaults.esp32h2
+++ b/examples/mfg_test_app/sdkconfig.defaults.esp32h2
@@ -1,2 +1,9 @@
+CONFIG_IDF_TARGET="esp32h2"
+
+# These are required in order to build otherwise, build fails for esp_coex component
+CONFIG_BT_ENABLED=y
+CONFIG_OPENTHREAD_ENABLED=y
+CONFIG_BT_NIMBLE_ENABLED=y
+
 # Enable DS Peripheral
 CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL=y