diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml
index a5a059e..b47b780 100644
--- a/.github/workflows/bloat_check.yaml
+++ b/.github/workflows/bloat_check.yaml
@@ -34,7 +34,7 @@
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:47
+            image: ghcr.io/project-chip/chip-build:50
 
         steps:
             - name: Checkout
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 7b356ab..03e3c76 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -42,7 +42,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:47
+            image: ghcr.io/project-chip/chip-build:50
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
@@ -138,7 +138,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:47
+            image: ghcr.io/project-chip/chip-build:50
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
@@ -281,7 +281,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:47
+            image: ghcr.io/project-chip/chip-build:50
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
@@ -342,7 +342,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:47
+            image: ghcr.io/project-chip/chip-build:50
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
@@ -451,7 +451,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:47
+            image: ghcr.io/project-chip/chip-build:50
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml
index f69ed74..11f7671 100644
--- a/.github/workflows/chef.yaml
+++ b/.github/workflows/chef.yaml
@@ -35,7 +35,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:47
+            image: ghcr.io/project-chip/chip-build:50
             options: --user root
 
         steps:
@@ -56,7 +56,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:47
+            image: ghcr.io/project-chip/chip-build-esp32:50
             options: --user root
 
         steps:
@@ -77,7 +77,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-nrf-platform:47
+            image: ghcr.io/project-chip/chip-build-nrf-platform:50
             options: --user root
 
         steps:
@@ -98,7 +98,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-telink:47
+            image: ghcr.io/project-chip/chip-build-telink:50
             options: --user root
 
         steps:
diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml
index e61bdd8..837e948 100644
--- a/.github/workflows/cirque.yaml
+++ b/.github/workflows/cirque.yaml
@@ -42,7 +42,7 @@
         # need to run with privilege, which isn't supported by job.XXX.contaner
         #  https://github.com/actions/container-action/issues/2
         #         container:
-        #             image: ghcr.io/project-chip/chip-build-cirque:47
+        #             image: ghcr.io/project-chip/chip-build-cirque:50
         #             volumes:
         #                 - "/tmp:/tmp"
         #                 - "/dev/pts:/dev/pts"
diff --git a/.github/workflows/doxygen.yaml b/.github/workflows/doxygen.yaml
index 90a1ee0..41228ea 100644
--- a/.github/workflows/doxygen.yaml
+++ b/.github/workflows/doxygen.yaml
@@ -81,7 +81,7 @@
 
         runs-on: ubuntu-latest
         container:
-            image: ghcr.io/project-chip/chip-build-doxygen:47
+            image: ghcr.io/project-chip/chip-build-doxygen:50
 
         if: github.actor != 'restyled-io[bot]'
 
diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml
index ff405b9..cf97a71 100644
--- a/.github/workflows/examples-ameba.yaml
+++ b/.github/workflows/examples-ameba.yaml
@@ -38,7 +38,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-ameba:47
+            image: ghcr.io/project-chip/chip-build-ameba:50
             options: --user root
 
         steps:
diff --git a/.github/workflows/examples-asr.yaml b/.github/workflows/examples-asr.yaml
index 55f14bc..74b13f0 100644
--- a/.github/workflows/examples-asr.yaml
+++ b/.github/workflows/examples-asr.yaml
@@ -36,7 +36,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-asr:47
+            image: ghcr.io/project-chip/chip-build-asr:50
             options: --user root
 
         steps:
diff --git a/.github/workflows/examples-bouffalolab.yaml b/.github/workflows/examples-bouffalolab.yaml
index 7599fb1..bb08679 100644
--- a/.github/workflows/examples-bouffalolab.yaml
+++ b/.github/workflows/examples-bouffalolab.yaml
@@ -37,7 +37,7 @@
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: ghcr.io/project-chip/chip-build-bouffalolab:47
+      image: ghcr.io/project-chip/chip-build-bouffalolab:50
       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 ce8c5a9..32f82d1 100644
