diff --git a/.github/workflows/full-esp32.yaml b/.github/workflows/examples-esp32.yaml
similarity index 80%
rename from .github/workflows/full-esp32.yaml
rename to .github/workflows/examples-esp32.yaml
index 977cc328ef38ed..cff76ce978a5b8 100644
--- a/.github/workflows/full-esp32.yaml
+++ b/.github/workflows/examples-esp32.yaml
@@ -12,20 +12,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: Full builds - ESP32
+name: Build example - ESP32
 
 on:
     push:
-    workflow_dispatch:
+    pull_request:
 
 concurrency:
-    group: full-${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
+    group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
     cancel-in-progress: true
   
 jobs:
+    # TODO ESP32 https://github.com/project-chip/connectedhomeip/issues/1510
     esp32:
-        name: Run
-        timeout-minutes: 200 
+        name: ESP32
+        timeout-minutes: 80
 
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
@@ -96,6 +97,44 @@ jobs:
               timeout-minutes: 10
               run: scripts/examples/esp_example.sh lock-app sdkconfig.defaults
 
+            - name: Uploading Size Reports
+              uses: actions/upload-artifact@v2
+              if: ${{ !env.ACT }}
+              with:
+                  name: Size,ESP32-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}
+                  path: /tmp/bloat_reports/
+
+    esp32_1:
+        name: ESP32_1
+        timeout-minutes: 70
+
+        runs-on: ubuntu-latest
+        if: github.actor != 'restyled-io[bot]'
+
+        container:
+            image: connectedhomeip/chip-build-esp32:0.5.56
+            volumes:
+                - "/tmp/bloat_reports:/tmp/bloat_reports"
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+              with:
+                  submodules: true
+
+            - name: Bootstrap
+              timeout-minutes: 10
+              run: scripts/build/gn_bootstrap.sh
+
+            - name: Uploading bootstrap logs
+              uses: actions/upload-artifact@v2
+              if: ${{ always() }} && ${{ !env.ACT }}
+              with:
+                  name: bootstrap-logs
+                  path: |
+                   .environment/gn_out/.ninja_log
+                   .environment/pigweed-venv/*.log
+
             - name: Build example Bridge App
               timeout-minutes: 10
               run: scripts/examples/esp_example.sh bridge-app
@@ -123,11 +162,3 @@ jobs:
             - name: Build example OTA Provider App
               run: scripts/examples/esp_example.sh ota-provider-app sdkconfig.defaults
               timeout-minutes: 10
-
-            - name: Uploading Size Reports
-              uses: actions/upload-artifact@v2
-              if: ${{ !env.ACT }}
-              with:
-                  name: Size,ESP32-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}
-                  path: /tmp/bloat_reports/
-
diff --git a/.github/workflows/smoketest-esp32.yaml b/.github/workflows/smoketest-esp32.yaml
deleted file mode 100644
index 18aad28eeb0cff..00000000000000
--- a/.github/workflows/smoketest-esp32.yaml
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name: Smoke test - ESP32
-
-on:
-    pull_request:
-    workflow_dispatch:
-
-concurrency:
-    group: smoke-${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
-    cancel-in-progress: true
-
-jobs:
-    esp32:
-        name: Smoke Run - ESP32
-        timeout-minutes: 30
-
-        runs-on: ubuntu-latest
-        if: github.actor != 'restyled-io[bot]'
-
-        container:
-            image: connectedhomeip/chip-build-esp32:0.5.56
-            volumes:
-                - "/tmp/bloat_reports:/tmp/bloat_reports"
-
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v2
-              with:
-                  submodules: true
-
-            - name: Set up environment for size reports
-              if: ${{ !env.ACT }}
-              env:
-                  GH_CONTEXT: ${{ toJson(github) }}
-              run: scripts/tools/memory/gh_sizes_environment.py "${GH_CONTEXT}"
-
-            - name: Bootstrap
-              timeout-minutes: 10
-              run: scripts/build/gn_bootstrap.sh
-            - name: Uploading bootstrap logs
-              uses: actions/upload-artifact@v2
-              if: ${{ always() }} && ${{ !env.ACT }}
-              with:
-                  name: bootstrap-logs
-                  path: |
-                   .environment/gn_out/.ninja_log
-                   .environment/pigweed-venv/*.log
-            - name: Build all-clusters on M5Stack
-              timeout-minutes: 30
-              run: |
-                  ./scripts/run_in_build_env.sh \
-                     "./scripts/build/build_examples.py \
-                        --enable-flashbundle \
-                        --target 'esp32-m5stack-all-clusters' \
-                        build \
-                        --copy-artifacts-to out/artifacts \
-                     "
-            - name: Prepare bloat report
-              run: |
-                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                     esp32 m5stack all-clusters-app \
-                     out/esp32-m5stack-all-clusters/chip-all-clusters-app.elf \
-                     /tmp/bloat_reports/
-
-            - name: Uploading Size Reports
-              uses: actions/upload-artifact@v2
-              if: ${{ !env.ACT }}
-              with:
-                  name: Size,ESP32-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}
-                  path: /tmp/bloat_reports/
-