diff --git a/advisories/github-reviewed/2022/05/GHSA-4h3p-63x6-vwg2/GHSA-4h3p-63x6-vwg2.json b/advisories/github-reviewed/2022/05/GHSA-4h3p-63x6-vwg2/GHSA-4h3p-63x6-vwg2.json
new file mode 100644
index 00000000000..fb81506dc7d
--- /dev/null
+++ b/advisories/github-reviewed/2022/05/GHSA-4h3p-63x6-vwg2/GHSA-4h3p-63x6-vwg2.json
@@ -0,0 +1,80 @@
+{
+  "schema_version": "1.4.0",
+  "id": "GHSA-4h3p-63x6-vwg2",
+  "modified": "2024-01-10T18:21:01Z",
+  "published": "2022-05-24T17:41:57Z",
+  "aliases": [
+    "CVE-2021-21031"
+  ],
+  "summary": "Magento Insufficient Session Expiration",
+  "details": "Magento versions 2.4.1 (and earlier), 2.4.0-p1 (and earlier) and 2.3.6 (and earlier) do not adequately invalidate user sessions. Successful exploitation could lead to unauthorized access to restricted resources. Access to the admin console is not required for successful exploitation.",
+  "severity": [
+    {
+      "type": "CVSS_V3",
+      "score": "CVSS:3.1/AV:N/AC:H/PR:N/UI:N/S:U/C:L/I:L/A:L"
+    }
+  ],
+  "affected": [
+    {
+      "package": {
+        "ecosystem": "Packagist",
+        "name": "magento/community-edition"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "2.4.0"
+            },
+            {
+              "fixed": "2.4.1-p1"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "package": {
+        "ecosystem": "Packagist",
+        "name": "magento/community-edition"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "0"
+            },
+            {
+              "fixed": "2.3.6"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "references": [
+    {
+      "type": "ADVISORY",
+      "url": "https://nvd.nist.gov/vuln/detail/CVE-2021-21031"
+    },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/magento/magento2"
+    },
+    {
+      "type": "WEB",
+      "url": "https://helpx.adobe.com/security/products/magento/apsb21-08.html"
+    }
+  ],
+  "database_specific": {
+    "cwe_ids": [
+      "CWE-613"
+    ],
+    "severity": "MODERATE",
+    "github_reviewed": true,
+    "github_reviewed_at": "2024-01-10T18:21:01Z",
+    "nvd_published_at": "2021-02-11T20:15:00Z"
+  }
+}
\ No newline at end of file
diff --git a/advisories/github-reviewed/2022/05/GHSA-4jfq-f8hc-775q/GHSA-4jfq-f8hc-775q.json b/advisories/github-reviewed/2022/05/GHSA-4jfq-f8hc-775q/GHSA-4jfq-f8hc-775q.json
new file mode 100644
index 00000000000..e719919bdf7
--- /dev/null
+++ b/advisories/github-reviewed/2022/05/GHSA-4jfq-f8hc-775q/GHSA-4jfq-f8hc-775q.json
@@ -0,0 +1,80 @@
+{
+  "schema_version": "1.4.0",
+  "id": "GHSA-4jfq-f8hc-775q",
+  "modified": "2024-01-10T18:20:45Z",
+  "published": "2022-05-24T17:41:56Z",
+  "aliases": [
+    "CVE-2021-21032"
+  ],
+  "summary": "Magento Insufficient Session Expiration",
+  "details": "Magento versions 2.4.1 (and earlier), 2.4.0-p1 (and earlier) and 2.3.6 (and earlier) do not adequately invalidate user sessions. Successful exploitation of this issue could lead to unauthorized access to restricted resources. Access to the admin console is not required for successful exploitation.",
+  "severity": [
+    {
+      "type": "CVSS_V3",
+      "score": "CVSS:3.1/AV:N/AC:H/PR:N/UI:N/S:U/C:L/I:L/A:L"
+    }
+  ],
+  "affected": [
+    {
+      "package": {
+        "ecosystem": "Packagist",
+        "name": "magento/community-edition"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "2.4.0"
+            },
+            {
+              "fixed": "2.4.1-p1"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "package": {
+        "ecosystem": "Packagist",
+        "name": "magento/community-edition"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "0"
+            },
+            {
+              "fixed": "2.3.6"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "references": [
+    {
+      "type": "ADVISORY",
+      "url": "https://nvd.nist.gov/vuln/detail/CVE-2021-21032"
+    },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/magento/magento2"
+    },
+    {
+      "type": "WEB",
+      "url": "https://helpx.adobe.com/security/products/magento/apsb21-08.html"
+    }
+  ],
+  "database_specific": {
+    "cwe_ids": [
+      "CWE-613"
+    ],
+    "severity": "MODERATE",
+    "github_reviewed": true,
+    "github_reviewed_at": "2024-01-10T18:20:45Z",
+    "nvd_published_at": "2021-02-11T20:15:00Z"
+  }
+}
\ No newline at end of file
diff --git a/advisories/unreviewed/2022/05/GHSA-4h3p-63x6-vwg2/GHSA-4h3p-63x6-vwg2.json b/advisories/unreviewed/2022/05/GHSA-4h3p-63x6-vwg2/GHSA-4h3p-63x6-vwg2.json
deleted file mode 100644
index 14ad9864855..00000000000
--- a/advisories/unreviewed/2022/05/GHSA-4h3p-63x6-vwg2/GHSA-4h3p-63x6-vwg2.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "schema_version": "1.4.0",
-  "id": "GHSA-4h3p-63x6-vwg2",
-  "modified": "2022-05-24T17:41:57Z",
-  "published": "2022-05-24T17:41:57Z",
-  "aliases": [
-    "CVE-2021-21031"
-  ],
-  "details": "Magento versions 2.4.1 (and earlier), 2.4.0-p1 (and earlier) and 2.3.6 (and earlier) do not adequately invalidate user sessions. Successful exploitation could lead to unauthorized access to restricted resources. Access to the admin console is not required for successful exploitation.",
-  "severity": [
-
-  ],
-  "affected": [
-
-  ],
-  "references": [
-    {
-      "type": "ADVISORY",
-      "url": "https://nvd.nist.gov/vuln/detail/CVE-2021-21031"
-    },
-    {
-      "type": "WEB",
-      "url": "https://helpx.adobe.com/security/products/magento/apsb21-08.html"
-    }
-  ],
-  "database_specific": {
-    "cwe_ids": [
-      "CWE-613"
-    ],
-    "severity": "MODERATE",
-    "github_reviewed": false,
-    "github_reviewed_at": null,
-    "nvd_published_at": "2021-02-11T20:15:00Z"
-  }
-}
\ No newline at end of file
diff --git a/advisories/unreviewed/2022/05/GHSA-4jfq-f8hc-775q/GHSA-4jfq-f8hc-775q.json b/advisories/unreviewed/2022/05/GHSA-4jfq-f8hc-775q/GHSA-4jfq-f8hc-775q.json
deleted file mode 100644
index 0bf0388cd08..00000000000
--- a/advisories/unreviewed/2022/05/GHSA-4jfq-f8hc-775q/GHSA-4jfq-f8hc-775q.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "schema_version": "1.4.0",
-  "id": "GHSA-4jfq-f8hc-775q",
-  "modified": "2022-05-24T17:41:56Z",
-  "published": "2022-05-24T17:41:56Z",
-  "aliases": [
-    "CVE-2021-21032"
-  ],
-  "details": "Magento versions 2.4.1 (and earlier), 2.4.0-p1 (and earlier) and 2.3.6 (and earlier) do not adequately invalidate user sessions. Successful exploitation of this issue could lead to unauthorized access to restricted resources. Access to the admin console is not required for successful exploitation.",
-  "severity": [
-
-  ],
-  "affected": [
-
-  ],
-  "references": [
-    {
-      "type": "ADVISORY",
-      "url": "https://nvd.nist.gov/vuln/detail/CVE-2021-21032"
-    },
-    {
-      "type": "WEB",
-      "url": "https://helpx.adobe.com/security/products/magento/apsb21-08.html"
-    }
-  ],
-  "database_specific": {
-    "cwe_ids": [
-      "CWE-613"
-    ],
-    "severity": "MODERATE",
-    "github_reviewed": false,
-    "github_reviewed_at": null,
-    "nvd_published_at": "2021-02-11T20:15:00Z"
-  }
-}
\ No newline at end of file