--- a/.github/workflows/examples-cc13xx_26xx.yaml
+++ b/.github/workflows/examples-cc13xx_26xx.yaml
@@ -38,7 +38,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-ti:47
+            image: ghcr.io/project-chip/chip-build-ti:50
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-cc32xx.yaml b/.github/workflows/examples-cc32xx.yaml
index 112f79c..f98444f 100644
--- a/.github/workflows/examples-cc32xx.yaml
+++ b/.github/workflows/examples-cc32xx.yaml
@@ -39,7 +39,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-ti:47
+            image: ghcr.io/project-chip/chip-build-ti:50
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
index b160b8e..fff336d 100644
--- a/.github/workflows/examples-efr32.yaml
+++ b/.github/workflows/examples-efr32.yaml
@@ -40,7 +40,7 @@
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: ghcr.io/project-chip/chip-build-efr32:49
+      image: ghcr.io/project-chip/chip-build-efr32:50
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:
diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
index be0cecc..accfec7 100644
--- a/.github/workflows/examples-esp32.yaml
+++ b/.github/workflows/examples-esp32.yaml
@@ -36,7 +36,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:47
+            image: ghcr.io/project-chip/chip-build-esp32:50
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -126,7 +126,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:47
+            image: ghcr.io/project-chip/chip-build-esp32:50
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml
index c06f618..3de5c1d 100644
--- a/.github/workflows/examples-infineon.yaml
+++ b/.github/workflows/examples-infineon.yaml
@@ -37,7 +37,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-infineon:47
+            image: ghcr.io/project-chip/chip-build-infineon:50
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-linux-arm.yaml b/.github/workflows/examples-linux-arm.yaml
index bc9d302..379a0e8 100644
--- a/.github/workflows/examples-linux-arm.yaml
+++ b/.github/workflows/examples-linux-arm.yaml
@@ -36,7 +36,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-crosscompile:47
+            image: ghcr.io/project-chip/chip-build-crosscompile:50
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-linux-imx.yaml b/.github/workflows/examples-linux-imx.yaml
index cd52f09..85296a1 100644
--- a/.github/workflows/examples-linux-imx.yaml
+++ b/.github/workflows/examples-linux-imx.yaml
@@ -36,7 +36,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-imx:47
+            image: ghcr.io/project-chip/chip-build-imx:50
 
         steps:
             - name: Checkout
diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml
index 28f0ad1..820056f 100644
--- a/.github/workflows/examples-linux-standalone.yaml
+++ b/.github/workflows/examples-linux-standalone.yaml
@@ -36,7 +36,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:47
+            image: ghcr.io/project-chip/chip-build:50
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml
index 6c20b63..39c5d23 100644
--- a/.github/workflows/examples-mbed.yaml
+++ b/.github/workflows/examples-mbed.yaml
@@ -42,7 +42,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-mbed-os:47
+            image: ghcr.io/project-chip/chip-build-mbed-os:50
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-mw320.yaml b/.github/workflows/examples-mw320.yaml
index 9135074..0ffe67d 100644
--- a/.github/workflows/examples-mw320.yaml
+++ b/.github/workflows/examples-mw320.yaml
@@ -39,7 +39,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:47
+            image: ghcr.io/project-chip/chip-build:50
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml
index ad09938..fe3d049 100644
--- a/.github/workflows/examples-nrfconnect.yaml
+++ b/.github/workflows/examples-nrfconnect.yaml
@@ -39,7 +39,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-nrf-platform:47
+            image: ghcr.io/project-chip/chip-build-nrf-platform:50
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-nxp.yaml b/.github/workflows/examples-nxp.yaml
index f6ca62c..2222253 100644
--- a/.github/workflows/examples-nxp.yaml
+++ b/.github/workflows/examples-nxp.yaml
@@ -39,7 +39,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-k32w:47
+            image: ghcr.io/project-chip/chip-build-k32w:50
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-openiotsdk.yaml b/.github/workflows/examples-openiotsdk.yaml
index 9ddaea3..cb3caea 100644
--- a/.github/workflows/examples-openiotsdk.yaml
+++ b/.github/workflows/examples-openiotsdk.yaml
@@ -40,7 +40,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-openiotsdk:47
+            image: ghcr.io/project-chip/chip-build-openiotsdk:50
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
             options: --privileged
diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml
index 5d61bcc..2448a0f 100644
--- a/.github/workflows/examples-qpg.yaml
+++ b/.github/workflows/examples-qpg.yaml
@@ -39,7 +39,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:47
+            image: ghcr.io/project-chip/chip-build:50
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-rw61x.yaml b/.github/workflows/examples-rw61x.yaml
index 250968a..526c50d 100644
--- a/.github/workflows/examples-rw61x.yaml
+++ b/.github/workflows/examples-rw61x.yaml
@@ -39,7 +39,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-rw61x:47
+            image: ghcr.io/project-chip/chip-build-rw61x:50
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-stm32.yaml b/.github/workflows/examples-stm32.yaml
index 58ccf97..f5cc530 100644
--- a/.github/workflows/examples-stm32.yaml
+++ b/.github/workflows/examples-stm32.yaml
@@ -40,7 +40,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:47
+            image: ghcr.io/project-chip/chip-build:50
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
index c2dc5a1..63830b3 100644
--- a/.github/workflows/examples-telink.yaml
+++ b/.github/workflows/examples-telink.yaml
@@ -38,7 +38,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-telink:47
+            image: ghcr.io/project-chip/chip-build-telink:50
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-tizen.yaml b/.github/workflows/examples-tizen.yaml
index 2b8cf46..8be983a 100644
--- a/.github/workflows/examples-tizen.yaml
+++ b/.github/workflows/examples-tizen.yaml
@@ -36,7 +36,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-tizen:47
+            image: ghcr.io/project-chip/chip-build-tizen:50
             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 e5c72de..5f06f0c 100644
--- a/.github/workflows/full-android.yaml
+++ b/.github/workflows/full-android.yaml
@@ -38,7 +38,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-android:47
+            image: ghcr.io/project-chip/chip-build-android:50
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml
index 861212f..ee3eebc 100644
--- a/.github/workflows/fuzzing-build.yaml
+++ b/.github/workflows/fuzzing-build.yaml
@@ -33,7 +33,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:47
+            image: ghcr.io/project-chip/chip-build:50
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/java-tests.yaml b/.github/workflows/java-tests.yaml
index 32d5de4..deab4d1 100644
--- a/.github/workflows/java-tests.yaml
+++ b/.github/workflows/java-tests.yaml
@@ -42,7 +42,7 @@
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-java:47
+            image: ghcr.io/project-chip/chip-build-java:50
             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/lint.yml b/.github/workflows/lint.yml
index 4fbaab2..5f7a956 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -35,7 +35,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:47
+            image: ghcr.io/project-chip/chip-build:50
 
         steps:
             - name: Checkout
diff --git a/.github/workflows/minimal-build.yaml b/.github/workflows/minimal-build.yaml
index d5f705f..46f1d0b 100644
--- a/.github/workflows/minimal-build.yaml
+++ b/.github/workflows/minimal-build.yaml
@@ -33,7 +33,7 @@
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-minimal:47
+            image: ghcr.io/project-chip/chip-build-minimal:50
 
         steps:
             - name: Checkout
diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml
index 6d61a2b..8e9816b 100644
--- a/.github/workflows/qemu.yaml
+++ b/.github/workflows/qemu.yaml
@@ -40,7 +40,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32-qemu:47
+            image: ghcr.io/project-chip/chip-build-esp32-qemu:50
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
@@ -78,7 +78,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-tizen-qemu:47
+            image: ghcr.io/project-chip/chip-build-tizen-qemu:50
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml
index 435ab05..80fdf05 100644
--- a/.github/workflows/release_artifacts.yaml
+++ b/.github/workflows/release_artifacts.yaml
@@ -32,7 +32,7 @@
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:47
+            image: ghcr.io/project-chip/chip-build-esp32:50
 
         steps:
             - name: Checkout
@@ -64,7 +64,7 @@
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-efr32:49
+            image: ghcr.io/project-chip/chip-build-efr32:50
         steps:
             - name: Checkout
               uses: actions/checkout@v4
diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml
index 37a84e5..3be4eed 100644
--- a/.github/workflows/smoketest-android.yaml
+++ b/.github/workflows/smoketest-android.yaml
@@ -37,7 +37,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-android:47
+            image: ghcr.io/project-chip/chip-build-android:50
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 005b00f..0c0290f 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -49,7 +49,7 @@
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:47
+            image: ghcr.io/project-chip/chip-build:50
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
 
@@ -439,7 +439,7 @@
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:47
+            image: ghcr.io/project-chip/chip-build:50
             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 b477838..061f66e 100644
--- a/.github/workflows/unit_integration_test.yaml
+++ b/.github/workflows/unit_integration_test.yaml
@@ -39,7 +39,7 @@
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:47
+            image: ghcr.io/project-chip/chip-build:50
             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 670d711..a496dbd 100644
