diff --git a/technologies/geo-webserver.yaml b/technologies/geo-webserver-detect.yaml
similarity index 63%
rename from technologies/geo-webserver.yaml
rename to technologies/geo-webserver-detect.yaml
index 2b1ab6d373b..b40fea0ef5c 100644
--- a/technologies/geo-webserver.yaml
+++ b/technologies/geo-webserver-detect.yaml
@@ -1,10 +1,11 @@
-id: geo-webserver
+id: geo-webserver-detect
 
 info:
   name: GeoWebServer Detector
-  author: dhiyaneshDK
+  author: dhiyaneshDK,daffainfo
   severity: info
   metadata:
+    verified: true
     shodan-query: http.title:"GeoWebServer"
   tags: panel,geowebserver
 
@@ -22,3 +23,10 @@ requests:
       - type: word
         words:
           - "<TITLE>GeoWebServer</TITLE>"
+
+    extractors:
+      - type: regex
+        part: header
+        group: 1
+        regex:
+          - 'Server: GeoWebServer ([0-9.]+)'
diff --git a/workflows/geowebserver-workflow.yaml b/workflows/geowebserver-workflow.yaml
index 6d2adff08f6..cb43d1e5099 100644
--- a/workflows/geowebserver-workflow.yaml
+++ b/workflows/geowebserver-workflow.yaml
@@ -6,6 +6,6 @@ info:
   description: A simple workflow that runs all GeoWebServer related nuclei templates on a given target.
 
 workflows:
-  - template: technologies/geo-webserver.yaml
+  - template: technologies/geo-webserver-detect.yaml
     subtemplates:
-      - tags: geowebserver
\ No newline at end of file
+      - tags: geowebserver