diff --git a/2021/20xxx/CVE-2021-20017.json b/2021/20xxx/CVE-2021-20017.json
index e3ed9d5eab1..57b8f68fb81 100644
--- a/2021/20xxx/CVE-2021-20017.json
+++ b/2021/20xxx/CVE-2021-20017.json
@@ -1,18 +1,62 @@
 {
-    "data_type": "CVE",
-    "data_format": "MITRE",
-    "data_version": "4.0",
-    "CVE_data_meta": {
-        "ID": "CVE-2021-20017",
-        "ASSIGNER": "cve@mitre.org",
-        "STATE": "RESERVED"
-    },
-    "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."
-            }
-        ]
+  "CVE_data_meta": {
+    "ASSIGNER": "psirt@sonicwall.com",
+    "ID": "CVE-2021-20017",
+    "STATE": "PUBLIC"
+  },
+  "affects": {
+    "vendor": {
+      "vendor_data": [
+        {
+          "product": {
+            "product_data": [
+              {
+                "product_name": "SMA100",
+                "version": {
+                  "version_data": [
+                    {
+                      "version_value": "10.2.0.5 and earlier"
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "vendor_name": "SonicWall"
+        }
+      ]
     }
+  },
+  "data_format": "MITRE",
+  "data_type": "CVE",
+  "data_version": "4.0",
+  "description": {
+    "description_data": [
+      {
+        "lang": "eng",
+        "value": "A post-authenticated command injection vulnerability in SonicWall SMA100 allows an authenticated attacker to execute OS commands as a 'nobody' user. This vulnerability impacts SMA100 version 10.2.0.5 and earlier."
+      }
+    ]
+  },
+  "problemtype": {
+    "problemtype_data": [
+      {
+        "description": [
+          {
+            "lang": "eng",
+            "value": "CWE-78: Improper Neutralization of Special Elements used in an OS Command ('OS Command Injection')"
+          }
+        ]
+      }
+    ]
+  },
+  "references": {
+    "reference_data": [
+      {
+        "name": "https://psirt.global.sonicwall.com/vuln-detail/SNWLID-2021-0004",
+        "refsource": "CONFIRM",
+        "url": "https://psirt.global.sonicwall.com/vuln-detail/SNWLID-2021-0004"
+      }
+    ]
+  }
 }
\ No newline at end of file
diff --git a/2021/20xxx/CVE-2021-20018.json b/2021/20xxx/CVE-2021-20018.json
index 29ff45e2355..004f93d9aba 100644
--- a/2021/20xxx/CVE-2021-20018.json
+++ b/2021/20xxx/CVE-2021-20018.json
@@ -1,18 +1,62 @@
 {
-    "data_type": "CVE",
-    "data_format": "MITRE",
-    "data_version": "4.0",
-    "CVE_data_meta": {
-        "ID": "CVE-2021-20018",
-        "ASSIGNER": "cve@mitre.org",
-        "STATE": "RESERVED"
-    },
-    "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."
-            }
-        ]
+  "CVE_data_meta": {
+    "ASSIGNER": "psirt@sonicwall.com",
+    "ID": "CVE-2021-20018",
+    "STATE": "PUBLIC"
+  },
+  "affects": {
+    "vendor": {
+      "vendor_data": [
+        {
+          "product": {
+            "product_data": [
+              {
+                "product_name": "SMA100",
+                "version": {
+                  "version_data": [
+                    {
+                      "version_value": "10.2.0.5 and earlier"
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "vendor_name": "SonicWall"
+        }
+      ]
     }
+  },
+  "data_format": "MITRE",
+  "data_type": "CVE",
+  "data_version": "4.0",
+  "description": {
+    "description_data": [
+      {
+        "lang": "eng",
+        "value": "A post-authenticated vulnerability in SonicWall SMA100 allows an attacker to export the configuration file to the specified email address. This vulnerability impacts SMA100 version 10.2.0.5 and earlier."
+      }
+    ]
+  },
+  "problemtype": {
+    "problemtype_data": [
+      {
+        "description": [
+          {
+            "lang": "eng",
+            "value": "CWE-200: Exposure of Sensitive Information to an Unauthorized Actor"
+          }
+        ]
+      }
+    ]
+  },
+  "references": {
+    "reference_data": [
+      {
+        "name": "https://psirt.global.sonicwall.com/vuln-detail/SNWLID-2021-0005",
+        "refsource": "CONFIRM",
+        "url": "https://psirt.global.sonicwall.com/vuln-detail/SNWLID-2021-0005"
+      }
+    ]
+  }
 }
\ No newline at end of file