diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml
index dc9eaa40f7e4ba..b9e1b7b891ffdc 100644
--- a/.github/workflows/bloat_check.yaml
+++ b/.github/workflows/bloat_check.yaml
@@ -34,7 +34,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:76
+            image: ghcr.io/project-chip/chip-build:77
 
         steps:
             - name: Checkout
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 0617b05d657008..e7e5073ec54b02 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -42,7 +42,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:76
+            image: ghcr.io/project-chip/chip-build:77
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
@@ -138,7 +138,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:76
+            image: ghcr.io/project-chip/chip-build:77
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
@@ -283,7 +283,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:76
+            image: ghcr.io/project-chip/chip-build:77
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
@@ -346,7 +346,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:76
+            image: ghcr.io/project-chip/chip-build:77
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
@@ -457,7 +457,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:76
+            image: ghcr.io/project-chip/chip-build:77
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml
index 07f4cac37cc008..a3af1d83649bc4 100644
--- a/.github/workflows/chef.yaml
+++ b/.github/workflows/chef.yaml
@@ -27,7 +27,7 @@ concurrency:
 
 env:
     CHIP_NO_LOG_TIMESTAMPS: true
-    
+
 jobs:
     chef_linux:
         name: Chef - Linux CI Examples
@@ -35,7 +35,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:76
+            image: ghcr.io/project-chip/chip-build:77
             options: --user root
 
         steps:
@@ -56,7 +56,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:76
+            image: ghcr.io/project-chip/chip-build-esp32:77
             options: --user root
 
         steps:
@@ -77,7 +77,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-nrf-platform:76
+            image: ghcr.io/project-chip/chip-build-nrf-platform:77
             options: --user root
 
         steps:
@@ -98,7 +98,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-telink:76
+            image: ghcr.io/project-chip/chip-build-telink:77
             options: --user root
 
         steps:
diff --git a/.github/workflows/doxygen.yaml b/.github/workflows/doxygen.yaml
index 40bf2b9e8c1c96..f486995e8b261f 100644
--- a/.github/workflows/doxygen.yaml
+++ b/.github/workflows/doxygen.yaml
@@ -81,7 +81,7 @@ jobs:
 
         runs-on: ubuntu-latest
         container:
-            image: ghcr.io/project-chip/chip-build-doxygen:76
+            image: ghcr.io/project-chip/chip-build-doxygen:77
 
         if: github.actor != 'restyled-io[bot]'
 
diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml
index b18f44ec9d9206..ef27d2252858dd 100644
--- a/.github/workflows/examples-ameba.yaml
+++ b/.github/workflows/examples-ameba.yaml
@@ -27,7 +27,7 @@ concurrency:
 
 env:
     CHIP_NO_LOG_TIMESTAMPS: true
-    
+
 jobs:
     ameba:
         name: Ameba
@@ -38,7 +38,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-ameba:76
+            image: ghcr.io/project-chip/chip-build-ameba:77
             options: --user root
 
         steps:
diff --git a/.github/workflows/examples-asr.yaml b/.github/workflows/examples-asr.yaml
index 46881ea4810a33..d61af7ea5f633d 100644
--- a/.github/workflows/examples-asr.yaml
+++ b/.github/workflows/examples-asr.yaml
@@ -27,7 +27,7 @@ concurrency:
 
 env:
     CHIP_NO_LOG_TIMESTAMPS: true
-    
+
 jobs:
     asr:
         name: ASR
@@ -36,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-asr:76
+            image: ghcr.io/project-chip/chip-build-asr:77
             options: --user root
 
         steps:
diff --git a/.github/workflows/examples-bouffalolab.yaml b/.github/workflows/examples-bouffalolab.yaml
index d3191c598b57a0..01935deba341bc 100644
--- a/.github/workflows/examples-bouffalolab.yaml
+++ b/.github/workflows/examples-bouffalolab.yaml
@@ -37,7 +37,7 @@ jobs:
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: ghcr.io/project-chip/chip-build-bouffalolab:76
+      image: ghcr.io/project-chip/chip-build-bouffalolab:77
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:
diff --git a/.github/workflows/examples-cc13xx_26xx.yaml b/.github/workflows/examples-cc13xx_26xx.yaml
index 22a1d727284247..6a9d5f024cf337 100644
--- a/.github/workflows/examples-cc13xx_26xx.yaml
+++ b/.github/workflows/examples-cc13xx_26xx.yaml
@@ -45,7 +45,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-ti:76
+            image: ghcr.io/project-chip/chip-build-ti:77
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-cc32xx.yaml b/.github/workflows/examples-cc32xx.yaml
index c07313f82cb8d8..114bbf252fb6a0 100644
--- a/.github/workflows/examples-cc32xx.yaml
+++ b/.github/workflows/examples-cc32xx.yaml
@@ -31,7 +31,7 @@ concurrency:
 
 env:
     CHIP_NO_LOG_TIMESTAMPS: true
-    
+
 jobs:
     cc32xx:
         name: cc32xx
@@ -43,7 +43,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-ti:76
+            image: ghcr.io/project-chip/chip-build-ti:77
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
index 66b62945978077..2386585f170e87 100644
--- a/.github/workflows/examples-efr32.yaml
+++ b/.github/workflows/examples-efr32.yaml
@@ -40,7 +40,7 @@ jobs:
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: ghcr.io/project-chip/chip-build-efr32:76
+      image: ghcr.io/project-chip/chip-build-efr32:77
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:
diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
index 168b84ddc66779..43cd5de45a7d8b 100644
--- a/.github/workflows/examples-esp32.yaml
+++ b/.github/workflows/examples-esp32.yaml
@@ -27,7 +27,7 @@ concurrency:
 
 env:
     CHIP_NO_LOG_TIMESTAMPS: true
-    
+
 jobs:
     esp32:
         name: ESP32
@@ -36,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:76
+            image: ghcr.io/project-chip/chip-build-esp32:77
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -91,7 +91,7 @@ jobs:
               run: |
                   rm -rf ./zzz_pregenerated
                   mv scripts/codegen.py.renamed scripts/codegen.py
-                  mv scripts/tools/zap/generate.py.renamed scripts/tools/zap/generate.py 
+                  mv scripts/tools/zap/generate.py.renamed scripts/tools/zap/generate.py
             - name: Build example All Clusters App(Target:ESP32C3)
               run: scripts/examples/esp_example.sh all-clusters-app sdkconfig.defaults.esp32c3 esp32c3
             - name: Copy aside build products
@@ -126,7 +126,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:76
+            image: ghcr.io/project-chip/chip-build-esp32:77
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml
index f4547d86a71bcb..799b8f64ea0822 100644
--- a/.github/workflows/examples-infineon.yaml
+++ b/.github/workflows/examples-infineon.yaml
@@ -28,7 +28,7 @@ concurrency:
 
 env:
     CHIP_NO_LOG_TIMESTAMPS: true
-    
+
 jobs:
     infineon:
         name: Infineon examples building
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-infineon:76
+            image: ghcr.io/project-chip/chip-build-infineon:77
             env:
                # TODO: this should probably be part of the dockerfile itself
                CY_TOOLS_PATHS: /opt/Tools/ModusToolbox/tools_3.2
diff --git a/.github/workflows/examples-linux-arm.yaml b/.github/workflows/examples-linux-arm.yaml
index 8ea6b400f23b74..338fe3d7340458 100644
--- a/.github/workflows/examples-linux-arm.yaml
+++ b/.github/workflows/examples-linux-arm.yaml
@@ -27,7 +27,7 @@ concurrency:
 
 env:
     CHIP_NO_LOG_TIMESTAMPS: true
-    
+
 jobs:
     arm_crosscompile:
         name: Linux ARM Cross compile
@@ -36,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-crosscompile:76
+            image: ghcr.io/project-chip/chip-build-crosscompile:77
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-linux-imx.yaml b/.github/workflows/examples-linux-imx.yaml
index d1224852b734e9..dce469095b723c 100644
--- a/.github/workflows/examples-linux-imx.yaml
+++ b/.github/workflows/examples-linux-imx.yaml
@@ -27,7 +27,7 @@ concurrency:
 
 env:
     CHIP_NO_LOG_TIMESTAMPS: true
-    
+
 jobs:
     imx:
         name: Linux i.MX Build
@@ -36,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-imx:76
+            image: ghcr.io/project-chip/chip-build-imx:77
 
         steps:
             - name: Checkout
diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml
index a3ca553632a956..0eff5db371300d 100644
--- a/.github/workflows/examples-linux-standalone.yaml
+++ b/.github/workflows/examples-linux-standalone.yaml
@@ -27,7 +27,7 @@ concurrency:
 
 env:
     CHIP_NO_LOG_TIMESTAMPS: true
-    
+
 jobs:
     linux_standalone:
         name: Linux Standalone
@@ -36,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:76
+            image: ghcr.io/project-chip/chip-build:77
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-linux-tv-casting-app.yaml b/.github/workflows/examples-linux-tv-casting-app.yaml
index 3159685f8f4704..f3ef14bf8a4905 100644
--- a/.github/workflows/examples-linux-tv-casting-app.yaml
+++ b/.github/workflows/examples-linux-tv-casting-app.yaml
@@ -36,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:76
+            image: ghcr.io/project-chip/chip-build:77
 
         steps:
             - name: Checkout
diff --git a/.github/workflows/examples-mw320.yaml b/.github/workflows/examples-mw320.yaml
index 212bebfe3c70b9..bc2035c23b2fa3 100644
--- a/.github/workflows/examples-mw320.yaml
+++ b/.github/workflows/examples-mw320.yaml
@@ -27,7 +27,7 @@ concurrency:
 
 env:
     CHIP_NO_LOG_TIMESTAMPS: true
-    
+
 jobs:
     mw320:
         name: MW320
@@ -39,7 +39,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:76
+            image: ghcr.io/project-chip/chip-build:77
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml
index c9b16f36072295..48a94eef07c0ac 100644
--- a/.github/workflows/examples-nrfconnect.yaml
+++ b/.github/workflows/examples-nrfconnect.yaml
@@ -39,7 +39,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-nrf-platform:76
+            image: ghcr.io/project-chip/chip-build-nrf-platform:77
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-nuttx.yaml b/.github/workflows/examples-nuttx.yaml
index 2de7f00e13dbd5..6be7cfb7d233ff 100644
--- a/.github/workflows/examples-nuttx.yaml
+++ b/.github/workflows/examples-nuttx.yaml
@@ -35,7 +35,7 @@ jobs:
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: ghcr.io/project-chip/chip-build-nuttx:76
+      image: ghcr.io/project-chip/chip-build-nuttx:77
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:
diff --git a/.github/workflows/examples-nxp.yaml b/.github/workflows/examples-nxp.yaml
index 61291fc885e582..6fc6970ce2c51d 100644
--- a/.github/workflows/examples-nxp.yaml
+++ b/.github/workflows/examples-nxp.yaml
@@ -27,7 +27,7 @@ concurrency:
 
 env:
     CHIP_NO_LOG_TIMESTAMPS: true
-    
+
 jobs:
     k32w0:
         name: K32W0
@@ -39,7 +39,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-k32w:76
+            image: ghcr.io/project-chip/chip-build-k32w:77
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
@@ -218,7 +218,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-nxp:76
+            image: ghcr.io/project-chip/chip-build-nxp:77
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
@@ -246,7 +246,7 @@ jobs:
                       build \
                       --copy-artifacts-to out/artifacts \
                   "
-            
+
             - name: Build RW61X thermostat example app
               run: |
                   scripts/run_in_build_env.sh "\
@@ -257,7 +257,7 @@ jobs:
                       build \
                       --copy-artifacts-to out/artifacts \
                   "
-            
+
             - name: Build RW61X laundry-washer example app
               run: |
                   scripts/run_in_build_env.sh "\
@@ -280,7 +280,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-nxp-zephyr:76
+            image: ghcr.io/project-chip/chip-build-nxp-zephyr:77
 
         steps:
             - name: Checkout
diff --git a/.github/workflows/examples-openiotsdk.yaml b/.github/workflows/examples-openiotsdk.yaml
index c1bf85860cb65e..bd95868be8028a 100644
--- a/.github/workflows/examples-openiotsdk.yaml
+++ b/.github/workflows/examples-openiotsdk.yaml
@@ -40,7 +40,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-openiotsdk:76
+            image: ghcr.io/project-chip/chip-build-openiotsdk:77
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
             options: --privileged
diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml
index bd0ef01d7aba60..8b85f358b7e73e 100644
--- a/.github/workflows/examples-qpg.yaml
+++ b/.github/workflows/examples-qpg.yaml
@@ -27,7 +27,7 @@ concurrency:
 
 env:
     CHIP_NO_LOG_TIMESTAMPS: true
-    
+
 jobs:
     qpg:
         name: QPG
@@ -39,7 +39,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:76
+            image: ghcr.io/project-chip/chip-build:77
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-stm32.yaml b/.github/workflows/examples-stm32.yaml
index 291b9264c626da..f018e32f3ba199 100644
--- a/.github/workflows/examples-stm32.yaml
+++ b/.github/workflows/examples-stm32.yaml
@@ -40,7 +40,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:76
+            image: ghcr.io/project-chip/chip-build:77
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
index f67da724ca0764..bcab5a1aa334eb 100644
--- a/.github/workflows/examples-telink.yaml
+++ b/.github/workflows/examples-telink.yaml
@@ -27,7 +27,7 @@ concurrency:
 
 env:
     CHIP_NO_LOG_TIMESTAMPS: true
-    
+
 jobs:
     telink:
         name: Telink
@@ -38,7 +38,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-telink:76
+            image: ghcr.io/project-chip/chip-build-telink:77
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-tizen.yaml b/.github/workflows/examples-tizen.yaml
index abec382c564f43..3f4c68f35e7873 100644
--- a/.github/workflows/examples-tizen.yaml
+++ b/.github/workflows/examples-tizen.yaml
@@ -36,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-tizen:76
+            image: ghcr.io/project-chip/chip-build-tizen:77
             options: --user root
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml
index 29822767571416..ccaf534b28a09e 100644
--- a/.github/workflows/full-android.yaml
+++ b/.github/workflows/full-android.yaml
@@ -26,7 +26,7 @@ concurrency:
 
 env:
     CHIP_NO_LOG_TIMESTAMPS: true