--- a/.github/workflows/zap_regeneration.yaml
+++ b/.github/workflows/zap_regeneration.yaml
@@ -30,7 +30,7 @@
 
         runs-on: ubuntu-20.04
         container:
-            image: ghcr.io/project-chip/chip-build:47
+            image: ghcr.io/project-chip/chip-build:50
         defaults:
             run:
                 shell: sh
diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml
index ce7b594..d1f0668 100644
--- a/.github/workflows/zap_templates.yaml
+++ b/.github/workflows/zap_templates.yaml
@@ -34,7 +34,7 @@
 
         runs-on: ubuntu-20.04
         container:
-            image: ghcr.io/project-chip/chip-build:47
+            image: ghcr.io/project-chip/chip-build:50
         defaults:
             run:
                 shell: sh
diff --git a/config/telink/chip-module/Kconfig.defaults b/config/telink/chip-module/Kconfig.defaults
index f0584d8..57236f5 100644
--- a/config/telink/chip-module/Kconfig.defaults
+++ b/config/telink/chip-module/Kconfig.defaults
@@ -170,7 +170,7 @@
 config SOC_SERIES_RISCV_TELINK_B9X_NON_RETENTION_RAM_CODE
     default y if PM
 
-config TELINK_B9x_MATTER_RETENTION_LAYOUT
+config TELINK_B9X_MATTER_RETENTION_LAYOUT
     default y if PM
 
 config PWM
@@ -203,7 +203,7 @@
     default n
 
 # Reboot system when fault happened
-config TELINK_B9X_REBOOT_ON_FAULT
+config TELINK_SOC_REBOOT_ON_FAULT
     default y
 
 config NVS_LOOKUP_CACHE
@@ -292,13 +292,40 @@
 config NET_CONFIG_INIT_TIMEOUT
     default 0
 
-# mbedTLS tweaks
+config CHIP_ENABLE_PAIRING_AUTOSTART
+    bool "Open commissioning window on boot"
+    default y 
+    help
+        Opens the commissioning window automatically at application boot time if
+        the node is not yet commissioned.
+
+# Configure MBEDTLS lib
+config MBEDTLS
+	default y
+
 config MBEDTLS_USER_CONFIG_ENABLE
     default y
 
 config MBEDTLS_USER_CONFIG_FILE
     default "telink-mbedtls-config.h"
 
+config MBEDTLS_CIPHER_CCM_ENABLED
+	default y
+
+config MBEDTLS_PK_WRITE_C
+    default y
+
+config MBEDTLS_ECP_C
+	default y
+
+config MBEDTLS_ECP_DP_SECP256R1_ENABLED
+	default y
+
+config MBEDTLS_ECDH_C
+	default y
+
+config MBEDTLS_ECDSA_C
+	default y
 
 # getopt version
 config GETOPT_LONG
diff --git a/examples/air-quality-sensor-app/telink/prj.conf b/examples/air-quality-sensor-app/telink/prj.conf
index 12ee5d0..467a583 100644
--- a/examples/air-quality-sensor-app/telink/prj.conf
+++ b/examples/air-quality-sensor-app/telink/prj.conf
@@ -32,9 +32,6 @@
 CONFIG_CHIP_OTA_REQUESTOR=n
 CONFIG_CHIP_DEVICE_SOFTWARE_VERSION=1
 
-# Enable CHIP pairing automatically on application start.
-CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
-
 # Disable CHIP shell support
 CONFIG_CHIP_LIB_SHELL=n
 
diff --git a/examples/all-clusters-app/ameba/README.md b/examples/all-clusters-app/ameba/README.md
index 48f3276..831933d 100644
--- a/examples/all-clusters-app/ameba/README.md
+++ b/examples/all-clusters-app/ameba/README.md
@@ -27,11 +27,11 @@
 
 -   Pull docker image:
 
-          $ docker pull ghcr.io/project-chip/chip-build-ameba:47
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:50
 
 -   Run docker container:
 
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:47
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:50
 
 -   Setup build environment:
 
diff --git a/examples/all-clusters-app/telink/prj.conf b/examples/all-clusters-app/telink/prj.conf
index a2b81f9..2c9840c 100644
--- a/examples/all-clusters-app/telink/prj.conf
+++ b/examples/all-clusters-app/telink/prj.conf
@@ -32,9 +32,6 @@
 CONFIG_CHIP_OTA_REQUESTOR=n
 CONFIG_CHIP_DEVICE_SOFTWARE_VERSION=1
 
-# Enable CHIP pairing automatically on application start.
-CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
-
 # Disable CHIP shell support
 CONFIG_CHIP_LIB_SHELL=n
 
diff --git a/examples/all-clusters-minimal-app/ameba/README.md b/examples/all-clusters-minimal-app/ameba/README.md
index f6f6c92..12e9ff5 100644
--- a/examples/all-clusters-minimal-app/ameba/README.md
+++ b/examples/all-clusters-minimal-app/ameba/README.md
@@ -27,13 +27,13 @@
 -   Pull docker image:
 
           ```
-          $ docker pull ghcr.io/project-chip/chip-build-ameba:47
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:50
           ```
 
 -   Run docker container:
 
           ```
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:47
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:50
           ```
 
 -   Setup build environment:
diff --git a/examples/all-clusters-minimal-app/telink/prj.conf b/examples/all-clusters-minimal-app/telink/prj.conf
index 0b226d2..20a5920 100644
--- a/examples/all-clusters-minimal-app/telink/prj.conf
+++ b/examples/all-clusters-minimal-app/telink/prj.conf
@@ -35,9 +35,6 @@
 CONFIG_CHIP_OTA_REQUESTOR=n
 CONFIG_CHIP_DEVICE_SOFTWARE_VERSION=1
 
-# Enable CHIP pairing automatically on application start.
-CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
-
 # Disable CHIP shell support
 CONFIG_CHIP_LIB_SHELL=n
 
diff --git a/examples/bridge-app/telink/prj.conf b/examples/bridge-app/telink/prj.conf
index 28b99fe..78834c8 100644
--- a/examples/bridge-app/telink/prj.conf
+++ b/examples/bridge-app/telink/prj.conf
@@ -32,9 +32,6 @@
 CONFIG_CHIP_OTA_REQUESTOR=n
 CONFIG_CHIP_DEVICE_SOFTWARE_VERSION=1
 
-# Enable CHIP pairing automatically on application start.
-CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
-
 # Disable CHIP shell support
 CONFIG_CHIP_LIB_SHELL=n
 
diff --git a/examples/chef/telink/prj.conf b/examples/chef/telink/prj.conf
index 72d253e..e308a8b 100755
--- a/examples/chef/telink/prj.conf
+++ b/examples/chef/telink/prj.conf
@@ -33,9 +33,6 @@
 CONFIG_CHIP_OTA_REQUESTOR=n
 CONFIG_CHIP_DEVICE_SOFTWARE_VERSION=1
 
-# Enable CHIP pairing automatically on application start.
-CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
-
 # Disable CHIP shell support
 CONFIG_CHIP_LIB_SHELL=n
 CONFIG_OPENTHREAD_SHELL=n
diff --git a/examples/contact-sensor-app/telink/prj.conf b/examples/contact-sensor-app/telink/prj.conf
index 5eee03e..7e6094d 100755
--- a/examples/contact-sensor-app/telink/prj.conf
+++ b/examples/contact-sensor-app/telink/prj.conf
@@ -32,9 +32,6 @@
 CONFIG_CHIP_OTA_REQUESTOR=n
 CONFIG_CHIP_DEVICE_SOFTWARE_VERSION=1
 
-# Enable CHIP pairing automatically on application start.
-CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
-
 # Disable CHIP shell support
 CONFIG_CHIP_LIB_SHELL=n
 
diff --git a/examples/light-switch-app/ameba/README.md b/examples/light-switch-app/ameba/README.md
index 5af9d94..8bf606b 100644
--- a/examples/light-switch-app/ameba/README.md
+++ b/examples/light-switch-app/ameba/README.md
@@ -26,11 +26,11 @@
 
 -   Pull docker image:
 
-          $ docker pull ghcr.io/project-chip/chip-build-ameba:47
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:50
 
 -   Run docker container:
 
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:47
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:50
 
 -   Setup build environment:
 
diff --git a/examples/light-switch-app/telink/prj.conf b/examples/light-switch-app/telink/prj.conf
index 99691f0..754bf61 100755
--- a/examples/light-switch-app/telink/prj.conf
+++ b/examples/light-switch-app/telink/prj.conf
@@ -32,9 +32,6 @@
 CONFIG_CHIP_OTA_REQUESTOR=n
 CONFIG_CHIP_DEVICE_SOFTWARE_VERSION=1
 
