diff --git a/exposed-panels/esphome-panel.yaml b/exposed-panels/esphome-panel.yaml
index 846f98eb71..1feeb0c296 100644
--- a/exposed-panels/esphome-panel.yaml
+++ b/exposed-panels/esphome-panel.yaml
@@ -1,32 +1,25 @@
 id: esphome-panel
 
 info:
-  name: ESPHome Panel - Detect
+  name: ESPHome Panel Detect
   author: fabaff
   severity: info
-  description: ESPHome panel was detected.
-  classification:
-    cvss-metrics: CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:N/I:N/A:N
-    cvss-score: 0.0
-    cwe-id: CWE-200
-  tags: tech,panel,esphome,iot
+  metadata:
+    verified: true
+    shodan-query: title:"Login - ESPHome"
+  tags: panel,esphome,iot
 
 requests:
   - method: GET
     path:
-      - '{{BaseURL}}'
+      - '{{BaseURL}}/login'
 
     matchers-condition: and
     matchers:
       - type: word
         part: body
         words:
-          - "<title>Dashboard - ESPHome</title>"
-
-      - type: word
-        part: body
-        words:
-          - "</esphome-main>"
+          - 'class="esphome-header'
 
       - type: status
         status: