diff --git a/exposed-panels/kibana-panel.yaml b/exposed-panels/kibana-panel.yaml
index ad3530bfef..80fdbfbdf9 100644
--- a/exposed-panels/kibana-panel.yaml
+++ b/exposed-panels/kibana-panel.yaml
@@ -2,7 +2,7 @@ id: kibana-panel
 
 info:
   name: Kibana Panel Login
-  author: petruknisme,daffainfo
+  author: petruknisme,daffainfo,c-sh0
   severity: info
   metadata:
     shodan-query: http.title:"Kibana"
@@ -11,16 +11,24 @@ info:
 requests:
   - method: GET
     path:
+      - "{{BaseURL}}"
       - "{{BaseURL}}/login"
+      - "{{BaseURL}}/app/kibana"
 
+    stop-at-first-match: true
+    redirects: true
+    max-redirects: 2
     matchers-condition: or
     matchers:
       - type: word
         part: body
         words:
           - "<title>Kibana</title>"
+          - "<title>Elastic</title>"
+          - "<title>Kibana Login</title>"
+        condition: or
 
-      - type: word
+      - type: regex
         part: header
-        words:
-          - "Kbn-Name:"
+        regex:
+          - '(?i)(Kbn-Name)'