diff --git a/technologies/apache-detect.yaml b/technologies/apache-detect.yaml
new file mode 100644
index 0000000000..bc95103681
--- /dev/null
+++ b/technologies/apache-detect.yaml
@@ -0,0 +1,27 @@
+id: apache-version-detect
+info:
+  name: Apache Version
+  author: philippedelteil
+  description: Some Apache servers have the version on the response header. The OpenSSL version can be also obtained
+  severity: info
+requests:
+  - method: GET
+    path:
+      - "{{BaseURL}}"
+    matchers-condition: and
+    matchers:
+
+      - type: regex
+        part: header
+        regex:
+          - "Apache+"
+
+      - type: status
+        status:
+          - 200
+
+    extractors:
+      - type: kval
+        part: header
+        kval:
+          - Server
\ No newline at end of file
diff --git a/technologies/tomcat-detect.yaml b/technologies/tomcat-detect.yaml
new file mode 100644
index 0000000000..d5a164932d
--- /dev/null
+++ b/technologies/tomcat-detect.yaml
@@ -0,0 +1,29 @@
+id: tomcat-version-detect
+info:
+  name: Detect Tomcat Version
+  author: philippedelteil
+  description: If an Tomcat instance is deployed on the target URL, when we send a request for
+    a non existent resource we receive a Tomcat error page with version.
+  severity: info
+requests:
+  - method: GET
+    path:
+      - "{{BaseURL}}/something_not_existing_"
+    matchers-condition: and
+    matchers:
+
+      - type: word
+        words:
+          - "Apache Tomcat"
+
+      - type: status
+        status:
+          - 404
+
+    extractors:
+      - type: regex
+        part: body
+        name: version
+        group: 2
+        regex:
+          - '(<h3>)(.*?)(</h3>)'
\ No newline at end of file