-# Enable CHIP pairing automatically on application start.
-CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
-
 # Disable CHIP shell support
 CONFIG_CHIP_LIB_SHELL=n
 
diff --git a/examples/lighting-app/ameba/README.md b/examples/lighting-app/ameba/README.md
index b496e1c..8d4c0fc 100644
--- a/examples/lighting-app/ameba/README.md
+++ b/examples/lighting-app/ameba/README.md
@@ -23,11 +23,11 @@
 
 -   Pull docker image:
 
-          $ docker pull ghcr.io/project-chip/chip-build-ameba:47
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:50
 
 -   Run docker container:
 
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:47
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:50
 
 -   Setup build environment:
 
diff --git a/examples/lighting-app/telink/prj.conf b/examples/lighting-app/telink/prj.conf
index ca11bfd..39eb720 100644
--- a/examples/lighting-app/telink/prj.conf
+++ b/examples/lighting-app/telink/prj.conf
@@ -32,9 +32,6 @@
 CONFIG_CHIP_OTA_REQUESTOR=n
 CONFIG_CHIP_DEVICE_SOFTWARE_VERSION=1
 
-# Enable CHIP pairing automatically on application start.
-CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
-
 # Disable CHIP shell support
 CONFIG_CHIP_LIB_SHELL=n
 
diff --git a/examples/lock-app/telink/prj.conf b/examples/lock-app/telink/prj.conf
index 2ec882c..7e9df11 100755
--- a/examples/lock-app/telink/prj.conf
+++ b/examples/lock-app/telink/prj.conf
@@ -32,9 +32,6 @@
 CONFIG_CHIP_OTA_REQUESTOR=n
 CONFIG_CHIP_DEVICE_SOFTWARE_VERSION=1
 
-# Enable CHIP pairing automatically on application start.
-CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
-
 # Disable CHIP shell support
 CONFIG_CHIP_LIB_SHELL=n
 
diff --git a/examples/ota-requestor-app/ameba/README.md b/examples/ota-requestor-app/ameba/README.md
index aef1e40..fd262c6 100644
--- a/examples/ota-requestor-app/ameba/README.md
+++ b/examples/ota-requestor-app/ameba/README.md
@@ -6,11 +6,11 @@
 
 -   Pull docker image:
 
-          $ docker pull ghcr.io/project-chip/chip-build-ameba:47
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:50
 
 -   Run docker container:
 
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:47
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:50
 
 -   Setup build environment:
 
diff --git a/examples/ota-requestor-app/telink/prj.conf b/examples/ota-requestor-app/telink/prj.conf
index ca5d0a9..885fc2a 100755
--- a/examples/ota-requestor-app/telink/prj.conf
+++ b/examples/ota-requestor-app/telink/prj.conf
@@ -32,9 +32,6 @@
 CONFIG_CHIP_OTA_REQUESTOR=y
 CONFIG_CHIP_DEVICE_SOFTWARE_VERSION=1
 
-# Enable CHIP pairing automatically on application start.
-CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
-
 # Disable factory data support
 CONFIG_CHIP_FACTORY_DATA=n
 CONFIG_CHIP_FACTORY_DATA_BUILD=n
diff --git a/examples/pigweed-app/ameba/README.md b/examples/pigweed-app/ameba/README.md
index 49c7de2..d997bcc 100644
--- a/examples/pigweed-app/ameba/README.md
+++ b/examples/pigweed-app/ameba/README.md
@@ -31,11 +31,11 @@
 
 -   Pull docker image:
 
-          $ docker pull ghcr.io/project-chip/chip-build-ameba:47
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:50
 
 -   Run docker container:
 
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:47
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:50
 
 -   Setup build environment:
 
diff --git a/examples/platform/telink/util/src/ThreadUtil.cpp b/examples/platform/telink/util/src/ThreadUtil.cpp
index 7798b18..5cbadbf 100644
--- a/examples/platform/telink/util/src/ThreadUtil.cpp
+++ b/examples/platform/telink/util/src/ThreadUtil.cpp
@@ -18,7 +18,7 @@
 
 #include "ThreadUtil.h"
 
-#if !CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE && CHIP_DEVICE_CONFIG_ENABLE_THREAD
+#if CONFIG_OPENTHREAD
 
 #include <platform/CHIPDeviceLayer.h>
 
diff --git a/examples/pump-app/telink/prj.conf b/examples/pump-app/telink/prj.conf
index 2ed082d..afea4b4 100755
--- a/examples/pump-app/telink/prj.conf
+++ b/examples/pump-app/telink/prj.conf
@@ -32,9 +32,6 @@
 CONFIG_CHIP_OTA_REQUESTOR=n
 CONFIG_CHIP_DEVICE_SOFTWARE_VERSION=1
 
-# Enable CHIP pairing automatically on application start.
-CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
-
 # Disable CHIP shell support
 CONFIG_CHIP_LIB_SHELL=n
 
diff --git a/examples/pump-controller-app/telink/prj.conf b/examples/pump-controller-app/telink/prj.conf
index d84eb8e..9106adc 100755
--- a/examples/pump-controller-app/telink/prj.conf
+++ b/examples/pump-controller-app/telink/prj.conf
@@ -32,9 +32,6 @@
 CONFIG_CHIP_OTA_REQUESTOR=n
 CONFIG_CHIP_DEVICE_SOFTWARE_VERSION=1
 
-# Enable CHIP pairing automatically on application start.
-CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
-
 # Disable CHIP shell support
 CONFIG_CHIP_LIB_SHELL=n
 
diff --git a/examples/shell/telink/prj.conf b/examples/shell/telink/prj.conf
index 7e1f647..a38b2e2 100755
--- a/examples/shell/telink/prj.conf
+++ b/examples/shell/telink/prj.conf
@@ -29,9 +29,6 @@
 CONFIG_CHIP_OTA_REQUESTOR=n
 CONFIG_CHIP_DEVICE_SOFTWARE_VERSION=1
 
-# Enable CHIP pairing automatically on application start.
-CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
-
 # Disable CHIP shell support
 CONFIG_CHIP_LIB_SHELL=y
 CONFIG_OPENTHREAD_SHELL=y
diff --git a/examples/smoke-co-alarm-app/telink/prj.conf b/examples/smoke-co-alarm-app/telink/prj.conf
index 5fe349f..f059df9 100755
--- a/examples/smoke-co-alarm-app/telink/prj.conf
+++ b/examples/smoke-co-alarm-app/telink/prj.conf
@@ -32,9 +32,6 @@
 CONFIG_CHIP_OTA_REQUESTOR=n
 CONFIG_CHIP_DEVICE_SOFTWARE_VERSION=1
 
-# Enable CHIP pairing automatically on application start.
-CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
-
 # Disable CHIP shell support
 CONFIG_CHIP_LIB_SHELL=n
 
diff --git a/examples/temperature-measurement-app/telink/prj.conf b/examples/temperature-measurement-app/telink/prj.conf
index 99ad399..5b8c47b 100644
--- a/examples/temperature-measurement-app/telink/prj.conf
+++ b/examples/temperature-measurement-app/telink/prj.conf
@@ -32,9 +32,6 @@
 CONFIG_CHIP_OTA_REQUESTOR=n
 CONFIG_CHIP_DEVICE_SOFTWARE_VERSION=1
 
-# Enable CHIP pairing automatically on application start.
-CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
-
 # Disable CHIP shell support
 CONFIG_CHIP_LIB_SHELL=n
 
diff --git a/examples/thermostat/telink/prj.conf b/examples/thermostat/telink/prj.conf
index e342558..55d4f1c 100755
--- a/examples/thermostat/telink/prj.conf
+++ b/examples/thermostat/telink/prj.conf
@@ -32,9 +32,6 @@
 CONFIG_CHIP_OTA_REQUESTOR=n
 CONFIG_CHIP_DEVICE_SOFTWARE_VERSION=1
 
-# Enable CHIP pairing automatically on application start.
-CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
-
 # Disable CHIP shell support
 CONFIG_CHIP_LIB_SHELL=n
 
diff --git a/examples/window-app/telink/prj.conf b/examples/window-app/telink/prj.conf
index 63b5080..f45bdb0 100644
--- a/examples/window-app/telink/prj.conf
+++ b/examples/window-app/telink/prj.conf
@@ -32,9 +32,6 @@
 CONFIG_CHIP_OTA_REQUESTOR=n
 CONFIG_CHIP_DEVICE_SOFTWARE_VERSION=1
 
-# Enable CHIP pairing automatically on application start.
-CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
-
 # Disable CHIP shell support
 CONFIG_CHIP_LIB_SHELL=n
 
