diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 0263756..d8ac024 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -33,9 +33,10 @@ jobs:
           pip install esphome
           pip list
           esphome version
-      - run: |
+      - name: Validate example configurations
+        run: |
+          sed -i "s#ref: main#ref: pull/${GITHUB_REF_NAME}#" *.yaml
           esphome config coordinator-example.yaml
-      - run: |
           esphome config router-example.yaml
 
   esphome-compile:
@@ -70,7 +71,8 @@ jobs:
         run: |
           echo "::add-matcher::.github/workflows/matchers/gcc.json"
           echo "::add-matcher::.github/workflows/matchers/python.json"
-      - run: |
+      - name: Compile example configurations
+        run: |
+          sed -i "s#ref: main#ref: pull/${GITHUB_REF_NAME}#" *.yaml
           esphome compile coordinator-example.yaml
-      - run: |
           esphome compile router-example.yaml
diff --git a/coordinator-example.yaml b/coordinator-example.yaml
index 8d1b29c..43d0da2 100644
--- a/coordinator-example.yaml
+++ b/coordinator-example.yaml
@@ -1,5 +1,6 @@
 substitutions:
   name: zb-gw03-coordinator
+  device_description: "ZB-GW03 eWeLink Ethernet Zigbee Gateway based Zigbee Coordinator"
 
 packages:
   zb-gw03:
@@ -10,5 +11,5 @@ packages:
       - packages/status_led.yaml
       - packages/i2c.yaml
       - packages/button_zigbee_reset.yaml
-      - packages/zeroconf.yaml
+      - packages/mdns.yaml
     refresh: 0s
diff --git a/packages/core.yaml b/packages/core.yaml
index 0ca6147..8499f93 100644
--- a/packages/core.yaml
+++ b/packages/core.yaml
@@ -16,17 +16,24 @@ substitutions:
 
 esphome:
   name: ${name}
-  platform: ESP32
-  board: esp-wrover-kit
+  comment: ${device_description}
+  project:
+    name: "syssi.esphome-zb-gw03"
+    version: 1.0.0
   on_boot:
     priority: 600
     then:
       - switch.turn_off: download_mode
       - switch.turn_on: zigbee_reset
 
+esp32:
+  board: esp-wrover-kit
+  framework:
+    type: esp-idf
+    version: latest
+
 external_components:
   - source: github://oxan/esphome-stream-server
-  - source: github://syssi/esphome-zeroconf@main
 
 ethernet:
   type: LAN8720
diff --git a/packages/mdns.yaml b/packages/mdns.yaml
new file mode 100644
index 0000000..ce8ab52
--- /dev/null
+++ b/packages/mdns.yaml
@@ -0,0 +1,11 @@
+mdns:
+  services:
+    - service: _tube_zb_gw_efr32
+      protocol: _tcp
+      port: 6638
+      txt:
+        name: ZB-GW03
+        version: 1.0
+        radio_type: ezsp
+        baud_rate: 115200
+        data_flow_control: software
diff --git a/packages/zeroconf.yaml b/packages/zeroconf.yaml
deleted file mode 100644
index 63ad6a0..0000000
--- a/packages/zeroconf.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-zeroconf:
-  - service: tube_zb_gw_efr32
-    protocol: tcp
-    port: 6638
-    txt:
-      version: 1.0
-      radio_type: ezsp
-      baud_rate: 115200
-      data_flow_control: software
diff --git a/router-example.yaml b/router-example.yaml
index cbf952d..f467da1 100644
--- a/router-example.yaml
+++ b/router-example.yaml
@@ -1,5 +1,6 @@
 substitutions:
-  name: zb-gw03-coordinator
+  name: zb-gw03-router
+  device_description: "ZB-GW03 eWeLink Ethernet Zigbee Gateway based Zigbee Router"
 
 packages:
   zb-gw03: