diff --git a/cves/2018/CVE-2018-19287.yaml b/cves/2018/CVE-2018-19287.yaml
index f9bccaa0e1..b51052c757 100644
--- a/cves/2018/CVE-2018-19287.yaml
+++ b/cves/2018/CVE-2018-19287.yaml
@@ -12,10 +12,13 @@ info:
     - https://www.exploit-db.com/exploits/45880
     - https://nvd.nist.gov/vuln/detail/CVE-2018-19287
   classification:
+    cvss-metrics: CVSS:3.0/AV:N/AC:L/PR:N/UI:R/S:C/C:L/I:L/A:N
+    cvss-score: 6.1
     cve-id: CVE-2018-19287
+    cwe-id: CWE-79
   metadata:
-    verified: true
-  tags: cve,cve2018,wp-plugin,ninja-forms,wordpress,wp,xss,authenticated
+    verified: "true"
+  tags: wp-plugin,wp,xss,authenticated,wpscan,edb,cve,cve2018,ninja-forms,wordpress
 
 requests:
   - raw:
diff --git a/cves/2021/CVE-2021-41432.yaml b/cves/2021/CVE-2021-41432.yaml
index 722ae30ba2..c1b75af34d 100644
--- a/cves/2021/CVE-2021-41432.yaml
+++ b/cves/2021/CVE-2021-41432.yaml
@@ -10,10 +10,13 @@ info:
     - https://github.com/flatpressblog/flatpress/issues/88
     - https://nvd.nist.gov/vuln/detail/CVE-2021-41432
   classification:
+    cvss-metrics: CVSS:3.1/AV:N/AC:L/PR:L/UI:R/S:C/C:L/I:L/A:N
+    cvss-score: 5.4
     cve-id: CVE-2021-41432
+    cwe-id: CWE-79
   metadata:
-    verified: true
     shodan-query: http.html:"Flatpress"
+    verified: "true"
   tags: cve,cve2021,flatpress,xss,authenticated,oss
 
 requests: