diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
index a2dca96..b3a6ed2 100644
--- a/.github/workflows/examples-esp32.yaml
+++ b/.github/workflows/examples-esp32.yaml
@@ -105,14 +105,11 @@
                      example_binaries/esp32-build/chip-all-clusters-app.elf \
                      /tmp/bloat_reports/
 
-            - name: Build example Pigweed App
-              run: scripts/examples/esp_example.sh pigweed-app sdkconfig.defaults
-
             - name: Build example Lighting App (Target:ESP32H2)
               run: scripts/examples/esp_example.sh lighting-app sdkconfig.defaults.esp32h2 esp32h2
 
-            - name: Build example Lock App (Target:ESP32C6)
-              run: scripts/examples/esp_example.sh lock-app sdkconfig.defaults.esp32c6 esp32c6
+            - name: Build example Lighting App (Target:ESP32C6)
+              run: scripts/examples/esp_example.sh lighting-app sdkconfig.defaults.esp32c6 esp32c6
 
             - name: Uploading Size Reports
               uses: ./.github/actions/upload-size-reports
@@ -124,7 +121,7 @@
         name: ESP32_1
 
         runs-on: ubuntu-latest
-        if: github.actor != 'restyled-io[bot]'
+        if: github.actor != 'restyled-io[bot]' &&  github.repository_owner == 'espressif'
 
         container:
             image: ghcr.io/project-chip/chip-build-esp32:81
@@ -168,3 +165,9 @@
 
             - name: Build example LIT ICD App (Target:ESP32H2)
               run: scripts/examples/esp_example.sh lit-icd-app sdkconfig.defaults esp32h2
+
+            - name: Build example Pigweed App
+              run: scripts/examples/esp_example.sh pigweed-app sdkconfig.defaults
+
+            - name: Build example Lock App (Target:ESP32C6)
+              run: scripts/examples/esp_example.sh lock-app sdkconfig.defaults.esp32c6 esp32c6
diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml
index b3115f2..783c46e 100644
--- a/.github/workflows/qemu.yaml
+++ b/.github/workflows/qemu.yaml
@@ -38,7 +38,7 @@
             BUILD_TYPE: esp32-qemu
 
         runs-on: ubuntu-latest
-        if: github.actor != 'restyled-io[bot]'
+        if: github.actor != 'restyled-io[bot]' && github.repository_owner == 'espressif'
 
         container:
             image: ghcr.io/project-chip/chip-build-esp32-qemu:81
diff --git a/examples/lighting-app/esp32/sdkconfig.defaults.esp32c6 b/examples/lighting-app/esp32/sdkconfig.defaults.esp32c6
index 104777a..161fdd5 100644
--- a/examples/lighting-app/esp32/sdkconfig.defaults.esp32c6
+++ b/examples/lighting-app/esp32/sdkconfig.defaults.esp32c6
@@ -65,3 +65,7 @@
 
 # Enable HKDF in mbedtls
 CONFIG_MBEDTLS_HKDF_C=y
+
+# Serial Flasher config
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE="4MB"