diff --git a/exposed-panels/apache/apache-apisix-panel.yaml b/exposed-panels/apache/apache-apisix-panel.yaml
new file mode 100644
index 0000000000..6d3f464a45
--- /dev/null
+++ b/exposed-panels/apache/apache-apisix-panel.yaml
@@ -0,0 +1,25 @@
+id: apache-apisix-panel
+
+info:
+  name: Apache APISIX Panel detect
+  author: pikpikcu
+  severity: info
+  metadata:
+    fofa-query: title="Apache APISIX Dashboard"
+  tags: apache,apisix,panel
+
+requests:
+  - method: GET
+    path:
+      - "{{BaseURL}}/user/login?redirect=%2F"
+
+    matchers-condition: and
+    matchers:
+      - type: word
+        part: body
+        words:
+          - '<title>Apache APISIX Dashboard</title>'
+
+      - type: status
+        status:
+          - 200
diff --git a/exposed-panels/public-tomcat-manager.yaml b/exposed-panels/apache/public-tomcat-manager.yaml
similarity index 93%
rename from exposed-panels/public-tomcat-manager.yaml
rename to exposed-panels/apache/public-tomcat-manager.yaml
index cfb5e071a3..98a6145c02 100644
--- a/exposed-panels/public-tomcat-manager.yaml
+++ b/exposed-panels/apache/public-tomcat-manager.yaml
@@ -4,7 +4,7 @@ info:
   name: tomcat manager disclosure
   author: Ahmed Sherif,geeknik
   severity: info
-  tags: panel,tomcat
+  tags: panel,tomcat,apache
 
 requests:
   - method: GET
diff --git a/exposed-panels/tomcat-pathnormalization.yaml b/exposed-panels/apache/tomcat-pathnormalization.yaml
similarity index 93%
rename from exposed-panels/tomcat-pathnormalization.yaml
rename to exposed-panels/apache/tomcat-pathnormalization.yaml
index 67a92fe5d6..21bf67d83b 100644
--- a/exposed-panels/tomcat-pathnormalization.yaml
+++ b/exposed-panels/apache/tomcat-pathnormalization.yaml
@@ -5,7 +5,7 @@ info:
   author: organiccrap
   severity: info
   reference: https://i.blackhat.com/us-18/Wed-August-8/us-18-Orange-Tsai-Breaking-Parser-Logic-Take-Your-Path-Normalization-Off-And-Pop-0days-Out-2.pdf
-  tags: panel,tomcat
+  tags: panel,tomcat,apache
 
 requests:
   - method: GET
@@ -25,4 +25,4 @@ requests:
         negative: true
         status:
           - 403
-          - 401
\ No newline at end of file
+          - 401