diff --git a/exposed-panels/buildbot-panel.yaml b/exposed-panels/buildbot-panel.yaml
index b5d2d36574..dbd4eced95 100644
--- a/exposed-panels/buildbot-panel.yaml
+++ b/exposed-panels/buildbot-panel.yaml
@@ -2,11 +2,12 @@ id: buildbot-panel
 
 info:
   name: Buildbot Panel Detect
-  author: thardt-praetorian
+  author: thardt-praetorian,daffainfo
   severity: info
   reference:
     - https://buildbot.net
   metadata:
+    verified: true
     shodan-query: http.title:"BuildBot"
   tags: panel,buildbot,cicd
 
@@ -23,7 +24,15 @@ requests:
         part: body
         regex:
           - '<title(.*)>Buildbot</title>'
+          - 'buildbot_config'
+        condition: or
 
       - type: status
         status:
           - 200
+
+    extractors:
+      - type: regex
+        part: body
+        regex:
+          - '\[\"Buildbot\", \"([0-9.]+)\"\]'