diff --git a/examples/common/blemesh_platform/platform/ESP32_custom/BUILD.gn b/examples/common/blemesh_platform/platform/ESP32_custom/BUILD.gn
index eb30491a6..23d840615 100644
--- a/examples/common/blemesh_platform/platform/ESP32_custom/BUILD.gn
+++ b/examples/common/blemesh_platform/platform/ESP32_custom/BUILD.gn
@@ -172,8 +172,8 @@ static_library("ESP32_custom") {
     ]
     if (chip_mdns == "platform") {
       sources += [
-        "WiFiDnssdImpl.cpp",
-        "WiFiDnssdImpl.h",
+        "ESP32DnssdImpl.cpp",
+        "ESP32DnssdImpl.h",
       ]
     }
     if (chip_mdns == "minimal") {
@@ -230,6 +230,8 @@ static_library("ESP32_custom") {
     sources += [
       "ESP32DeviceInfoProvider.cpp",
       "ESP32DeviceInfoProvider.h",
+      "StaticESP32DeviceInfoProvider.cpp",
+      "StaticESP32DeviceInfoProvider.h",
     ]
   }
 
diff --git a/examples/common/blemesh_platform/platform/ESP32_custom/ESP32DnssdImpl.cpp b/examples/common/blemesh_platform/platform/ESP32_custom/ESP32DnssdImpl.cpp
new file mode 120000
index 000000000..ec6f699a9
--- /dev/null
+++ b/examples/common/blemesh_platform/platform/ESP32_custom/ESP32DnssdImpl.cpp
@@ -0,0 +1 @@
+../../../../../connectedhomeip/connectedhomeip/src/platform/ESP32/ESP32DnssdImpl.cpp
\ No newline at end of file
diff --git a/examples/common/blemesh_platform/platform/ESP32_custom/ESP32DnssdImpl.h b/examples/common/blemesh_platform/platform/ESP32_custom/ESP32DnssdImpl.h
new file mode 120000
index 000000000..463b03b21
--- /dev/null
+++ b/examples/common/blemesh_platform/platform/ESP32_custom/ESP32DnssdImpl.h
@@ -0,0 +1 @@
+../../../../../connectedhomeip/connectedhomeip/src/platform/ESP32/ESP32DnssdImpl.h
\ No newline at end of file
diff --git a/examples/common/blemesh_platform/platform/ESP32_custom/StaticESP32DeviceInfoProvider.cpp b/examples/common/blemesh_platform/platform/ESP32_custom/StaticESP32DeviceInfoProvider.cpp
new file mode 120000
index 000000000..1070b4c76
--- /dev/null
+++ b/examples/common/blemesh_platform/platform/ESP32_custom/StaticESP32DeviceInfoProvider.cpp
@@ -0,0 +1 @@
+../../../../../connectedhomeip/connectedhomeip/src/platform/ESP32/StaticESP32DeviceInfoProvider.cpp
\ No newline at end of file
diff --git a/examples/common/blemesh_platform/platform/ESP32_custom/StaticESP32DeviceInfoProvider.h b/examples/common/blemesh_platform/platform/ESP32_custom/StaticESP32DeviceInfoProvider.h
new file mode 120000
index 000000000..3d7c948ca
--- /dev/null
+++ b/examples/common/blemesh_platform/platform/ESP32_custom/StaticESP32DeviceInfoProvider.h
@@ -0,0 +1 @@
+../../../../../connectedhomeip/connectedhomeip/src/platform/ESP32/StaticESP32DeviceInfoProvider.h
\ No newline at end of file
diff --git a/examples/common/blemesh_platform/platform/ESP32_custom/WiFiDnssdImpl.cpp b/examples/common/blemesh_platform/platform/ESP32_custom/WiFiDnssdImpl.cpp
deleted file mode 120000
index fbb242d78..000000000
--- a/examples/common/blemesh_platform/platform/ESP32_custom/WiFiDnssdImpl.cpp
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../connectedhomeip/connectedhomeip/src/platform/ESP32/WiFiDnssdImpl.cpp
\ No newline at end of file
diff --git a/examples/common/blemesh_platform/platform/ESP32_custom/WiFiDnssdImpl.h b/examples/common/blemesh_platform/platform/ESP32_custom/WiFiDnssdImpl.h
deleted file mode 120000
index c54987a6e..000000000
--- a/examples/common/blemesh_platform/platform/ESP32_custom/WiFiDnssdImpl.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../connectedhomeip/connectedhomeip/src/platform/ESP32/WiFiDnssdImpl.h
\ No newline at end of file