diff --git a/2021/25xxx/CVE-2021-25122.json b/2021/25xxx/CVE-2021-25122.json
index c8b9f444fa3..c8d0c9f352f 100644
--- a/2021/25xxx/CVE-2021-25122.json
+++ b/2021/25xxx/CVE-2021-25122.json
@@ -1,18 +1,81 @@
 {
-    "data_type": "CVE",
-    "data_format": "MITRE",
-    "data_version": "4.0",
     "CVE_data_meta": {
+        "ASSIGNER": "security@apache.org",
         "ID": "CVE-2021-25122",
-        "ASSIGNER": "cve@mitre.org",
-        "STATE": "RESERVED"
+        "STATE": "PUBLIC",
+        "TITLE": "Apache Tomcat h2c request mix-up"
     },
+    "affects": {
+        "vendor": {
+            "vendor_data": [
+                {
+                    "product": {
+                        "product_data": [
+                            {
+                                "product_name": "Apache Tomcat",
+                                "version": {
+                                    "version_data": [
+                                        {
+                                            "version_affected": "<",
+                                            "version_name": "Apache Tomcat 10",
+                                            "version_value": "10.0.2"
+                                        },
+                                        {
+                                            "version_affected": "<",
+                                            "version_name": "Apache Tomcat 9",
+                                            "version_value": "9.0.42"
+                                        },
+                                        {
+                                            "version_affected": "<",
+                                            "version_name": "Apache Tomcat 8.5",
+                                            "version_value": "8.5.62"
+                                        }
+                                    ]
+                                }
+                            }
+                        ]
+                    },
+                    "vendor_name": "Apache Software Foundation"
+                }
+            ]
+        }
+    },
+    "data_format": "MITRE",
+    "data_type": "CVE",
+    "data_version": "4.0",
     "description": {
         "description_data": [
             {
                 "lang": "eng",
-                "value": "** RESERVED ** This candidate has been reserved by an organization or individual that will use it when announcing a new security problem. When the candidate has been publicized, the details for this candidate will be provided."
+                "value": "When responding to new h2c connection requests, Apache Tomcat versions 10.0.0-M1 to 10.0.0, 9.0.0.M1 to 9.0.41 and 8.5.0 to 8.5.61 could duplicate request headers and a limited amount of request body from one request to another meaning user A and user B could both see the results of user A's request."
             }
         ]
+    },
+    "generator": {
+        "engine": "Vulnogram 0.0.9"
+    },
+    "impact": {},
+    "problemtype": {
+        "problemtype_data": [
+            {
+                "description": [
+                    {
+                        "lang": "eng",
+                        "value": "CWE-200 Information Exposure"
+                    }
+                ]
+            }
+        ]
+    },
+    "references": {
+        "reference_data": [
+            {
+                "refsource": "CONFIRM",
+                "url": "https://lists.apache.org/thread.html/r7b95bc248603360501f18c8eb03bb6001ec0ee3296205b34b07105b7%40%3Cannounce.tomcat.apache.org%3E"
+            }
+        ]
+    },
+    "source": {
+        "discovery": "UNKNOWN"
     }
-}
\ No newline at end of file
+}
diff --git a/2021/25xxx/CVE-2021-25329.json b/2021/25xxx/CVE-2021-25329.json
index 1ef4d6beceb..2f71cb5080c 100644
--- a/2021/25xxx/CVE-2021-25329.json
+++ b/2021/25xxx/CVE-2021-25329.json
@@ -1,18 +1,92 @@
 {
-    "data_type": "CVE",
-    "data_format": "MITRE",
-    "data_version": "4.0",
     "CVE_data_meta": {
+        "ASSIGNER": "security@apache.org",
         "ID": "CVE-2021-25329",
-        "ASSIGNER": "cve@mitre.org",
-        "STATE": "RESERVED"
+        "STATE": "PUBLIC",
+        "TITLE": "Incomplete fix for CVE-2020-9484"
     },
+    "affects": {
+        "vendor": {
+            "vendor_data": [
+                {
+                    "product": {
+                        "product_data": [
+                            {
+                                "product_name": "Apache Tomcat",
+                                "version": {
+                                    "version_data": [
+                                        {
+                                            "version_affected": "<",
+                                            "version_name": "Apache Tomcat 10",
+                                            "version_value": "10.0.0"
+                                        },
+                                        {
+                                            "version_affected": "<",
+                                            "version_name": "Apache Tomcat 9",
+                                            "version_value": "9.0.41"
+                                        },
+                                        {
+                                            "version_affected": "<",
+                                            "version_name": "Apache Tomcat 8.5",
+                                            "version_value": "8.5.61"
+                                        },
+                                        {
+                                            "version_affected": "<",
+                                            "version_name": "Apache Tomcat 7",
+                                            "version_value": "7.0.107"
+                                        }
+                                    ]
+                                }
+                            }
+                        ]
+                    },
+                    "vendor_name": "Apache Software Foundation"
+                }
+            ]
+        }
+    },
+    "credit": [
+        {
+            "lang": "eng",
+            "value": "This issue was identified by Trung Pham of Viettel Cyber Security."
+        }
+    ],
+    "data_format": "MITRE",
+    "data_type": "CVE",
+    "data_version": "4.0",
     "description": {
         "description_data": [
             {
                 "lang": "eng",
-                "value": "** RESERVED ** This candidate has been reserved by an organization or individual that will use it when announcing a new security problem. When the candidate has been publicized, the details for this candidate will be provided."
+                "value": "The fix for CVE-2020-9484 was incomplete. When using Apache Tomcat 10.0.0-M1 to 10.0.0, 9.0.0.M1 to 9.0.41, 8.5.0 to 8.5.61 or 7.0.0. to 7.0.107 with a configuration edge case that was highly unlikely to be used, the Tomcat instance was still vulnerable to CVE-2020-9494. Note that both the previously published prerequisites for CVE-2020-9484 and the previously published mitigations for CVE-2020-9484 also apply to this issue."
             }
         ]
+    },
+    "generator": {
+        "engine": "Vulnogram 0.0.9"
+    },
+    "impact": {},
+    "problemtype": {
+        "problemtype_data": [
+            {
+                "description": [
+                    {
+                        "lang": "eng",
+                        "value": "Remote code execution via session persistence"
+                    }
+                ]
+            }
+        ]
+    },
+    "references": {
+        "reference_data": [
+            {
+                "refsource": "CONFIRM",
+                "url": "https://lists.apache.org/thread.html/rfe62fbf9d4c314f166fe8c668e50e5d9dd882a99447f26f0367474bf%40%3Cannounce.tomcat.apache.org%3E"
+            }
+        ]
+    },
+    "source": {
+        "discovery": "UNKNOWN"
     }
-}
\ No newline at end of file
+}