diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml
index eec8d06..8f04e49 100644
--- a/.github/workflows/bloat_check.yaml
+++ b/.github/workflows/bloat_check.yaml
@@ -33,7 +33,7 @@
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
 
         steps:
             - name: Checkout
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 30149e0..23dd3d3 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -40,7 +40,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -135,7 +135,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -283,7 +283,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -343,7 +343,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -451,7 +451,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml
index df9c05f..3432fdc 100644
--- a/.github/workflows/chef.yaml
+++ b/.github/workflows/chef.yaml
@@ -33,7 +33,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
             options: --user root
 
         steps:
@@ -54,7 +54,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:32
+            image: ghcr.io/project-chip/chip-build-esp32:35
             options: --user root
 
         steps:
@@ -75,7 +75,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-nrf-platform:32
+            image: ghcr.io/project-chip/chip-build-nrf-platform:35
             options: --user root
 
         steps:
@@ -96,7 +96,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-telink:32
+            image: ghcr.io/project-chip/chip-build-telink:35
             options: --user root
 
         steps:
@@ -108,7 +108,7 @@
                 platform: telink
             # - name: Update Zephyr to specific revision (for developers purpose)
             #   shell: bash
-            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py e6a32f41ccec55c2233631406842b71ff270089d"
+            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py b5c8028ec94f3efa69decff3a09f0d6f8a21fd6d"
             - name: CI Examples Telink
               shell: bash
               run: |
diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml
index 77bbfcd..e71ea87 100644
--- a/.github/workflows/cirque.yaml
+++ b/.github/workflows/cirque.yaml
@@ -40,7 +40,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:32
+        #             image: ghcr.io/project-chip/chip-build-cirque:35
         #             volumes:
         #                 - "/tmp:/tmp"
         #                 - "/dev/pts:/dev/pts"
diff --git a/.github/workflows/doxygen.yaml b/.github/workflows/doxygen.yaml
index 64d066f..13da9c2 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:32
+            image: ghcr.io/project-chip/chip-build-doxygen:35
 
         if: github.actor != 'restyled-io[bot]'
 
diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml
index 9ae90c8..a10f4a8 100644
--- a/.github/workflows/examples-ameba.yaml
+++ b/.github/workflows/examples-ameba.yaml
@@ -36,7 +36,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-ameba:32
+            image: ghcr.io/project-chip/chip-build-ameba:35
             options: --user root
 
         steps:
diff --git a/.github/workflows/examples-asr.yaml b/.github/workflows/examples-asr.yaml
index 50d833d..092f911 100644
--- a/.github/workflows/examples-asr.yaml
+++ b/.github/workflows/examples-asr.yaml
@@ -34,7 +34,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-asr:32
+            image: ghcr.io/project-chip/chip-build-asr:35
             options: --user root
 
         steps:
diff --git a/.github/workflows/examples-bouffalolab.yaml b/.github/workflows/examples-bouffalolab.yaml
index 2a2121c..ec90a39 100644
--- a/.github/workflows/examples-bouffalolab.yaml
+++ b/.github/workflows/examples-bouffalolab.yaml
@@ -35,7 +35,7 @@
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: ghcr.io/project-chip/chip-build-bouffalolab:32
+      image: ghcr.io/project-chip/chip-build-bouffalolab:35
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:
diff --git a/.github/workflows/examples-cc13x2x7_26x2x7.yaml b/.github/workflows/examples-cc13x2x7_26x2x7.yaml
index 6232831..3c86452 100644
--- a/.github/workflows/examples-cc13x2x7_26x2x7.yaml
+++ b/.github/workflows/examples-cc13x2x7_26x2x7.yaml
@@ -36,7 +36,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-ti:32
+            image: ghcr.io/project-chip/chip-build-ti:35
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-cc32xx.yaml b/.github/workflows/examples-cc32xx.yaml
index 7b88642..73f463b 100644
--- a/.github/workflows/examples-cc32xx.yaml
+++ b/.github/workflows/examples-cc32xx.yaml
@@ -37,7 +37,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-ti:32
+            image: ghcr.io/project-chip/chip-build-ti:35
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
index f3451e6..36c4909 100644
--- a/.github/workflows/examples-efr32.yaml
+++ b/.github/workflows/examples-efr32.yaml
@@ -38,7 +38,7 @@
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: ghcr.io/project-chip/chip-build-efr32:32
+      image: ghcr.io/project-chip/chip-build-efr32:35
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:
diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
index 2e5432d..e24492d 100644
--- a/.github/workflows/examples-esp32.yaml
+++ b/.github/workflows/examples-esp32.yaml
@@ -34,7 +34,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:32
+            image: ghcr.io/project-chip/chip-build-esp32:35
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -130,7 +130,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:32
+            image: ghcr.io/project-chip/chip-build-esp32:35
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml
index c9cfd0b..ff6f2e9 100644
--- a/.github/workflows/examples-infineon.yaml
+++ b/.github/workflows/examples-infineon.yaml
@@ -35,7 +35,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-infineon:32
+            image: ghcr.io/project-chip/chip-build-infineon:35
             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 41c41f5..a346bec 100644
--- a/.github/workflows/examples-linux-arm.yaml
+++ b/.github/workflows/examples-linux-arm.yaml
@@ -34,7 +34,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-crosscompile:32
+            image: ghcr.io/project-chip/chip-build-crosscompile:35
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-linux-imx.yaml b/.github/workflows/examples-linux-imx.yaml
index e065fd3..f6fee89 100644
--- a/.github/workflows/examples-linux-imx.yaml
+++ b/.github/workflows/examples-linux-imx.yaml
@@ -34,7 +34,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-imx:32
+            image: ghcr.io/project-chip/chip-build-imx:35
 
         steps:
             - name: Checkout
diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml
index 951164e..ad1dc34 100644
--- a/.github/workflows/examples-linux-standalone.yaml
+++ b/.github/workflows/examples-linux-standalone.yaml
@@ -34,7 +34,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml
index ae444f5..54d33b9 100644
--- a/.github/workflows/examples-mbed.yaml
+++ b/.github/workflows/examples-mbed.yaml
@@ -40,7 +40,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-mbed-os:32
+            image: ghcr.io/project-chip/chip-build-mbed-os:35
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-mw320.yaml b/.github/workflows/examples-mw320.yaml
index 369eeb8..d0e7ce3 100644
--- a/.github/workflows/examples-mw320.yaml
+++ b/.github/workflows/examples-mw320.yaml
@@ -37,7 +37,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml
index 88c84d7..64bb5a3 100644
--- a/.github/workflows/examples-nrfconnect.yaml
+++ b/.github/workflows/examples-nrfconnect.yaml
@@ -37,7 +37,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-nrf-platform:32
+            image: ghcr.io/project-chip/chip-build-nrf-platform:35
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-openiotsdk.yaml b/.github/workflows/examples-openiotsdk.yaml
index eb14201..254e568 100644
--- a/.github/workflows/examples-openiotsdk.yaml
+++ b/.github/workflows/examples-openiotsdk.yaml
@@ -38,7 +38,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-openiotsdk:32
+            image: ghcr.io/project-chip/chip-build-openiotsdk:35
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
             options: --privileged
diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml
index b5aadaf..e012eb9 100644
--- a/.github/workflows/examples-qpg.yaml
+++ b/.github/workflows/examples-qpg.yaml
@@ -37,7 +37,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-stm32.yaml b/.github/workflows/examples-stm32.yaml
index 2e261c6..84442f8 100644
--- a/.github/workflows/examples-stm32.yaml
+++ b/.github/workflows/examples-stm32.yaml
@@ -38,7 +38,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
index a7b717d..9131b39 100644
--- a/.github/workflows/examples-telink.yaml
+++ b/.github/workflows/examples-telink.yaml
@@ -36,7 +36,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-telink:32
+            image: ghcr.io/project-chip/chip-build-telink:35
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -55,7 +55,7 @@
                 gh-context: ${{ toJson(github) }}
 
             # - name: Update Zephyr to specific revision (for developers purpose)
-            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py e6a32f41ccec55c2233631406842b71ff270089d"
+            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py b5c8028ec94f3efa69decff3a09f0d6f8a21fd6d"
 
             - name: Build example Telink (B92 retention) Air Quality Sensor App
               run: |
@@ -175,13 +175,13 @@
             - name: clean out build output
               run: rm -rf ./out
 
-            - name: Build example Telink (B92) Pump App
+            - name: Build example Telink (B95 retention) Pump App
               run: |
                   ./scripts/run_in_build_env.sh \
-                    "./scripts/build/build_examples.py --target 'telink-tlsr9528a-pump' build"
+                    "./scripts/build/build_examples.py --target 'telink-tlsr9258a_retention-pump' build"
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    telink tlsr9528a pump-app \
-                    out/telink-tlsr9528a-pump/zephyr/zephyr.elf \
+                    telink tlsr9258a_retention pump-app \
+                    out/telink-tlsr9258a_retention-pump/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
 
             - name: clean out build output
@@ -199,9 +199,6 @@
             - name: clean out build output
               run: rm -rf ./out
 
-            - name: clean out build output
-              run: rm -rf ./out
-
             - name: Build example Telink (B91) Shell App
               run: |
                   ./scripts/run_in_build_env.sh \
@@ -250,13 +247,13 @@
             - name: clean out build output
               run: rm -rf ./out
 
-            - name: Build example Telink (B91) Window Covering App
+            - name: Build example Telink (B95) Window Covering App
               run: |
                   ./scripts/run_in_build_env.sh \
-                    "./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-window-covering' build"
+                    "./scripts/build/build_examples.py --target 'telink-tlsr9258a-window-covering' build"
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    telink tlsr9518adk80d window-covering \
-                    out/telink-tlsr9518adk80d-window-covering/zephyr/zephyr.elf \
+                    telink tlsr9258a window-covering \
+                    out/telink-tlsr9258a-window-covering/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
 
             - name: clean out build output