-    
+
 jobs:
     full_android:
         name: Run
@@ -38,7 +38,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-android:76
+            image: ghcr.io/project-chip/chip-build-android:77
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml
index 19e0bcdd2075ef..c70d750554c53e 100644
--- a/.github/workflows/fuzzing-build.yaml
+++ b/.github/workflows/fuzzing-build.yaml
@@ -24,7 +24,7 @@ concurrency:
 
 env:
     CHIP_NO_LOG_TIMESTAMPS: true
-    
+
 jobs:
     build_linux_fuzzing:
         name: Build on Linux
@@ -33,7 +33,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:76
+            image: ghcr.io/project-chip/chip-build:77
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/java-tests.yaml b/.github/workflows/java-tests.yaml
index f585829f29f589..5dd637024642de 100644
--- a/.github/workflows/java-tests.yaml
+++ b/.github/workflows/java-tests.yaml
@@ -30,7 +30,7 @@ concurrency:
 
 env:
     CHIP_NO_LOG_TIMESTAMPS: true
-    
+
 jobs:
     java_tests_linux:
         name: Linux
@@ -42,7 +42,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-java:76
+            image: ghcr.io/project-chip/chip-build-java:77
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
 
@@ -101,7 +101,7 @@ jobs:
                    "./scripts/build/build_examples.py \
                       --target linux-x64-kotlin-matter-controller \
                       build \
-                   "                   
+                   "
             - name: Run Discover Commissionables Test
               run: |
                   scripts/run_in_python_env.sh out/venv \
@@ -134,7 +134,7 @@ jobs:
                      --tool-cluster "im" \
                      --tool-args "onnetwork-long-im-invoke --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 1000" \
                      --factoryreset \
-                  '                    
+                  '
             - name: Run IM Extendable Invoke Test
               run: |
                   scripts/run_in_python_env.sh out/venv \
@@ -245,7 +245,7 @@ jobs:
                      --tool-cluster "pairing" \
                      --tool-args "onnetwork-long --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 1000" \
                      --factoryreset \
-                  '                  
+                  '
             - name: Run Kotlin IM Invoke Test
               run: |
                   scripts/run_in_python_env.sh out/venv \
@@ -289,7 +289,7 @@ jobs:
                      --tool-cluster "im" \
                      --tool-args "onnetwork-long-im-subscribe --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 3000" \
                      --factoryreset \
-                  '                                                  
+                  '
             - name: Uploading core files
               uses: actions/upload-artifact@v4
               if: ${{ failure() && !env.ACT }}
diff --git a/.github/workflows/minimal-build.yaml b/.github/workflows/minimal-build.yaml
index a3cdc697f9ef3d..4866f9ebd16523 100644
--- a/.github/workflows/minimal-build.yaml
+++ b/.github/workflows/minimal-build.yaml
@@ -33,7 +33,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-minimal:76
+            image: ghcr.io/project-chip/chip-build-minimal:77
 
         steps:
             - name: Checkout
@@ -55,7 +55,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-minimal:76
+            image: ghcr.io/project-chip/chip-build-minimal:77
 
         steps:
             - name: Checkout
diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml
index 446632bb6d1a67..b1012f2f4b2ca4 100644
--- a/.github/workflows/qemu.yaml
+++ b/.github/workflows/qemu.yaml
@@ -40,7 +40,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32-qemu:76
+            image: ghcr.io/project-chip/chip-build-esp32-qemu:77
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml
index e4fc02b77a2e16..70d63c0431f64f 100644
--- a/.github/workflows/release_artifacts.yaml
+++ b/.github/workflows/release_artifacts.yaml
@@ -32,7 +32,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:76
+            image: ghcr.io/project-chip/chip-build-esp32:77
 
         steps:
             - name: Checkout
@@ -64,7 +64,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-efr32:76
+            image: ghcr.io/project-chip/chip-build-efr32:77
         steps:
             - name: Checkout
               uses: actions/checkout@v4
diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml
index bac25a017629e5..46a83a850c66b5 100644
--- a/.github/workflows/smoketest-android.yaml
+++ b/.github/workflows/smoketest-android.yaml
@@ -25,7 +25,7 @@ concurrency:
 
 env:
     CHIP_NO_LOG_TIMESTAMPS: true
-    
+
 jobs:
     android:
         name: Smoke Run - Android
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-android:76
+            image: ghcr.io/project-chip/chip-build-android:77
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
@@ -73,7 +73,7 @@ jobs:
                   ./scripts/run_in_build_env.sh \
                     "./scripts/build/build_examples.py --target android-arm64-tv-casting-app build"
             - name: Clean out build output
