diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d0b8e653a..f7c58c767 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ variables:
     IDF_CHECKOUT_REF: "v5.2.1"
     # This variable represents the short hash of the connectedhomeip submodule.
     # Note: Do change this short hash on submodule update MRs.
-    CHIP_SHORT_HASH: "593d5c6f63"
+    CHIP_SHORT_HASH: "bfc4bac20c"
     DOCKER_IMAGE_NAME: "espressif/chip-idf"
 
 .add_gitlab_ssh_key: &add_gitlab_ssh_key |
diff --git a/connectedhomeip/connectedhomeip b/connectedhomeip/connectedhomeip
index 593d5c6f6..bfc4bac20 160000
--- a/connectedhomeip/connectedhomeip
+++ b/connectedhomeip/connectedhomeip
@@ -1 +1 @@
-Subproject commit 593d5c6f63a62e017e4ced43183049f2805a9db8
+Subproject commit bfc4bac20ca1df12c7a404336d90900ebadb9fe3
diff --git a/examples/pytest_esp_matter_light.py b/examples/pytest_esp_matter_light.py
index 0dffbead1..d54d65047 100644
--- a/examples/pytest_esp_matter_light.py
+++ b/examples/pytest_esp_matter_light.py
@@ -9,6 +9,9 @@ import subprocess
 import netifaces
 from typing import Tuple
 from pytest_embedded import Dut
+import os
+import yaml
+
 
 CURRENT_DIR_LIGHT = str(pathlib.Path(__file__).parent)+'/light'
 CHIP_TOOL_EXE = str(pathlib.Path(__file__).parent)+ '/../connectedhomeip/connectedhomeip/out/host/chip-tool'
@@ -137,9 +140,20 @@ def test_matter_commissioning_c6(dut:Dut) -> None:
 
 # get the host interface name
 def get_host_interface_name() -> str:
-    interfaces = netifaces.interfaces()
-    interface_name = [s for s in interfaces if 'wl' in s][0]
-    return str(interface_name)
+    home_dir = os.path.expanduser("~")
+    config_path = os.path.join(home_dir, "config", "env_config.yml")
+    if os.path.exists(config_path):
+        with open(config_path, 'r') as file:
+            config = yaml.safe_load(file)
+        interface_name = config.get("interface_name")
+        if interface_name:
+            return str(interface_name)
+        else:
+            print("Warning: Configuration file found but 'interface_name' is not defined.")
+  
+    if "eth1" in netifaces.interfaces():
+        return "eth1"
+    raise Exception("No valid network interface found. Please ensure 'eth1' exists or configure 'interface_name' in config/env_config file.")
 
 
 # reset host interface