diff --git a/.github/workflows/examples-tizen.yaml b/.github/workflows/examples-tizen.yaml
index 55be230..a289e15 100644
--- a/.github/workflows/examples-tizen.yaml
+++ b/.github/workflows/examples-tizen.yaml
@@ -34,7 +34,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-tizen:32
+            image: ghcr.io/project-chip/chip-build-tizen:35
             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 96f6652..f7a14d1 100644
--- a/.github/workflows/full-android.yaml
+++ b/.github/workflows/full-android.yaml
@@ -36,7 +36,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-android:32
+            image: ghcr.io/project-chip/chip-build-android:35
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml
index 7a628ca..3410979 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:32
+            image: ghcr.io/project-chip/chip-build:35
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/issue-labeler.yaml b/.github/workflows/issue-labeler.yaml
index 8c3df4c..a92a4c2 100644
--- a/.github/workflows/issue-labeler.yaml
+++ b/.github/workflows/issue-labeler.yaml
@@ -14,7 +14,7 @@
     - uses: github/issue-labeler@v3.4 #May not be the latest version
       with:
         configuration-path: .github/issue-labeler.yml
-        not-before: 2020-01-15T02:54:32Z
+        not-before: 2020-01-15T02:54:34Z
         enable-versioned-regex: 0
         sync-labels: 1
         repo-token: ${{ github.token }}
\ No newline at end of file
diff --git a/.github/workflows/java-tests.yaml b/.github/workflows/java-tests.yaml
index 9d16e3f..f19d451 100644
--- a/.github/workflows/java-tests.yaml
+++ b/.github/workflows/java-tests.yaml
@@ -40,7 +40,7 @@
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-java:32
+            image: ghcr.io/project-chip/chip-build-java:35
             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 3f02c22..29a3dc8 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -29,7 +29,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
 
         steps:
             - name: Checkout
diff --git a/.github/workflows/minimal-build.yaml b/.github/workflows/minimal-build.yaml
index d9c8c75..189c8db 100644
--- a/.github/workflows/minimal-build.yaml
+++ b/.github/workflows/minimal-build.yaml
@@ -31,7 +31,7 @@
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-minimal:32
+            image: ghcr.io/project-chip/chip-build-minimal:35
 
         steps:
             - name: Checkout
diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml
index 0281069..c499295 100644
--- a/.github/workflows/qemu.yaml
+++ b/.github/workflows/qemu.yaml
@@ -38,7 +38,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32-qemu:32
+            image: ghcr.io/project-chip/chip-build-esp32-qemu:35
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
@@ -76,7 +76,7 @@
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-tizen-qemu:32
+            image: ghcr.io/project-chip/chip-build-tizen-qemu:35
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml
index 223a736..c82e9f5 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:32
+            image: ghcr.io/project-chip/chip-build-esp32:35
 
         steps:
             - name: Checkout
@@ -68,7 +68,7 @@
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-efr32:32
+            image: ghcr.io/project-chip/chip-build-efr32:35
         steps:
             - name: Checkout
               uses: actions/checkout@v4
diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml
index 2e585a7..396fb3a 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:32
+            image: ghcr.io/project-chip/chip-build-android:35
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 61db68f..38d05c5 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -47,7 +47,7 @@
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
 
@@ -422,7 +422,7 @@
             TSAN_OPTIONS: "halt_on_error=1 suppressions=scripts/tests/chiptest/tsan-linux-suppressions.txt"
 
         if: github.actor != 'restyled-io[bot]'
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-latest:35
 
         container:
             image: ghcr.io/project-chip/chip-build:32
diff --git a/.github/workflows/unit_integration_test.yaml b/.github/workflows/unit_integration_test.yaml
index 4272777..f1be1a1 100644
--- a/.github/workflows/unit_integration_test.yaml
+++ b/.github/workflows/unit_integration_test.yaml
@@ -37,7 +37,7 @@
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml
index 302adc7..a0ab365 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:32
+            image: ghcr.io/project-chip/chip-build:35
         defaults:
             run:
                 shell: sh
diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml
index 122ae0f..cb8bff6 100644
--- a/.github/workflows/zap_templates.yaml
+++ b/.github/workflows/zap_templates.yaml
@@ -32,7 +32,7 @@
 
         runs-on: ubuntu-20.04
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
         defaults:
             run:
                 shell: sh
diff --git a/config/telink/chip-module/Kconfig.defaults b/config/telink/chip-module/Kconfig.defaults
index 0a71d5a..964b085 100644
--- a/config/telink/chip-module/Kconfig.defaults
+++ b/config/telink/chip-module/Kconfig.defaults
@@ -158,7 +158,7 @@
 endchoice
 
 # Board retention config
-if BOARD_TLSR9528A_RETENTION || BOARD_TLSR9518ADK80D_RETENTION
+if BOARD_TLSR9528A_RETENTION || BOARD_TLSR9258A_RETENTION || BOARD_TLSR9518ADK80D_RETENTION 
 config BOARD_TLSR9X_NON_RETENTION_RAM_CODE
     default y if PM
 
@@ -170,7 +170,7 @@
 endif
 
 # Board non-retention config
-if BOARD_TLSR9528A || BOARD_TLSR9518ADK80D
+if BOARD_TLSR9528A || BOARD_TLSR9258A || BOARD_TLSR9518ADK80D
 config PWM
     default y
 endif
