diff --git a/exposed-panels/liferay-portal.yaml b/exposed-panels/liferay-portal.yaml
new file mode 100644
index 0000000000..6695bd7c6e
--- /dev/null
+++ b/exposed-panels/liferay-portal.yaml
@@ -0,0 +1,45 @@
+id: liferay-portal
+
+info:
+ name: Liferay Portal Detect
+ author: organiccrap,dwisiswant0,ricardomaia
+ severity: info
+ reference:
+ - https://www.liferay.com/
+ - https://github.com/mzer0one/CVE-2020-7961-POC
+ metadata:
+ verified: true
+ shodan-query: http.favicon.hash:129457226
+ tags: panel,liferay,portal
+
+requests:
+ - method: GET
+ path:
+ - "{{BaseURL}}"
+ - "{{BaseURL}}/api/jsonws"
+ - "{{BaseURL}}/api/jsonws/invoke"
+
+ matchers-condition: or
+ stop-at-first-match: true
+ matchers:
+ - type: word
+ part: header
+ words:
+ - "Liferay-Portal"
+ case-insensitive: true
+
+ - type: word
+ part: body
+ words:
+ - json-web-services-api
+ - There are no services matching that phrase.
+ - Unable to deserialize object
+ condition: or
+
+ extractors:
+ - type: regex
+ part: header
+ name: version
+ group: 2
+ regex:
+ - '(i?)Liferay-Portal:.*?(\d+\.?.*?)\s'
diff --git a/technologies/liferay-portal-detect.yaml b/technologies/liferay-portal-detect.yaml
deleted file mode 100644
index 88dfad3794..0000000000
--- a/technologies/liferay-portal-detect.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-id: liferay-portal-detect
-
-info:
- name: Liferay Portal Detection
- author: organiccrap,dwisiswant0
- severity: info
- reference:
- - https://github.com/mzer0one/CVE-2020-7961-POC
- tags: tech,liferay
-
-requests:
- - method: GET
- path:
- - '{{BaseURL}}/api/jsonws'
- - '{{BaseURL}}/api/jsonws/invoke'
-
- matchers:
- - type: word
- words:
- - json-web-services-api
- - There are no services matching that phrase.
- - Unable to deserialize object
- condition: or
- part: body