diff --git a/exposed-panels/gogs-login.yaml b/exposed-panels/gogs-login.yaml
deleted file mode 100644
index 7a95d2bd06..0000000000
--- a/exposed-panels/gogs-login.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-id: gogs-login
-
-info:
-  name: Gogs (Go Git Service) - Sign In Page
-  author: dhiyaneshDK
-  severity: info
-  metadata:
-    shodan-query: title:"Sign In - Gogs"
-  tags: panel,gogs
-
-requests:
-  - method: GET
-    path:
-      - '{{BaseURL}}/user/login'
-
-    matchers-condition: and
-    matchers:
-
-      - type: word
-        words:
-          - '<title>Sign In - Gogs</title>'
-
-      - type: status
-        status:
-          - 200
diff --git a/exposed-panels/gogs-panel.yaml b/exposed-panels/gogs-panel.yaml
new file mode 100644
index 0000000000..770c055156
--- /dev/null
+++ b/exposed-panels/gogs-panel.yaml
@@ -0,0 +1,37 @@
+id: gogs-panel
+
+info:
+  name: Gogs (Go Git Service) - Sign In Page
+  author: DhiyaneshDk,daffainfo
+  reference:
+    - https://gogs.io/
+  severity: info
+  metadata:
+    verified: true
+    shodan-query: title:"Sign In - Gogs"
+    google-query: intitle:"Sign In - Gogs"
+  tags: panel,gogs
+
+requests:
+  - method: GET
+    path:
+      - '{{BaseURL}}/user/login'
+
+    matchers-condition: and
+    matchers:
+      - type: word
+        part: body
+        words:
+          - '<meta property="og:title" content="Gogs'
+          - 'js/gogs.js?v='
+        condition: and
+
+      - type: status
+        status:
+          - 200
+
+    extractors:
+      - type: regex
+        group: 1
+        regex:
+          - 'Version: ([0-9.]+) Page:'