diff --git a/docs/examples/index.md b/docs/examples/index.md
index 0162a25..2c9a0a4 100644
--- a/docs/examples/index.md
+++ b/docs/examples/index.md
@@ -19,7 +19,6 @@
 :maxdepth: 1
 
 all-clusters-app/**/README
-all-clusters-app/**/Readme
 ```
 
 ## All clusters minimal example
@@ -29,7 +28,6 @@
 :maxdepth: 1
 
 all-clusters-minimal-app/**/README
-all-clusters-minimal-app/**/Readme
 ```
 
 ## Bridge example
@@ -178,7 +176,6 @@
 :maxdepth: 1
 
 ota-requestor-app/**/README
-ota-requestor-app/**/Readme
 ```
 
 ## Persistent storage example
@@ -282,7 +279,6 @@
 :maxdepth: 1
 
 thermostat/**/README
-thermostat/**/Readme
 thermostat/qpg/APPLICATION
 ```
 
diff --git a/examples/air-quality-sensor-app/telink/README.md b/examples/air-quality-sensor-app/telink/README.md
index f91c701..015e613 100644
--- a/examples/air-quality-sensor-app/telink/README.md
+++ b/examples/air-quality-sensor-app/telink/README.md
@@ -25,14 +25,14 @@
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
-   example, `tlsr9518adk80d` or `tlsr9528a`):
+   example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`):
 
     ```bash
     $ west build -b <build_target>
     ```
 
     Also use key `-DFLASH_SIZE`, if your board has memory size different from 2
-    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`:
+    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`:
 
     ```bash
     $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m
diff --git a/examples/all-clusters-app/ameba/README.md b/examples/all-clusters-app/ameba/README.md
index 34fe805..2689f97 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:32
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:35
 
 -   Run docker container:
 
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:32
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:35
 
 -   Setup build environment:
 
diff --git a/examples/all-clusters-app/telink/Readme.md b/examples/all-clusters-app/telink/README.md
similarity index 98%
rename from examples/all-clusters-app/telink/Readme.md
rename to examples/all-clusters-app/telink/README.md
index b8f5b95..a553248 100644
--- a/examples/all-clusters-app/telink/Readme.md
+++ b/examples/all-clusters-app/telink/README.md
@@ -27,14 +27,14 @@
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
-   example, `tlsr9518adk80d` or `tlsr9528a`):
+   example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`):
 
     ```bash
     $ west build -b <build_target>
     ```
 
     Also use key `-DFLASH_SIZE`, if your board has memory size different from 2
-    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`:
+    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`:
 
     ```bash
     $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m
diff --git a/examples/all-clusters-minimal-app/ameba/README.md b/examples/all-clusters-minimal-app/ameba/README.md
index 27e2e0e..693b06c 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:32
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:35
           ```
 
 -   Run docker container:
 
           ```
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:32
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:35
           ```
 
 -   Setup build environment:
diff --git a/examples/all-clusters-minimal-app/telink/Readme.md b/examples/all-clusters-minimal-app/telink/README.md
similarity index 97%
rename from examples/all-clusters-minimal-app/telink/Readme.md
rename to examples/all-clusters-minimal-app/telink/README.md
index 601fc52..8e18bf4 100644
--- a/examples/all-clusters-minimal-app/telink/Readme.md
+++ b/examples/all-clusters-minimal-app/telink/README.md
@@ -27,14 +27,14 @@
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
-   example, `tlsr9518adk80d` or `tlsr9528a`):
+   example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`):
 
     ```bash
     $ west build -b <build_target>
     ```
 
     Also use key `-DFLASH_SIZE`, if your board has memory size different from 2
-    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`:
+    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`:
 
     ```bash
     $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m
diff --git a/examples/bridge-app/telink/README.md b/examples/bridge-app/telink/README.md
index 1e24fc7..f23d2ae 100644
--- a/examples/bridge-app/telink/README.md
+++ b/examples/bridge-app/telink/README.md
@@ -104,14 +104,14 @@
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
-   example, `tlsr9518adk80d` or `tlsr9528a`):
+   example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`):
 
     ```bash
     $ west build -b <build_target>
     ```
 
     Also use key `-DFLASH_SIZE`, if your board has memory size different from 2
-    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`:
+    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`:
 
     ```bash
     $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m
diff --git a/examples/contact-sensor-app/telink/README.md b/examples/contact-sensor-app/telink/README.md
index 370ffbd..9b6a59b 100755
--- a/examples/contact-sensor-app/telink/README.md
+++ b/examples/contact-sensor-app/telink/README.md
@@ -25,14 +25,14 @@
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
-   example, `tlsr9518adk80d` or `tlsr9528a`):
+   example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`):
 
     ```bash
     $ west build -b <build_target>
     ```
 
     Also use key `-DFLASH_SIZE`, if your board has memory size different from 2
-    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`:
+    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`:
 
     ```bash
     $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m
diff --git a/examples/light-switch-app/ameba/README.md b/examples/light-switch-app/ameba/README.md
index a14e504..3c38ac3 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:32
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:35
 
 -   Run docker container:
 
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:32
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:35
 
 -   Setup build environment:
 
diff --git a/examples/light-switch-app/telink/README.md b/examples/light-switch-app/telink/README.md
index 562be75..d6ba4b3 100755
--- a/examples/light-switch-app/telink/README.md
+++ b/examples/light-switch-app/telink/README.md
@@ -30,14 +30,14 @@
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
-   example, `tlsr9518adk80d` or `tlsr9528a`):
+   example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`):
 
     ```bash
     $ west build -b <build_target>
     ```
 
     Also use key `-DFLASH_SIZE`, if your board has memory size different from 2
-    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`:
+    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`:
 
     ```bash
     $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m
diff --git a/examples/lighting-app/ameba/README.md b/examples/lighting-app/ameba/README.md
index 61defcb..b7a1a2a 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:32
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:35
 
 -   Run docker container:
 
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:32
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:35
 
 -   Setup build environment:
 
diff --git a/examples/lighting-app/telink/README.md b/examples/lighting-app/telink/README.md
index 278dfad..2f69617 100644
--- a/examples/lighting-app/telink/README.md
+++ b/examples/lighting-app/telink/README.md
@@ -28,14 +28,14 @@
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
-   example, `tlsr9518adk80d` or `tlsr9528a`):
+   example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`):
 
     ```bash
     $ west build -b <build_target>
     ```
 
     Also use key `-DFLASH_SIZE`, if your board has memory size different from 2
-    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`:
+    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`:
 
     ```bash
     $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m
diff --git a/examples/lock-app/telink/README.md b/examples/lock-app/telink/README.md
index 4d20388..27a95ba 100755
--- a/examples/lock-app/telink/README.md
+++ b/examples/lock-app/telink/README.md
@@ -28,14 +28,14 @@
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
-   example, `tlsr9518adk80d` or `tlsr9528a`):
+   example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`):
 
     ```bash
     $ west build -b <build_target>
     ```
 
     Also use key `-DFLASH_SIZE`, if your board has memory size different from 2
-    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`:
+    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`:
 
     ```bash
     $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m
diff --git a/examples/ota-requestor-app/ameba/README.md b/examples/ota-requestor-app/ameba/README.md
index ae871c2..7656065 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:32
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:35
 
 -   Run docker container:
 
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:32
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:35
 
 -   Setup build environment:
 
diff --git a/examples/ota-requestor-app/telink/Readme.md b/examples/ota-requestor-app/telink/README.md
similarity index 97%
rename from examples/ota-requestor-app/telink/Readme.md
rename to examples/ota-requestor-app/telink/README.md
index bf58651..81870b7 100755
--- a/examples/ota-requestor-app/telink/Readme.md
+++ b/examples/ota-requestor-app/telink/README.md
@@ -21,14 +21,14 @@
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
-   example, `tlsr9518adk80d` or `tlsr9528a`):
+   example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`):
 
     ```bash
     $ west build -b <build_target>
     ```
 
     Also use key `-DFLASH_SIZE`, if your board has memory size different from 2
-    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`:
+    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`:
 
     ```bash
     $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m
diff --git a/examples/pigweed-app/ameba/README.md b/examples/pigweed-app/ameba/README.md
index 55b600e..794db6b 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:32
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:35
 
 -   Run docker container:
 
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:32
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:35
 
 -   Setup build environment:
 
diff --git a/examples/pump-app/telink/README.md b/examples/pump-app/telink/README.md
index 4d67799..487833f 100755
--- a/examples/pump-app/telink/README.md
+++ b/examples/pump-app/telink/README.md
@@ -29,14 +29,14 @@
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
-   example, `tlsr9518adk80d` or `tlsr9528a`):
+   example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`):
 
     ```bash
     $ west build -b <build_target>
     ```
 
     Also use key `-DFLASH_SIZE`, if your board has memory size different from 2
-    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`:
+    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`:
 
     ```bash
     $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m
diff --git a/examples/pump-controller-app/telink/README.md b/examples/pump-controller-app/telink/README.md
index 6e3fa7e..5a9e955 100755
--- a/examples/pump-controller-app/telink/README.md
+++ b/examples/pump-controller-app/telink/README.md
@@ -30,14 +30,14 @@
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
-   example, `tlsr9518adk80d` or `tlsr9528a`):
+   example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`):
 
     ```bash
     $ west build -b <build_target>
     ```
 
     Also use key `-DFLASH_SIZE`, if your board has memory size different from 2
-    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`:
+    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`:
 
     ```bash
     $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m
diff --git a/examples/shell/telink/README.md b/examples/shell/telink/README.md
index 744a049..aa70230 100755
--- a/examples/shell/telink/README.md
+++ b/examples/shell/telink/README.md
@@ -25,14 +25,14 @@
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
-   example, `tlsr9518adk80d` or `tlsr9528a`):
+   example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`):
 
     ```bash
     $ west build -b <build_target>
     ```
 
     Also use key `-DFLASH_SIZE`, if your board has memory size different from 2
