diff --git a/exposed-panels/iSpyConnect-detect.yaml b/technologies/ispyconnect-detect.yaml
similarity index 59%
rename from exposed-panels/iSpyConnect-detect.yaml
rename to technologies/ispyconnect-detect.yaml
index 51079b7cf5..21375db646 100644
--- a/exposed-panels/iSpyConnect-detect.yaml
+++ b/technologies/ispyconnect-detect.yaml
@@ -1,4 +1,4 @@
-id: iSpyConnect-detect
+id: ispyconnect-detect
 
 info:
   name: iSpyConnect - Detect
@@ -7,20 +7,26 @@ info:
   metadata:
     shodan-query: http.html:"iSpy"
     verified: true
-  tags: iSpy,panel
+  tags: ispy,tech
 
 requests:
-  - raw:
-      - |
-        GET / HTTP/1.1
-        Host: {{Hostname}}
+  - method: GET
+    path:
+      - '{{BaseURL}}'
 
     matchers-condition: and
     matchers:
+      - type: word
+        part: body
+        words:
+          - 'iSpy is running'
+        condition: and
+
+      - type: word
+        part: header
+        words:
+          - 'Server: iSpy'
+
       - type: status
         status:
           - 200
-
-      - type: word
-        words:
-          - 'iSpy is running'