diff --git a/integrations/cloudbuild/chef.yaml b/integrations/cloudbuild/chef.yaml
index 5a7e98c..220d147 100644
--- a/integrations/cloudbuild/chef.yaml
+++ b/integrations/cloudbuild/chef.yaml
@@ -1,5 +1,5 @@
 steps:
-    - name: "ghcr.io/project-chip/chip-build-vscode:47"
+    - name: "ghcr.io/project-chip/chip-build-vscode:50"
       entrypoint: "bash"
       args:
           - "-c"
@@ -7,7 +7,7 @@
               git config --global --add safe.directory "*"
               python scripts/checkout_submodules.py --shallow --recursive --platform esp32 nrfconnect silabs linux android 
       id: Submodules
-    - name: "ghcr.io/project-chip/chip-build-vscode:47"
+    - name: "ghcr.io/project-chip/chip-build-vscode:50"
       # NOTE: silabs boostrap is NOT done with the rest as it requests a conflicting
       #       jinja2 version (asks for 3.1.3 when constraints.txt asks for 3.0.3)
       env:
@@ -23,7 +23,7 @@
           - name: pwenv
             path: /pwenv
       timeout: 900s
-    - name: "ghcr.io/project-chip/chip-build-vscode:47"
+    - name: "ghcr.io/project-chip/chip-build-vscode:50"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -38,7 +38,7 @@
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:47"
+    - name: "ghcr.io/project-chip/chip-build-vscode:50"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
diff --git a/integrations/cloudbuild/smoke-test.yaml b/integrations/cloudbuild/smoke-test.yaml
index de4d5d9..524e6d5 100644
--- a/integrations/cloudbuild/smoke-test.yaml
+++ b/integrations/cloudbuild/smoke-test.yaml
@@ -1,5 +1,5 @@
 steps:
-    - name: "ghcr.io/project-chip/chip-build-vscode:47"
+    - name: "ghcr.io/project-chip/chip-build-vscode:50"
       entrypoint: "bash"
       args:
           - "-c"
@@ -7,7 +7,7 @@
               git config --global --add safe.directory "*"
               python scripts/checkout_submodules.py --shallow --recursive --platform esp32 nrfconnect silabs linux android 
       id: Submodules
-    - name: "ghcr.io/project-chip/chip-build-vscode:47"
+    - name: "ghcr.io/project-chip/chip-build-vscode:50"
       # NOTE: silabs boostrap is NOT done with the rest as it requests a conflicting
       #       jinja2 version (asks for 3.1.3 when constraints.txt asks for 3.0.3)
       env:
@@ -24,7 +24,7 @@
             path: /pwenv
       timeout: 900s
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:47"
+    - name: "ghcr.io/project-chip/chip-build-vscode:50"
       id: ESP32
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -45,7 +45,7 @@
       volumes:
           - name: pwenv
             path: /pwenv
-    - name: "ghcr.io/project-chip/chip-build-vscode:47"
+    - name: "ghcr.io/project-chip/chip-build-vscode:50"
       id: NRFConnect
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -66,7 +66,7 @@
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:49"
+    - name: "ghcr.io/project-chip/chip-build-vscode:50"
       id: EFR32
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -88,7 +88,7 @@
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:47"
+    - name: "ghcr.io/project-chip/chip-build-vscode:50"
       id: Linux
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -141,7 +141,7 @@
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:47"
+    - name: "ghcr.io/project-chip/chip-build-vscode:50"
       id: Android
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
diff --git a/src/test_driver/tizen/README.md b/src/test_driver/tizen/README.md
index 1038925..ebf6fa2 100644
--- a/src/test_driver/tizen/README.md
+++ b/src/test_driver/tizen/README.md
@@ -12,7 +12,7 @@
 
 ```sh
 # Pull the image from hub.docker.com
-docker pull ghcr.io/project-chip/chip-build-tizen-qemu:47
+docker pull ghcr.io/project-chip/chip-build-tizen-qemu:50
 ```
 
 ## Building and Running Tests on QEMU
@@ -21,7 +21,7 @@
 
 ```sh
 docker run -it --rm --name chip-tizen-qemu \
-    ghcr.io/project-chip/chip-build-tizen-qemu:47 /bin/bash
+    ghcr.io/project-chip/chip-build-tizen-qemu:50 /bin/bash
 ```
 
 ### Clone the connectedhomeip repository