diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml
index da12476696bce9..efb408f80bfc26 100644
--- a/.github/workflows/chef.yaml
+++ b/.github/workflows/chef.yaml
@@ -56,7 +56,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:66
+            image: ghcr.io/project-chip/chip-build-esp32:67
             options: --user root
 
         steps:
diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
index cdfdee65148aff..fb0d2bc29b5b8d 100644
--- a/.github/workflows/examples-esp32.yaml
+++ b/.github/workflows/examples-esp32.yaml
@@ -36,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:66
+            image: ghcr.io/project-chip/chip-build-esp32:67
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -126,7 +126,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:66
+            image: ghcr.io/project-chip/chip-build-esp32:67
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml
index acced0da5d9849..6dff2dadc3d533 100644
--- a/.github/workflows/qemu.yaml
+++ b/.github/workflows/qemu.yaml
@@ -40,7 +40,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32-qemu:66
+            image: ghcr.io/project-chip/chip-build-esp32-qemu:67
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml
index 97468ec3b5ce0c..481def01c629c6 100644
--- a/.github/workflows/release_artifacts.yaml
+++ b/.github/workflows/release_artifacts.yaml
@@ -32,7 +32,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:66
+            image: ghcr.io/project-chip/chip-build-esp32:67
 
         steps:
             - name: Checkout
diff --git a/examples/all-clusters-app/esp32/sdkconfig_m5stack_rpc.defaults b/examples/all-clusters-app/esp32/sdkconfig_m5stack_rpc.defaults
index 56fed5d65e6797..3f1168ecb907ec 100644
--- a/examples/all-clusters-app/esp32/sdkconfig_m5stack_rpc.defaults
+++ b/examples/all-clusters-app/esp32/sdkconfig_m5stack_rpc.defaults
@@ -82,3 +82,9 @@ CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
 CONFIG_EVENT_LOGGING_CRIT_BUFFER_SIZE=1024
 
 CONFIG_DIAG_USE_EXTERNAL_LOG_WRAP=y
+
+# Memory Optimizations
+CONFIG_NIMBLE_MAX_CONNECTIONS=1
+CONFIG_BTDM_CTRL_BLE_MAX_CONN=1
+CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
+CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
diff --git a/examples/all-clusters-minimal-app/esp32/sdkconfig_m5stack_rpc.defaults b/examples/all-clusters-minimal-app/esp32/sdkconfig_m5stack_rpc.defaults
index 56fed5d65e6797..d2eaffb9bfd15b 100644
--- a/examples/all-clusters-minimal-app/esp32/sdkconfig_m5stack_rpc.defaults
+++ b/examples/all-clusters-minimal-app/esp32/sdkconfig_m5stack_rpc.defaults
@@ -72,6 +72,12 @@ CONFIG_BTDM_CTRL_LPCLK_SEL_MAIN_XTAL=n
 # Enable HKDF in mbedtls
 CONFIG_MBEDTLS_HKDF_C=y
 
+# Memory Optimizations
+CONFIG_NIMBLE_MAX_CONNECTIONS=1
+CONFIG_BTDM_CTRL_BLE_MAX_CONN=1
+CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
+CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
+
 # Build chip tests
 CONFIG_BUILD_CHIP_TESTS=y
 
diff --git a/examples/chef/esp32/partitions.csv b/examples/chef/esp32/partitions.csv
index c0855b66229dc4..c84d53a64b6e59 100644
--- a/examples/chef/esp32/partitions.csv
+++ b/examples/chef/esp32/partitions.csv
@@ -3,4 +3,4 @@
 nvs,      data, nvs,     ,        0xC000,
 phy_init, data, phy,     ,        0x1000,
 # Factory partition size about 1.9MB
-factory,  app,  factory, ,        1945K,
+factory,  app,  factory, ,        2M,
diff --git a/examples/light-switch-app/esp32/main/DeviceCallbacks.cpp b/examples/light-switch-app/esp32/main/DeviceCallbacks.cpp
index 795c433436330e..8fb0dabd95dec7 100644
--- a/examples/light-switch-app/esp32/main/DeviceCallbacks.cpp
+++ b/examples/light-switch-app/esp32/main/DeviceCallbacks.cpp
@@ -35,7 +35,7 @@ using namespace chip::System;
 using namespace chip::app::Clusters;
 
 void AppDeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, ClusterId clusterId, AttributeId attributeId,
-                                                     uint8_t mask, uint8_t type, uint16_t size, uint8_t * value)
+                                                     uint8_t type, uint16_t size, uint8_t * value)
 {
     ESP_LOGI(TAG, "PostAttributeChangeCallback - Cluster ID: '0x%" PRIx32 "', EndPoint ID: '0x%x', Attribute ID: '0x%" PRIx32 "'",
              clusterId, endpointId, attributeId);
diff --git a/examples/light-switch-app/esp32/main/include/DeviceCallbacks.h b/examples/light-switch-app/esp32/main/include/DeviceCallbacks.h
index 93c53cbfd37e97..7d9c0b00b32861 100644
--- a/examples/light-switch-app/esp32/main/include/DeviceCallbacks.h
+++ b/examples/light-switch-app/esp32/main/include/DeviceCallbacks.h
@@ -33,7 +33,7 @@ class AppDeviceCallbacks : public CommonDeviceCallbacks
 {
 public:
     virtual void PostAttributeChangeCallback(chip::EndpointId endpointId, chip::ClusterId clusterId, chip::AttributeId attributeId,
-                                             uint8_t mask, uint8_t type, uint16_t size, uint8_t * value);
+                                             uint8_t type, uint16_t size, uint8_t * value) override;
 
 private:
     void OnIdentifyPostAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);