-    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`:
+    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`:
 
     ```bash
     $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m
diff --git a/examples/smoke-co-alarm-app/telink/README.md b/examples/smoke-co-alarm-app/telink/README.md
index 71fc7af..7f7138a 100755
--- a/examples/smoke-co-alarm-app/telink/README.md
+++ b/examples/smoke-co-alarm-app/telink/README.md
@@ -25,14 +25,14 @@
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
-   example, `tlsr9518adk80d` or `tlsr9528a`):
+   example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`):
 
     ```bash
     $ west build -b <build_target>
     ```
 
     Also use key `-DFLASH_SIZE`, if your board has memory size different from 2
-    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`:
+    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`:
 
     ```bash
     $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m
diff --git a/examples/temperature-measurement-app/telink/README.md b/examples/temperature-measurement-app/telink/README.md
index 77558a8..6f14772 100644
--- a/examples/temperature-measurement-app/telink/README.md
+++ b/examples/temperature-measurement-app/telink/README.md
@@ -29,14 +29,14 @@
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
-   example, `tlsr9518adk80d` or `tlsr9528a`):
+   example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`):
 
     ```bash
     $ west build -b <build_target>
     ```
 
     Also use key `-DFLASH_SIZE`, if your board has memory size different from 2
-    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`:
+    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`:
 
     ```bash
     $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m
diff --git a/examples/thermostat/telink/Readme.md b/examples/thermostat/telink/README.md
similarity index 97%
rename from examples/thermostat/telink/Readme.md
rename to examples/thermostat/telink/README.md
index ca93b6b..85a98d8 100755
--- a/examples/thermostat/telink/Readme.md
+++ b/examples/thermostat/telink/README.md
@@ -25,14 +25,14 @@
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
-   example, `tlsr9518adk80d` or `tlsr9528a`):
+   example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`):
 
     ```bash
     $ west build -b <build_target>
     ```
 
     Also use key `-DFLASH_SIZE`, if your board has memory size different from 2
-    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`:
+    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`:
 
     ```bash
     $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m
diff --git a/examples/window-app/telink/README.md b/examples/window-app/telink/README.md
index 28dcc9a..c5500aa 100644
--- a/examples/window-app/telink/README.md
+++ b/examples/window-app/telink/README.md
@@ -28,14 +28,14 @@
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
-   example, `tlsr9518adk80d` or `tlsr9528a`):
+   example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`):
 
     ```bash
     $ west build -b <build_target>
     ```
 
     Also use key `-DFLASH_SIZE`, if your board has memory size different from 2
-    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`:
+    MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`:
 
     ```bash
     $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m
diff --git a/integrations/cloudbuild/build-all.yaml b/integrations/cloudbuild/build-all.yaml
index e2e46c0..6590630 100644
--- a/integrations/cloudbuild/build-all.yaml
+++ b/integrations/cloudbuild/build-all.yaml
@@ -6,7 +6,7 @@
           - "--init"
           - "--recursive"
       id: Submodules
-    - name: "ghcr.io/project-chip/chip-build-vscode:32"
+    - name: "ghcr.io/project-chip/chip-build-vscode:35"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -21,7 +21,7 @@
             path: /pwenv
       timeout: 900s
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:32"
+    - name: "ghcr.io/project-chip/chip-build-vscode:35"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -85,7 +85,7 @@
               --target k32w-shell
               build
               --create-archives /workspace/artifacts/
-    - name: "ghcr.io/project-chip/chip-build-vscode:32"
+    - name: "ghcr.io/project-chip/chip-build-vscode:35"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
diff --git a/integrations/cloudbuild/chef.yaml b/integrations/cloudbuild/chef.yaml
index a29ddb1..432308a 100644
--- a/integrations/cloudbuild/chef.yaml
+++ b/integrations/cloudbuild/chef.yaml
@@ -1,5 +1,5 @@
 steps:
-    - name: "ghcr.io/project-chip/chip-build-vscode:32"
+    - name: "ghcr.io/project-chip/chip-build-vscode:35"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -12,7 +12,7 @@
             path: /pwenv
       timeout: 2700s
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:32"
+    - name: "ghcr.io/project-chip/chip-build-vscode:35"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -27,7 +27,7 @@
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:32"
+    - name: "ghcr.io/project-chip/chip-build-vscode:35"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
diff --git a/integrations/cloudbuild/smoke-test.yaml b/integrations/cloudbuild/smoke-test.yaml
index bae7c4b..f05bbd0 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:32"
+    - name: "ghcr.io/project-chip/chip-build-vscode:35"
       entrypoint: "bash"
       args:
           - "-c"
@@ -7,7 +7,7 @@
               git config --global --add safe.directory "*"
               git submodule update --init --recursive
       id: Submodules
-    - name: "ghcr.io/project-chip/chip-build-vscode:32"
+    - name: "ghcr.io/project-chip/chip-build-vscode:35"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -22,7 +22,7 @@
             path: /pwenv
       timeout: 900s
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:32"
+    - name: "ghcr.io/project-chip/chip-build-vscode:35"
       id: ESP32
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -43,7 +43,7 @@
       volumes:
           - name: pwenv
             path: /pwenv
-    - name: "ghcr.io/project-chip/chip-build-vscode:32"
+    - name: "ghcr.io/project-chip/chip-build-vscode:35"
       id: NRFConnect
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -64,7 +64,7 @@
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:32"
+    - name: "ghcr.io/project-chip/chip-build-vscode:35"
       id: EFR32
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -86,7 +86,7 @@
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:32"
+    - name: "ghcr.io/project-chip/chip-build-vscode:35"
       id: Linux
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -139,7 +139,7 @@
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:32"
+    - name: "ghcr.io/project-chip/chip-build-vscode:35"
       id: Android
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py
index e8241e0..771c92b 100755
--- a/scripts/build/build/targets.py
+++ b/scripts/build/build/targets.py
@@ -715,6 +715,8 @@
         TargetPart('tlsr9518adk80d', board=TelinkBoard.TLSR9518ADK80D),
         TargetPart('tlsr9528a', board=TelinkBoard.TLSR9528A),
         TargetPart('tlsr9528a_retention', board=TelinkBoard.TLSR9528A_RETENTION),
+        TargetPart('tlsr9258a', board=TelinkBoard.TLSR9258A),
+        TargetPart('tlsr9258a_retention', board=TelinkBoard.TLSR9258A_RETENTION),
     ])
 
     target.AppendFixedTargets([
diff --git a/scripts/build/builders/telink.py b/scripts/build/builders/telink.py
index 4eb7b3f..9160c04 100644
--- a/scripts/build/builders/telink.py
+++ b/scripts/build/builders/telink.py
@@ -117,6 +117,8 @@
     TLSR9518ADK80D = auto()
     TLSR9528A = auto()
     TLSR9528A_RETENTION = auto()
+    TLSR9258A = auto()
+    TLSR9258A_RETENTION = auto()
 
     def GnArgName(self):
         if self == TelinkBoard.TLSR9518ADK80D:
@@ -125,6 +127,10 @@
             return 'tlsr9528a'
         elif self == TelinkBoard.TLSR9528A_RETENTION:
             return 'tlsr9528a_retention'
+        elif self == TelinkBoard.TLSR9258A:
+            return 'tlsr9258a'
+        elif self == TelinkBoard.TLSR9258A_RETENTION:
+            return 'tlsr9258a_retention'
         else:
             raise Exception('Unknown board type: %r' % self)
 
diff --git a/scripts/build/testdata/all_targets_linux_x64.txt b/scripts/build/testdata/all_targets_linux_x64.txt
index c400af2..6a0b733 100644
--- a/scripts/build/testdata/all_targets_linux_x64.txt
+++ b/scripts/build/testdata/all_targets_linux_x64.txt
@@ -22,5 +22,5 @@
 qpg-qpg6105-{lock,light,shell,persistent-storage,light-switch,thermostat}[-updateimage]
 stm32-stm32wb5mm-dk-light
 tizen-arm-{all-clusters,all-clusters-minimal,chip-tool,light,tests}[-no-ble][-no-thread][-no-wifi][-asan][-ubsan][-with-ui]
-telink-{tlsr9518adk80d,tlsr9528a,tlsr9528a_retention}-{air-quality-sensor,all-clusters,all-clusters-minimal,bridge,contact-sensor,light,light-switch,lock,ota-requestor,pump,pump-controller,shell,smoke-co-alarm,temperature-measurement,thermostat,window-covering}[-ota][-dfu][-shell][-rpc][-factory-data][-4mb][-mars]
+telink-{tlsr9518adk80d,tlsr9528a,tlsr9528a_retention,tlsr9258a,tlsr9258a_retention}-{air-quality-sensor,all-clusters,all-clusters-minimal,bridge,contact-sensor,light,light-switch,lock,ota-requestor,pump,pump-controller,shell,smoke-co-alarm,temperature-measurement,thermostat,window-covering}[-ota][-dfu][-shell][-rpc][-factory-data][-4mb][-mars]
 openiotsdk-{shell,lock}[-mbedtls][-psa]
diff --git a/scripts/tools/telink/update_zephyr.py b/scripts/tools/telink/update_zephyr.py
index 5c133f0..fe735df 100755
--- a/scripts/tools/telink/update_zephyr.py
+++ b/scripts/tools/telink/update_zephyr.py
@@ -39,6 +39,9 @@
 
         args = parser.parse_args()
 
+        command = ['git', '-C', zephyr_base, 'fetch']
+        subprocess.run(command, check=True)
+
         command = ['git', '-C', zephyr_base, 'reset', args.hash, '--hard']
         subprocess.run(command, check=True)
 
diff --git a/src/platform/telink/tlsr9258a.overlay b/src/platform/telink/tlsr9258a.overlay
new file mode 100644
index 0000000..b300411
--- /dev/null
+++ b/src/platform/telink/tlsr9258a.overlay
@@ -0,0 +1,79 @@
+/ {
+	aliases {
+		system-state-led = &led_red;
+		pwm-led0 = &pwm_led0;
+		pwm-led1 = &pwm_led1;
+		pwm-led2 = &pwm_led2;
+		pwm-led3 = &pwm_led3;
+	};
+
+	pwm_leds {
+		/delete-node/ pwm_led_0;
+		pwm_led0: pwm_led_0 {
+			pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
+			label = "PWM LED Blue";
+		};
+		pwm_led1: pwm_led_1 {
+			pwms = <&pwm0 3 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
+			label = "PWM LED Green";
+		};
+		pwm_led2: pwm_led_2 {
+			pwms = <&pwm0 2 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
+			label = "PWM LED Red";
+		};
+		pwm_led3: pwm_led_3 {
+			pwms = <&pwm0 1 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
+			label = "PWM IDENTIFY LED Green";
+	    };
+    };
+
+	keys {
+		/delete-node/ button_1;
+		/delete-node/ button_3;
+		compatible = "gpio-keys";
+		key_1: button_1 {
+			gpios = <&gpiod 2 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+		};
+		key_2: button_2 {
+			gpios = <&gpiod 7 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+		};
+		key_3: button_3 {
+			gpios = <&gpiod 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+		};
+		key_4: button_4 {
+			gpios = <&gpiof 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+		};
+
+		key_matrix_col1: key_matrix_col1 {
+			gpios = <&gpiod 6 GPIO_ACTIVE_HIGH>;
+		};
+		key_matrix_col2: key_matrix_col2 {
+			gpios = <&gpiof 6 GPIO_ACTIVE_HIGH>;
+		};
+		key_matrix_row1: key_matrix_row1 {
+			gpios = <&gpiod 2 GPIO_PULL_DOWN>;
+		};
+		key_matrix_row2: key_matrix_row2 {
+			gpios = <&gpiod 7 GPIO_PULL_DOWN>;
+		};
+	};
+};
+
+&pinctrl {
+	pwm_ch0_pd0_default: pwm_ch0_pd0_default {
+		pinmux = <B9x_PINMUX_SET(B9x_PORT_D, B9x_PIN_0, B95_FUNC_PWM0)>;
+	};
+	pwm_ch1_pd1_default: pwm_ch1_pd1_default {
+		pinmux = <B9x_PINMUX_SET(B9x_PORT_D, B9x_PIN_1, B95_FUNC_PWM1)>;
+	};
+	pwm_ch2_pe2_default: pwm_ch2_pe2_default {
+		pinmux = <B9x_PINMUX_SET(B9x_PORT_E, B9x_PIN_2, B95_FUNC_PWM2)>;
+	};
+	pwm_ch3_pe0_default: pwm_ch3_pe0_default {
+		pinmux = <B9x_PINMUX_SET(B9x_PORT_E, B9x_PIN_0, B95_FUNC_PWM3)>;
+	};
+};
+
+&pwm0 {
+	pinctrl-0 = <&pwm_ch0_pd0_default &pwm_ch1_pd1_default &pwm_ch2_pe2_default &pwm_ch3_pe0_default>;
+};
diff --git a/src/platform/telink/tlsr9258a_retention.overlay b/src/platform/telink/tlsr9258a_retention.overlay
new file mode 100644
index 0000000..98a0e5a
--- /dev/null
+++ b/src/platform/telink/tlsr9258a_retention.overlay
@@ -0,0 +1,55 @@
+/ {
+	/*
+	 * There is no way to keep GPIOs
+	 * during deep-sleep mode so output GPIOs
+	 * and PWM's are useless.
+	 */
+
+	aliases {
+		/delete-property/ led0;
+		/delete-property/ led1;
+		/delete-property/ led2;
+		/delete-property/ led3;
+		/delete-property/ mcuboot-led0;
+		/delete-property/ pwm-led0;
+		/delete-property/ pwm-0;
+	};
+
+	/delete-node/ leds;
+	/delete-node/ pwm_leds;
+
+	keys {
+		/delete-node/ button_1;
+		/delete-node/ button_3;
+		compatible = "gpio-keys";
+		key_1: button_1 {
+			gpios = <&gpiod 2 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+		};
+		key_2: button_2 {
+			gpios = <&gpiod 7 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+		};
+		key_3: button_3 {
+			gpios = <&gpiod 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+		};
+		key_4: button_4 {
+			gpios = <&gpiof 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+		};
+
+		key_matrix_col1: key_matrix_col1 {
+			gpios = <&gpiod 6 GPIO_ACTIVE_HIGH>;
+		};
+		key_matrix_col2: key_matrix_col2 {
+			gpios = <&gpiof 6 GPIO_ACTIVE_HIGH>;
+		};
+		key_matrix_row1: key_matrix_row1 {
+			gpios = <&gpiod 2 GPIO_PULL_DOWN>;
+		};
+		key_matrix_row2: key_matrix_row2 {
+			gpios = <&gpiod 7 GPIO_PULL_DOWN>;
+		};
+	};
+};
+
+&pwm0 {
+	status = "disabled";
+};
diff --git a/src/test_driver/tizen/README.md b/src/test_driver/tizen/README.md
index 1c6ad4e..559b756 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:32
+docker pull ghcr.io/project-chip/chip-build-tizen-qemu:35
 ```
 
 ## 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:32 /bin/bash
+    ghcr.io/project-chip/chip-build-tizen-qemu:35 /bin/bash
 ```
 
 ### Clone the connectedhomeip repository