-              run: rm -rf ./out examples/tv-casting-app/android/App/app/libs/jniLibs/* examples/tv-casting-app/android/App/app/libs/*.jar                   
+              run: rm -rf ./out examples/tv-casting-app/android/App/app/libs/jniLibs/* examples/tv-casting-app/android/App/app/libs/*.jar
             - name: Build Android arm64-tv-server
               run: |
                   ./scripts/run_in_build_env.sh \
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 65ba9ac4114303..a9620b617e5938 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -49,7 +49,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:76
+            image: ghcr.io/project-chip/chip-build:77
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
 
@@ -455,7 +455,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:76
+            image: ghcr.io/project-chip/chip-build:77
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
 
diff --git a/.github/workflows/unit_integration_test.yaml b/.github/workflows/unit_integration_test.yaml
index db6e8e129b6693..7816c741c187f2 100644
--- a/.github/workflows/unit_integration_test.yaml
+++ b/.github/workflows/unit_integration_test.yaml
@@ -39,7 +39,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:76
+            image: ghcr.io/project-chip/chip-build:77
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml
index 4a86caf18301e5..e8213e09d85428 100644
--- a/.github/workflows/zap_regeneration.yaml
+++ b/.github/workflows/zap_regeneration.yaml
@@ -23,14 +23,14 @@ concurrency:
 
 env:
     CHIP_NO_LOG_TIMESTAMPS: true
-    
+
 jobs:
     zap_regeneration:
         name: ZAP Regeneration
 
         runs-on: ubuntu-20.04
         container:
-            image: ghcr.io/project-chip/chip-build:76
+            image: ghcr.io/project-chip/chip-build:77
         defaults:
             run:
                 shell: sh
diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml
index 3eb7a5c60fb03c..85b7ffa78bdc2e 100644
--- a/.github/workflows/zap_templates.yaml
+++ b/.github/workflows/zap_templates.yaml
@@ -27,14 +27,14 @@ concurrency:
 
 env:
     CHIP_NO_LOG_TIMESTAMPS: true
-    
+
 jobs:
     zap_templates:
         name: ZAP templates generation
 
         runs-on: ubuntu-20.04
         container:
-            image: ghcr.io/project-chip/chip-build:76
+            image: ghcr.io/project-chip/chip-build:77
         defaults:
             run:
                 shell: sh
diff --git a/config/nxp/app/enable-gnu-std.cmake b/config/nxp/app/enable-gnu-std.cmake
index a5a5c6c6aca10f..7e3cfa773778e0 100644
--- a/config/nxp/app/enable-gnu-std.cmake
+++ b/config/nxp/app/enable-gnu-std.cmake
@@ -1,22 +1,22 @@
 #
-#   Copyright (c) 2024 Project CHIP Authors
+# Copyright (c) 2024 Project CHIP Authors
 #
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-#       http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
 #
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 
 add_library(gnu17 INTERFACE)
 target_compile_options(gnu17
-    INTERFACE
-        $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>
-        -D_SYS__PTHREADTYPES_H_)
+	INTERFACE
+	$<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>
+	-Wno-stringop-truncation)
 target_link_libraries(app PRIVATE gnu17)
diff --git a/config/nxp/app/pre-zephyr.cmake b/config/nxp/app/pre-zephyr.cmake
index 9dd1b2ae32c5bf..d71c474037dcce 100644
--- a/config/nxp/app/pre-zephyr.cmake
+++ b/config/nxp/app/pre-zephyr.cmake
@@ -13,9 +13,3 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
-
-# Automatically find overlays defined at platform level
-# Those are usually used to change FLASH and RAM layouts
-if (EXISTS ${CHIP_ROOT}/src/platform/nxp/zephyr/boards/${BOARD}/${BOARD}.overlay)
-	list(APPEND EXTRA_DTC_OVERLAY_FILE ${CHIP_ROOT}/src/platform/nxp/zephyr/boards/${BOARD}/${BOARD}.overlay)
-endif()
diff --git a/config/nxp/chip-module/CMakeLists.txt b/config/nxp/chip-module/CMakeLists.txt
index f5cb1bf88a0fce..557cb6f8766a81 100644
--- a/config/nxp/chip-module/CMakeLists.txt
+++ b/config/nxp/chip-module/CMakeLists.txt
@@ -182,14 +182,7 @@ endif()
 # ==============================================================================
 # Define 'chip-ota-image' target for building CHIP OTA image
 # ==============================================================================
-if(EXISTS "${CHIP_ROOT}/src/platform/nxp/zephyr/boards/${BOARD}/${BOARD}.overlay")
-  set(DTC_BOARD_OVERLAY "${CHIP_ROOT}/src/platform/nxp/zephyr/boards/${BOARD}/${BOARD}.overlay")
-else()
-  set(DTC_BOARD_OVERLAY "")
-  message(STATUS "No board overlay found")
-endif()
-
-if (CONFIG_CHIP_OTA_REQUESTOR)
+if(CONFIG_CHIP_OTA_REQUESTOR)
     if(CONFIG_MCUBOOT_SIGNATURE_KEY_FILE STREQUAL "")
         set(ZEPHYR_OUTPUT_NAME "zephyr")
     else()
@@ -201,7 +194,8 @@ if (CONFIG_CHIP_OTA_REQUESTOR)
     add_custom_target(build_mcuboot ALL
         COMMAND
         west build -b ${BOARD} -d build_mcuboot ${ZEPHYR_BASE}/../bootloader/mcuboot/boot/zephyr
-            -- -DOVERLAY_CONFIG=${GLOBAL_BOOTLOADER_CONF_OVERLAY_FILE} -DEXTRA_DTC_OVERLAY_FILE=${DTC_BOARD_OVERLAY}
+            -- -DOVERLAY_CONFIG=${GLOBAL_BOOTLOADER_CONF_OVERLAY_FILE}
+            -DEXTRA_DTC_OVERLAY_FILE="${DTC_OVERLAY_FILE};${EXTRA_DTC_OVERLAY_FILE}"
         COMMAND
         cp ${PROJECT_BINARY_DIR}/../modules/connectedhomeip/build_mcuboot/zephyr/zephyr.bin ${PROJECT_BINARY_DIR}/zephyr.mcuboot.bin
     )
diff --git a/config/nxp/chip-module/Kconfig.defaults b/config/nxp/chip-module/Kconfig.defaults
index 36a9934a6a63e1..ba9fe9b4d3f4ab 100644
--- a/config/nxp/chip-module/Kconfig.defaults
+++ b/config/nxp/chip-module/Kconfig.defaults
@@ -91,13 +91,13 @@ config POSIX_MAX_FDS
 
 # Application stack size
 config MAIN_STACK_SIZE
-	default 8192
+	default 3072
 
 config INIT_STACKS
 	default y
 
 config NET_MGMT_EVENT_STACK_SIZE
-	default 2048
+	default 1024
 
 config NET_MGMT_EVENT_QUEUE_SIZE
 	default 20
@@ -136,21 +136,27 @@ config NET_TC_TX_THREAD_BASE_PRIO
 config NET_TC_RX_THREAD_BASE_PRIO
 	default 3
 
+config NET_TC_SKIP_FOR_HIGH_PRIO
+	default y
+
+config NET_CONTEXT_PRIORITY
+	default y
+
 # Network buffers
 config NET_PKT_RX_COUNT
-	default 60
+	default 14
 
 config NET_PKT_TX_COUNT
-	default 40
+	default 14
 
 config NET_BUF_RX_COUNT
-	default 60
+	default 36
 
 config NET_BUF_TX_COUNT
-	default 80
+	default 36
 
 config NET_BUF_DATA_SIZE
-	default 1744
+	default 256
 
 # Bluetooth Low Energy configs
 
@@ -205,7 +211,10 @@ config BT_BUF_ACL_TX_SIZE
 
 config BT_RX_STACK_SIZE
 	default 2048 if NO_OPTIMIZATIONS && DEBUG
-	default 1600
+	default 1700
+
+config BT_LONG_WQ_STACK_SIZE
+	default 1024
 
 config BT_DEVICE_NAME_GATT_WRITABLE
 	bool
@@ -232,6 +241,13 @@ config NVS_LOOKUP_CACHE_SIZE
 
 if CHIP_WIFI
 
+choice NXP_WIFI_PART
+	default NXP_RW610 if SOC_SERIES_RW6XX
+endchoice
+
+config ZVFS_OPEN_MAX
+	default 30
+
 choice SCHED_ALGORITHM
 	default SCHED_MULTIQ
 endchoice
@@ -240,12 +256,22 @@ choice LIBC_IMPLEMENTATION
 	default NEWLIB_LIBC
 endchoice
 
-choice WPA_SUPP_LOG_LEVEL_CHOICE
-	default WPA_SUPP_LOG_LEVEL_ERR
+choice WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_CHOICE
+	default WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_INF
 endchoice
 
-config WPA_SUPP_THREAD_STACK_SIZE
-	default 12288
+choice WIFI_NM_WPA_SUPPLICANT_CRYPTO_BACKEND
+	default WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT
+endchoice
+
+config WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE
+	default 6144
+
+config WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE
+	default 5120
+
+config WIFI_NM_WPA_SUPPLICANT_INF_MON
+	default n
 
 config SYSTEM_WORKQUEUE_STACK_SIZE
 	default 2048
@@ -261,7 +287,7 @@ config NET_IF_MCAST_IPV6_ADDR_COUNT
 	default 8
 
 config NET_SOCKETS_POLL_MAX
-	default 8
+	default 14
 
 config NET_IPV4_FRAGMENT_MAX_COUNT
 	default 3
@@ -276,7 +302,7 @@ config NET_IPV6_FRAGMENT_MAX_COUNT
 	default 3
 
 config NET_IPV6_FRAGMENT_MAX_PKT
-	default 7
+	default 8
 
 config NET_IPV6_FRAGMENT_TIMEOUT
 	default 3
@@ -287,7 +313,7 @@ config NET_MAX_ROUTERS
 	default 1
 
 config NET_MAX_CONN
-	default 4
+	default 10
 
 config SHELL_STACK_SIZE
 	default 2616
@@ -319,6 +345,9 @@ config MBEDTLS_ENTROPY_ENABLED
 config MBEDTLS_ZEPHYR_ENTROPY
 	default y
 
+config MBEDTLS_SSL_MAX_CONTENT_LEN
+	default 8192
+
 config MBEDTLS_ENABLE_HEAP
 	default y
 
@@ -343,13 +372,16 @@ config MBEDTLS_ECP_C
 config MBEDTLS_ECP_DP_SECP256R1_ENABLED
 	default y
 
+config CHIP_CRYPTO_PSA
+	default y
+
 if CHIP_CRYPTO_PSA
 
 config MBEDTLS_PSA_CRYPTO_C
 	default y
 
-config WPA_SUPP_CRYPTO_MBEDTLS_PSA
-	default y if WPA_SUPP_CRYPTO
+config WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA
+	default y if WIFI_NM_WPA_SUPPLICANT
 
 endif
 
@@ -358,11 +390,11 @@ config MCUX_ELS_PKC
 
 if MCUX_ELS_PKC
 
-config KSDK_MBEDTLS
-	default n
-
 config MCUX_PSA_CRYPTO_DRIVER_ELS_PKC
-	default y if MBEDTLS_PSA_CRYPTO_C
+	default y if CHIP_CRYPTO_PSA
+
+config MCUX_PSA_CRYPTO_DRIVER_ELS_PKC_THREAD
+	default y if CHIP_CRYPTO_PSA
 
 config ENTROPY_GENERATOR
 	default y
diff --git a/config/nxp/chip-module/Kconfig.features b/config/nxp/chip-module/Kconfig.features
index d8d194ccef2b41..4b387464aecab4 100644
--- a/config/nxp/chip-module/Kconfig.features
+++ b/config/nxp/chip-module/Kconfig.features
@@ -24,11 +24,16 @@ config CHIP_WIFI
 	default y
 	select WIFI
 	select WIFI_NXP
-	select WPA_SUPP
-	select WPA_SUPP_AP
-	select WPA_SUPP_WPS
-	select WPA_SUPP_WPA3
-	select WPA_SUPP_CRYPTO_ENTERPRISE
+	select WIFI_NM_WPA_SUPPLICANT
+	select WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+	select WIFI_NM_WPA_SUPPLICANT_DPP
+	select WIFI_NM_WPA_SUPPLICANT_EAPOL
+	select WIFI_NM_WPA_SUPPLICANT_WPS
+	select NET_L2_ETHERNET
+	select NET_IPV4
+	select NET_DHCPV4
+	select DNS_RESOLVER
+	imply THREAD_CUSTOM_DATA
 	imply MBEDTLS_ENTROPY_C
 	imply NET_STATISTICS
 	imply NET_PKT_TXTIME
diff --git a/config/zephyr/Kconfig b/config/zephyr/Kconfig
index 2a3a2d5495bf96..06b1d6fa5f79ad 100644
--- a/config/zephyr/Kconfig
+++ b/config/zephyr/Kconfig
@@ -22,7 +22,7 @@ menuconfig CHIP
 	imply REQUIRES_FULL_LIBC
 	imply NEWLIB_LIBC_NANO
 	imply CBPRINTF_LIBC_SUBSTS
-	imply POSIX_API if !ARCH_POSIX && !CHIP_NRF_PLATFORM && !CHIP_NXP_PLATFORM
+	imply POSIX_API if !ARCH_POSIX && !CHIP_NRF_PLATFORM
 	imply EVENTFD if !ARCH_POSIX
 	imply REBOOT
 	imply ENTROPY_GENERATOR
@@ -30,7 +30,7 @@ menuconfig CHIP
 	imply NET_IPV6
 	imply NET_CONFIG_NEED_IPV6
 	imply NET_SOCKETS
-	imply NET_SOCKETS_POSIX_NAMES if !ARCH_POSIX && (CHIP_NRF_PLATFORM || CHIP_NXP_PLATFORM)
+	imply NET_SOCKETS_POSIX_NAMES if !ARCH_POSIX && CHIP_NRF_PLATFORM
 	imply NETWORKING
 	imply HWINFO
 	imply FLASH
diff --git a/docs/guides/nxp/nxp_zephyr_ota_software_update.md b/docs/guides/nxp/nxp_zephyr_ota_software_update.md
index 805afb7741c944..9ae97d2d1291c1 100644
--- a/docs/guides/nxp/nxp_zephyr_ota_software_update.md
+++ b/docs/guides/nxp/nxp_zephyr_ota_software_update.md
@@ -33,7 +33,7 @@ The Flash is divided into different regions as follow :
     (candidate application).
 
 The size reserved for each partition can be found in
-`src/platform/nxp/zephyr/boards/board.overlay`.
+`<example folder>/boards/<board>.overlay`.
 
 Notes :
 
@@ -41,8 +41,7 @@ Notes :
     binary, ensuring compatibility between the application and the controllers.
 -   The sizes of the primary and secondary applications are provided as an
     example. The size can be changed by overriding the partitions located at
-    `board.overlay`.(example:
-    `src/platform/nxp/zephyr/boards/rd_rw612_bga.overlay`)
+    `<board>.overlay`.
 
 ### MCUBoot Bootloader
 
diff --git a/examples/all-clusters-app/nxp/zephyr/README.md b/examples/all-clusters-app/nxp/zephyr/README.md
index 45f71ee76c077b..3cd6fee3a6508b 100644
--- a/examples/all-clusters-app/nxp/zephyr/README.md
+++ b/examples/all-clusters-app/nxp/zephyr/README.md
@@ -31,7 +31,9 @@ NXP/Zephyr SDK.
 
 The example supports:
 
--   Matter over Wi-Fi
+- Matter over Wi-Fi with BLE commissioning
+- Matter OTA requestor
+- Matter Factory Data
 
 The supported boards are:
 
@@ -49,18 +51,22 @@ Prerequisites:
 -   Follow instruction from [BUILDING.md](../../../../docs/guides/BUILDING.md)
     to setup the Matter environment
 -   Follow instruction from
-    [Getting Started Guide](https://docs.zephyrproject.org/latest/develop/getting_started/index.html)
+    [Getting Started Guide](https://docs.zephyrproject.org/3.7.0/develop/getting_started/index.html)
     to setup a Zephyr workspace, however, the west init command to use is as
     follows:
 
 ```shell
-$ west init zephyrproject -m https://github.com/nxp-zephyr-ear/zephyr.git --mr zephyr_rw61x_v3.6_RFP
+$ west init zephyrproject -m https://github.com/nxp-zephyr/nxp-zsdk.git --mr nxp-v3.7.0
 ```
 
-> **Note**: Currently, supported NXP platforms in Zephyr targeting Matter are
-> not available in the official Zephyr repo, you'll have to use the NXP fork
-> `https://github.com/nxp-zephyr-ear/zephyr` github repo. Reach to your NXP
-> contact for more details.
+> **Note**: While some of NXP platforms are supported in Zephyr upstream, we
+> recommend using nxp-zsdk downstream to get access to all NXP features
+> that are not upstream yet.
+> While you can decide to use nxp-zsdk top of tree, we recommend using
+> a proper release tag delivered by NXP. This will ensure a certain level
+> of quality of the nxp-zsdk in use. Currently, we highly recommend using
+> the `nxp-v3.7.0` tag, based on Zephyr 3.7 LTS release.
+> Reach to your NXP contact for more details.
 
 Steps to build the example, targeting `rd_rw612_bga` board:
 
@@ -79,15 +85,16 @@ source <path to zephyr repo>/zephyr-env.sh
 3. Run west build command:
 
 ```shell
-west build -b rd_rw612_bga -p  <path to example folder>
+west build -b rd_rw612_bga -p auto -d build_zephyr <path to example folder>
 ```
 
-By default, a folder `build` will be created in the same folder you run the
-command from. The binaries will be created in `build/zephyr` with the name
-`zephyr.elf` and `zephyr.bin`.
+A folder `build_zephyr` will be created in the same folder you run the command from.
+The binaries will be created in `build_zephyr/zephyr` with the name `zephyr.elf` and
+`zephyr.bin`. We recommend using the `-d build_zephyr` if you are building from Matter
+repo root folder as a build folder already exists and is tracked by git.
 
 You can get more details on `west build` with
-[Zephyr's building guide](https://docs.zephyrproject.org/latest/develop/west/build-flash-debug.html#building-west-build)
+[Zephyr's building guide](https://docs.zephyrproject.org/3.7.0/develop/west/build-flash-debug.html#building-west-build)
 
 <a name="flashing-and-debugging"></a>
 
@@ -102,7 +109,7 @@ west flash -i <J-Link serial number>
 ```
 
 You can get more details on `west flash` with
-[Zephyr's flashing guide](https://docs.zephyrproject.org/latest/develop/west/build-flash-debug.html#flashing-west-flash)
+[Zephyr's flashing guide](https://docs.zephyrproject.org/3.7.0/develop/west/build-flash-debug.html#flashing-west-flash)
 
 > **Note**: `west flash` will not start a debug session, it will only flash and
 > reset the device
@@ -113,7 +120,7 @@ To debug a Matter with Zephyr application, you could use several methods:
 
 -   [MCUXpresso IDE (version >= 11.6.0)](https://www.nxp.com/design/software/development-software/mcuxpresso-software-and-tools-/mcuxpresso-integrated-development-environment-ide:MCUXpresso-IDE)
 -   `west debug`
-    [Zephyr's debugging guide](https://docs.zephyrproject.org/latest/develop/west/build-flash-debug.html#id29)
+    [Zephyr's debugging guide](https://docs.zephyrproject.org/3.7.0/develop/west/build-flash-debug.html#id29)
 
 > **Note**: As the build provides an elf file, any compatible debugging tool can
 > be used.
diff --git a/examples/all-clusters-app/nxp/zephyr/boards/rd_rw612_bga.overlay b/examples/all-clusters-app/nxp/zephyr/boards/rd_rw612_bga.overlay
index 86bb20739527cd..41ba4fc5cd304e 100644
--- a/examples/all-clusters-app/nxp/zephyr/boards/rd_rw612_bga.overlay
+++ b/examples/all-clusters-app/nxp/zephyr/boards/rd_rw612_bga.overlay
@@ -37,3 +37,55 @@
 	pinctrl-0 = <&pinmux_flexcomm3_usart>;
 	pinctrl-names = "default";
 };
+
+&sram {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	sram_data: memory@40000 {
+		compatible = "mmio-sram";
+		reg = <0x40000 DT_SIZE_K(1216)>;
+	};
+};
+
+/delete-node/ &boot_partition;
+/delete-node/ &slot0_partition;
+/delete-node/ &slot1_partition;
+/delete-node/ &fw_storage;
+/delete-node/ &storage_partition;
+
+&flexspi {
+	status = "okay";
+
+	mx25u51245g: mx25u51245g@0 {
+		status = "okay";
+
+		partitions {
+			boot_partition: partition@0 {
+				label = "mcuboot";
+				reg = <0x00000000 DT_SIZE_K(128)>;
+			};
+
+			slot0_partition: partition@20000 {
+				label = "image-0";
+				reg = <0x00020000 0x440000>;
+			};
+
+			slot1_partition: partition@460000 {
+				label = "image-1";
+				reg = <0x00460000 0x440000>;
+			};
+
+			storage_partition: partition@3FEF000 {
+				label = "storage";
+				reg = <0x03FEF000 DT_SIZE_K(64)>;
+			};
+
+			factory_partition: partition@3FFF000 {
+				label = "factory-data";
+				reg = <0x03FFF000 DT_SIZE_K(4)>;
+			};
+
+		};
+	};
+};
diff --git a/examples/all-clusters-app/nxp/zephyr/prj.conf b/examples/all-clusters-app/nxp/zephyr/prj.conf
index 936bc5984f4f35..375c50c33da6bf 100644
--- a/examples/all-clusters-app/nxp/zephyr/prj.conf
+++ b/examples/all-clusters-app/nxp/zephyr/prj.conf
@@ -43,7 +43,6 @@ CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_THREAD_INFO=y
 # use this config if stepping during debug session is not consistent
 # CONFIG_NO_OPTIMIZATIONS=y
-CONFIG_EXCEPTION_STACK_TRACE=y
 CONFIG_ASSERT=y
 # by default west will generate the full assembly output, which can take several minutes when binaries are large
 CONFIG_OUTPUT_DISASSEMBLY=n
@@ -55,5 +54,5 @@ CONFIG_OUTPUT_DISASSEMBLY=n
 # enable Matter CLI
 CONFIG_CHIP_LIB_SHELL=y
 # enable NET commands if desired
-#CONFIG_NET_SHELL=y
+# CONFIG_NET_SHELL=y
 CONFIG_CHIP_STATISTICS=y
diff --git a/examples/all-clusters-app/nxp/zephyr/prj_fdata.conf b/examples/all-clusters-app/nxp/zephyr/prj_fdata.conf
index a82618a5f46078..7094aab1e6ba39 100644
--- a/examples/all-clusters-app/nxp/zephyr/prj_fdata.conf
+++ b/examples/all-clusters-app/nxp/zephyr/prj_fdata.conf
@@ -70,7 +70,6 @@ CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_THREAD_INFO=y
 # use this config if stepping during debug session is not consistent
 # CONFIG_NO_OPTIMIZATIONS=y
-CONFIG_EXCEPTION_STACK_TRACE=y
 CONFIG_ASSERT=y
 # by default west will generate the full assembly output, which can take several minutes when binaries are large
 CONFIG_OUTPUT_DISASSEMBLY=n
diff --git a/examples/laundry-washer-app/nxp/zephyr/boards/rd_rw612_bga.overlay b/examples/laundry-washer-app/nxp/zephyr/boards/rd_rw612_bga.overlay
index 86bb20739527cd..41ba4fc5cd304e 100644
--- a/examples/laundry-washer-app/nxp/zephyr/boards/rd_rw612_bga.overlay
+++ b/examples/laundry-washer-app/nxp/zephyr/boards/rd_rw612_bga.overlay
@@ -37,3 +37,55 @@
 	pinctrl-0 = <&pinmux_flexcomm3_usart>;
 	pinctrl-names = "default";
 };
+
+&sram {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	sram_data: memory@40000 {
+		compatible = "mmio-sram";
+		reg = <0x40000 DT_SIZE_K(1216)>;
+	};
+};
+
+/delete-node/ &boot_partition;
+/delete-node/ &slot0_partition;
+/delete-node/ &slot1_partition;
+/delete-node/ &fw_storage;
+/delete-node/ &storage_partition;
+
+&flexspi {
+	status = "okay";
+
+	mx25u51245g: mx25u51245g@0 {
+		status = "okay";
+
+		partitions {
+			boot_partition: partition@0 {
+				label = "mcuboot";
+				reg = <0x00000000 DT_SIZE_K(128)>;
+			};
+
+			slot0_partition: partition@20000 {
+				label = "image-0";
+				reg = <0x00020000 0x440000>;
+			};
+
+			slot1_partition: partition@460000 {
+				label = "image-1";
+				reg = <0x00460000 0x440000>;
+			};
+
+			storage_partition: partition@3FEF000 {
+				label = "storage";
+				reg = <0x03FEF000 DT_SIZE_K(64)>;
+			};
+
+			factory_partition: partition@3FFF000 {
+				label = "factory-data";
+				reg = <0x03FFF000 DT_SIZE_K(4)>;
+			};
+
+		};
+	};
+};
diff --git a/examples/laundry-washer-app/nxp/zephyr/prj.conf b/examples/laundry-washer-app/nxp/zephyr/prj.conf
index ed59218a7da0e9..24890f7d442b8c 100644
--- a/examples/laundry-washer-app/nxp/zephyr/prj.conf
+++ b/examples/laundry-washer-app/nxp/zephyr/prj.conf
@@ -43,7 +43,6 @@ CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_THREAD_INFO=y
 # use this config if stepping during debug session is not consistent
 # CONFIG_NO_OPTIMIZATIONS=y
-CONFIG_EXCEPTION_STACK_TRACE=y
 CONFIG_ASSERT=y
 # by default west will generate the full assembly output, which can take several minutes when binaries are large
 CONFIG_OUTPUT_DISASSEMBLY=n
@@ -55,5 +54,5 @@ CONFIG_OUTPUT_DISASSEMBLY=n
 # enable Matter CLI
 CONFIG_CHIP_LIB_SHELL=y
 # enable NET commands if desired
-#CONFIG_NET_SHELL=y
+# CONFIG_NET_SHELL=y
 CONFIG_CHIP_STATISTICS=y
diff --git a/examples/laundry-washer-app/nxp/zephyr/prj_fdata.conf b/examples/laundry-washer-app/nxp/zephyr/prj_fdata.conf
index 986fc877aec5df..9ab620c0920da4 100644
--- a/examples/laundry-washer-app/nxp/zephyr/prj_fdata.conf
+++ b/examples/laundry-washer-app/nxp/zephyr/prj_fdata.conf
@@ -70,7 +70,6 @@ CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_THREAD_INFO=y
 # use this config if stepping during debug session is not consistent
 # CONFIG_NO_OPTIMIZATIONS=y
-CONFIG_EXCEPTION_STACK_TRACE=y
 CONFIG_ASSERT=y
 # by default west will generate the full assembly output, which can take several minutes when binaries are large
 CONFIG_OUTPUT_DISASSEMBLY=n
diff --git a/examples/thermostat/nxp/zephyr/boards/rd_rw612_bga.overlay b/examples/thermostat/nxp/zephyr/boards/rd_rw612_bga.overlay
index 86bb20739527cd..41ba4fc5cd304e 100644
--- a/examples/thermostat/nxp/zephyr/boards/rd_rw612_bga.overlay
+++ b/examples/thermostat/nxp/zephyr/boards/rd_rw612_bga.overlay
@@ -37,3 +37,55 @@
 	pinctrl-0 = <&pinmux_flexcomm3_usart>;
 	pinctrl-names = "default";
 };
+
+&sram {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	sram_data: memory@40000 {
+		compatible = "mmio-sram";
+		reg = <0x40000 DT_SIZE_K(1216)>;
+	};
+};
+
+/delete-node/ &boot_partition;
+/delete-node/ &slot0_partition;
+/delete-node/ &slot1_partition;
+/delete-node/ &fw_storage;
+/delete-node/ &storage_partition;
+
+&flexspi {
+	status = "okay";
+
+	mx25u51245g: mx25u51245g@0 {
+		status = "okay";
+
+		partitions {
+			boot_partition: partition@0 {
+				label = "mcuboot";
+				reg = <0x00000000 DT_SIZE_K(128)>;
+			};
+
+			slot0_partition: partition@20000 {
+				label = "image-0";
+				reg = <0x00020000 0x440000>;
+			};
+
+			slot1_partition: partition@460000 {
+				label = "image-1";
+				reg = <0x00460000 0x440000>;
+			};
+
+			storage_partition: partition@3FEF000 {
+				label = "storage";
+				reg = <0x03FEF000 DT_SIZE_K(64)>;
+			};
+
+			factory_partition: partition@3FFF000 {
+				label = "factory-data";
+				reg = <0x03FFF000 DT_SIZE_K(4)>;
+			};
+
+		};
+	};
+};
diff --git a/examples/thermostat/nxp/zephyr/prj.conf b/examples/thermostat/nxp/zephyr/prj.conf
index 8bb5bd9f275756..a2fa69056d517e 100644
--- a/examples/thermostat/nxp/zephyr/prj.conf
+++ b/examples/thermostat/nxp/zephyr/prj.conf
@@ -43,7 +43,6 @@ CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_THREAD_INFO=y
 # use this config if stepping during debug session is not consistent
 # CONFIG_NO_OPTIMIZATIONS=y
-CONFIG_EXCEPTION_STACK_TRACE=y
 CONFIG_ASSERT=y
 # by default west will generate the full assembly output, which can take several minutes when binaries are large
 CONFIG_OUTPUT_DISASSEMBLY=n
@@ -55,5 +54,5 @@ CONFIG_OUTPUT_DISASSEMBLY=n
 # enable Matter CLI
 CONFIG_CHIP_LIB_SHELL=y
 # enable NET commands if desired
-#CONFIG_NET_SHELL=y
+# CONFIG_NET_SHELL=y
 CONFIG_CHIP_STATISTICS=y
diff --git a/examples/thermostat/nxp/zephyr/prj_fdata.conf b/examples/thermostat/nxp/zephyr/prj_fdata.conf
index ee559b42ed9a71..4694bd18021595 100644
--- a/examples/thermostat/nxp/zephyr/prj_fdata.conf
+++ b/examples/thermostat/nxp/zephyr/prj_fdata.conf
@@ -70,7 +70,6 @@ CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_THREAD_INFO=y
 # use this config if stepping during debug session is not consistent
 # CONFIG_NO_OPTIMIZATIONS=y
-CONFIG_EXCEPTION_STACK_TRACE=y
 CONFIG_ASSERT=y
 # by default west will generate the full assembly output, which can take several minutes when binaries are large
 CONFIG_OUTPUT_DISASSEMBLY=n
diff --git a/scripts/build/builders/nxp.py b/scripts/build/builders/nxp.py
index 6a297cf8174d6a..975d2f497b8206 100644
--- a/scripts/build/builders/nxp.py
+++ b/scripts/build/builders/nxp.py
@@ -240,6 +240,9 @@ def generate(self):
             if 'ZEPHYR_NXP_BASE' not in os.environ:
                 raise Exception("ZEPHYR_NXP_BASE need to be set")
 
+            if 'ZEPHYR_TOOLCHAIN_VARIANT' in os.environ:
+                del os.environ['ZEPHYR_TOOLCHAIN_VARIANT']
+
             cmd = 'export ZEPHYR_SDK_INSTALL_DIR="$ZEPHYR_NXP_SDK_INSTALL_DIR"'
             cmd += '\nexport ZEPHYR_BASE="$ZEPHYR_NXP_BASE"'
 
diff --git a/src/platform/Zephyr/wifi/WiFiManager.cpp b/src/platform/Zephyr/wifi/WiFiManager.cpp
index 6dbc4930314fb1..a0730c1fa168fd 100644
--- a/src/platform/Zephyr/wifi/WiFiManager.cpp
+++ b/src/platform/Zephyr/wifi/WiFiManager.cpp
@@ -316,16 +316,10 @@ CHIP_ERROR WiFiManager::GetNetworkStatistics(NetworkStatistics & stats) const
 
     stats.mPacketMulticastRxCount = data.multicast.rx;
     stats.mPacketMulticastTxCount = data.multicast.tx;
-#if CONFIG_CHIP_NXP_PLATFORM
-    /* Zephyr 3.6 doesn't support the unicast stat in net_stats_wifi struct */
-    stats.mPacketUnicastRxCount = data.pkts.rx - data.multicast.rx - data.broadcast.rx;
-    stats.mPacketUnicastRxCount = data.pkts.tx - data.multicast.tx - data.broadcast.tx;
-#else
-    stats.mPacketUnicastRxCount = data.unicast.rx;
-    stats.mPacketUnicastTxCount = data.unicast.tx;
-#endif
-    stats.mBeaconsSuccessCount = data.sta_mgmt.beacons_rx;
-    stats.mBeaconsLostCount    = data.sta_mgmt.beacons_miss;
+    stats.mPacketUnicastRxCount   = data.unicast.rx;
+    stats.mPacketUnicastTxCount   = data.unicast.tx;
+    stats.mBeaconsSuccessCount    = data.sta_mgmt.beacons_rx;
+    stats.mBeaconsLostCount       = data.sta_mgmt.beacons_miss;
 
     return CHIP_NO_ERROR;
 }
diff --git a/src/platform/nxp/zephyr/CHIPDevicePlatformConfig.h b/src/platform/nxp/zephyr/CHIPDevicePlatformConfig.h
index 99f34137ed0418..30ecb9d3482d96 100644
--- a/src/platform/nxp/zephyr/CHIPDevicePlatformConfig.h
+++ b/src/platform/nxp/zephyr/CHIPDevicePlatformConfig.h
@@ -60,6 +60,12 @@
 #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP 0
 #endif
 
+#ifdef CONFIG_CHIP_ETHERNET
+#define CHIP_DEVICE_CONFIG_ENABLE_ETHERNET CONFIG_CHIP_ETHERNET
+#else
+#define CHIP_DEVICE_CONFIG_ENABLE_ETHERNET 0
+#endif
+
 #ifdef CONFIG_BT
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE CONFIG_BT
 #else
diff --git a/src/platform/nxp/zephyr/boards/rd_rw612_bga/rd_rw612_bga.overlay b/src/platform/nxp/zephyr/boards/rd_rw612_bga/rd_rw612_bga.overlay
deleted file mode 100644
index c4db68870c2d84..00000000000000
--- a/src/platform/nxp/zephyr/boards/rd_rw612_bga/rd_rw612_bga.overlay
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *    Copyright (c) 2023-2024 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http: //www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-&sram {
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	sram_data: memory@20000000 {
-		compatible = "mmio-sram";
-		reg = <0x20000000 DT_SIZE_K(1216)>;
-	};
-};
-
-/delete-node/ &boot_partition;
-/delete-node/ &slot0_partition;
-/delete-node/ &slot1_partition;
-/delete-node/ &fw_storage;
-/delete-node/ &storage_partition;
-
-&flexspi {
-	status = "okay";
-
-	mx25u51245g: mx25u51245g@0 {
-		status = "okay";
-
-		partitions {
-			boot_partition: partition@0 {
-				label = "mcuboot";
-				reg = <0x00000000 DT_SIZE_K(128)>;
-			};
-
-			slot0_partition: partition@20000 {
-				label = "image-0";
-				reg = <0x00020000 0x440000>;
-			};
-
-			slot1_partition: partition@460000 {
-				label = "image-1";
-				reg = <0x00460000 0x440000>;
-			};
-
-			storage_partition: partition@3FEF000 {
-				label = "storage";
-				reg = <0x03FEF000 DT_SIZE_K(64)>;
-			};
-
-			factory_partition: partition@3FFF000 {
-				label = "factory-data";
-				reg = <0x03FFF000 DT_SIZE_K(4)>;
-			};
-
-		};
-	};
-};
diff --git a/src/platform/nxp/zephyr/nxp-zephyr-mbedtls-config.h b/src/platform/nxp/zephyr/nxp-zephyr-mbedtls-config.h
index 4b9b0e857113d7..f5f44390cd5410 100644
--- a/src/platform/nxp/zephyr/nxp-zephyr-mbedtls-config.h
+++ b/src/platform/nxp/zephyr/nxp-zephyr-mbedtls-config.h
@@ -24,7 +24,7 @@
 
 #define MBEDTLS_CIPHER_PADDING_PKCS7
 
-#if CONFIG_WIFI_NXP && CONFIG_WPA_SUPP
+#if CONFIG_WIFI_NXP
 #include "wpa_supp_els_pkc_mbedtls_config.h"
 #endif /* CONFIG_WIFI_NXP && CONFIG_WPA_SUPP */