diff --git a/exposed-panels/workspace-one-uem.yaml b/exposed-panels/workspace-one-uem.yaml
index 5ec565849c..72714cf994 100644
--- a/exposed-panels/workspace-one-uem.yaml
+++ b/exposed-panels/workspace-one-uem.yaml
@@ -1,19 +1,26 @@
 id: workspace-one-uem
 
 info:
-  name: Workspace ONE UEM AirWatch Login Page
-  author: gevakun
+  name: Vmware Workspace ONE UEM AirWatch Login Panel
+  author: gevakun,hanlaomo
   severity: info
   reference:
     - https://twitter.com/Jhaddix/status/1295861505963909120
-  tags: panel,workspaceone,login
+  metadata:
+    verified: true
+    shodan-query: http.html:"Airwatch"
+  tags: panel,workspaceone,vmware
 
 requests:
   - method: GET
     path:
       - "{{BaseURL}}/AirWatch/Login"
+
     matchers:
       - type: word
+        part: body
         words:
           - "About VMware AirWatch"
-        part: body
+          - 'content="AirWatch'
+          - "/AirWatch/Images"
+        condition: or
diff --git a/exposed-panels/workspaceone-uem-dashboard.yaml b/exposed-panels/workspaceone-uem-dashboard.yaml
deleted file mode 100644
index 792e451d5e..0000000000
--- a/exposed-panels/workspaceone-uem-dashboard.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-id: workspaceone-uem-dashboard
-
-info:
-  name: Workspace ONE Unified Endpoint Management (UEM) AirWatch
-  author: hanlaomo
-  severity: info
-  tags: panel,workspaceone
-
-requests:
-  - method: GET
-    path:
-      - "{{BaseURL}}/AirWatch/Login"
-
-    matchers:
-      - type: word
-        words:
-          - "Workspace"
-          - "Login"
-          - "AirWatch"
-        condition: and
-        part: body