diff --git a/advisories/github-reviewed/2025/01/GHSA-5m7j-6gc4-ff5g/GHSA-5m7j-6gc4-ff5g.json b/advisories/github-reviewed/2025/01/GHSA-5m7j-6gc4-ff5g/GHSA-5m7j-6gc4-ff5g.json
new file mode 100644
index 00000000000..8e7bdb11b32
--- /dev/null
+++ b/advisories/github-reviewed/2025/01/GHSA-5m7j-6gc4-ff5g/GHSA-5m7j-6gc4-ff5g.json
@@ -0,0 +1,146 @@
+{
+  "schema_version": "1.4.0",
+  "id": "GHSA-5m7j-6gc4-ff5g",
+  "modified": "2025-01-15T20:06:58Z",
+  "published": "2025-01-15T18:30:58Z",
+  "aliases": [
+    "CVE-2025-20086"
+  ],
+  "summary": "Mattermost fails to properly validate post props",
+  "details": "Mattermost versions 10.2.x <= 10.2.0, 9.11.x <= 9.11.5, 10.0.x <= 10.0.3, 10.1.x <= 10.1.3 fail to properly validate post props which allows a malicious authenticated user to cause a crash via a malicious post.",
+  "severity": [
+    {
+      "type": "CVSS_V3",
+      "score": "CVSS:3.1/AV:N/AC:L/PR:L/UI:N/S:U/C:N/I:N/A:H"
+    }
+  ],
+  "affected": [
+    {
+      "package": {
+        "ecosystem": "Go",
+        "name": "github.com/mattermost/mattermost/server/v8"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "10.2.0"
+            },
+            {
+              "fixed": "10.2.1"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "package": {
+        "ecosystem": "Go",
+        "name": "github.com/mattermost/mattermost/server/v8"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "10.1.0"
+            },
+            {
+              "fixed": "10.1.4"
+            }
+          ]
+        }
+      ],
+      "database_specific": {
+        "last_known_affected_version_range": "<= 10.1.3"
+      }
+    },
+    {
+      "package": {
+        "ecosystem": "Go",
+        "name": "github.com/mattermost/mattermost/server/v8"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "10.0.0"
+            },
+            {
+              "fixed": "10.0.4"
+            }
+          ]
+        }
+      ],
+      "database_specific": {
+        "last_known_affected_version_range": "<= 10.0.3"
+      }
+    },
+    {
+      "package": {
+        "ecosystem": "Go",
+        "name": "github.com/mattermost/mattermost/server/v8"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "9.11.0"
+            },
+            {
+              "fixed": "9.11.6"
+            }
+          ]
+        }
+      ],
+      "database_specific": {
+        "last_known_affected_version_range": "<= 9.11.5"
+      }
+    },
+    {
+      "package": {
+        "ecosystem": "Go",
+        "name": "github.com/mattermost/mattermost/server/v8"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "0"
+            },
+            {
+              "fixed": "8.0.0-20241127161322-25ff7a3779a5"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "references": [
+    {
+      "type": "ADVISORY",
+      "url": "https://nvd.nist.gov/vuln/detail/CVE-2025-20086"
+    },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/mattermost/mattermost"
+    },
+    {
+      "type": "WEB",
+      "url": "https://mattermost.com/security-updates"
+    }
+  ],
+  "database_specific": {
+    "cwe_ids": [
+      "CWE-1287"
+    ],
+    "severity": "MODERATE",
+    "github_reviewed": true,
+    "github_reviewed_at": "2025-01-15T20:06:58Z",
+    "nvd_published_at": "2025-01-15T17:15:19Z"
+  }
+}
\ No newline at end of file
diff --git a/advisories/github-reviewed/2025/01/GHSA-8j3q-gc9x-7972/GHSA-8j3q-gc9x-7972.json b/advisories/github-reviewed/2025/01/GHSA-8j3q-gc9x-7972/GHSA-8j3q-gc9x-7972.json
new file mode 100644
index 00000000000..2ad945b3d63
--- /dev/null
+++ b/advisories/github-reviewed/2025/01/GHSA-8j3q-gc9x-7972/GHSA-8j3q-gc9x-7972.json
@@ -0,0 +1,146 @@
+{
+  "schema_version": "1.4.0",
+  "id": "GHSA-8j3q-gc9x-7972",
+  "modified": "2025-01-15T20:06:54Z",
+  "published": "2025-01-15T18:30:56Z",
+  "aliases": [
+    "CVE-2025-21088"
+  ],
+  "summary": "Mattermost Incorrect Type Conversion or Cast",
+  "details": "Mattermost versions 10.2.x <= 10.2.0, 9.11.x <= 9.11.5, 10.0.x <= 10.0.3, 10.1.x <= 10.1.3 fail to properly validate the style of proto supplied to an action's style in post.props.attachments, which allows an attacker to crash the frontend via crafted malicious input.",
+  "severity": [
+    {
+      "type": "CVSS_V3",
+      "score": "CVSS:3.1/AV:N/AC:L/PR:L/UI:N/S:U/C:N/I:N/A:H"
+    }
+  ],
+  "affected": [
+    {
+      "package": {
+        "ecosystem": "Go",
+        "name": "github.com/mattermost/mattermost/server/v8"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "10.2.0"
+            },
+            {
+              "fixed": "10.2.1"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "package": {
+        "ecosystem": "Go",
+        "name": "github.com/mattermost/mattermost/server/v8"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "10.1.0"
+            },
+            {
+              "fixed": "10.1.4"
+            }
+          ]
+        }
+      ],
+      "database_specific": {
+        "last_known_affected_version_range": "<= 10.1.3"
+      }
+    },
+    {
+      "package": {
+        "ecosystem": "Go",
+        "name": "github.com/mattermost/mattermost/server/v8"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "10.0.0"
+            },
+            {
+              "fixed": "10.0.4"
+            }
+          ]
+        }
+      ],
+      "database_specific": {
+        "last_known_affected_version_range": "<= 10.0.3"
+      }
+    },
+    {
+      "package": {
+        "ecosystem": "Go",
+        "name": "github.com/mattermost/mattermost/server/v8"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "9.11.0"
+            },
+            {
+              "fixed": "9.11.6"
+            }
+          ]
+        }
+      ],
+      "database_specific": {
+        "last_known_affected_version_range": "<= 9.11.5"
+      }
+    },
+    {
+      "package": {
+        "ecosystem": "Go",
+        "name": "github.com/mattermost/mattermost/server/v8"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "0"
+            },
+            {
+              "fixed": "8.0.0-20241127161322-25ff7a3779a5"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "references": [
+    {
+      "type": "ADVISORY",
+      "url": "https://nvd.nist.gov/vuln/detail/CVE-2025-21088"
+    },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/mattermost/mattermost"
+    },
+    {
+      "type": "WEB",
+      "url": "https://mattermost.com/security-updates"
+    }
+  ],
+  "database_specific": {
+    "cwe_ids": [
+      "CWE-704"
+    ],
+    "severity": "MODERATE",
+    "github_reviewed": true,
+    "github_reviewed_at": "2025-01-15T20:06:54Z",
+    "nvd_published_at": "2025-01-15T16:15:32Z"
+  }
+}
\ No newline at end of file
diff --git a/advisories/unreviewed/2025/01/GHSA-5m7j-6gc4-ff5g/GHSA-5m7j-6gc4-ff5g.json b/advisories/unreviewed/2025/01/GHSA-5m7j-6gc4-ff5g/GHSA-5m7j-6gc4-ff5g.json
deleted file mode 100644
index 55d0c720b0e..00000000000
--- a/advisories/unreviewed/2025/01/GHSA-5m7j-6gc4-ff5g/GHSA-5m7j-6gc4-ff5g.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "schema_version": "1.4.0",
-  "id": "GHSA-5m7j-6gc4-ff5g",
-  "modified": "2025-01-15T18:30:58Z",
-  "published": "2025-01-15T18:30:58Z",
-  "aliases": [
-    "CVE-2025-20086"
-  ],
-  "details": "Mattermost versions 10.2.x <= 10.2.0, 9.11.x <= 9.11.5, 10.0.x <= 10.0.3, 10.1.x <= 10.1.3 fail to properly validate post props which allows a malicious authenticated user to cause a crash via a malicious post.",
-  "severity": [
-    {
-      "type": "CVSS_V3",
-      "score": "CVSS:3.1/AV:N/AC:L/PR:L/UI:N/S:U/C:N/I:N/A:H"
-    }
-  ],
-  "affected": [],
-  "references": [
-    {
-      "type": "ADVISORY",
-      "url": "https://nvd.nist.gov/vuln/detail/CVE-2025-20086"
-    },
-    {
-      "type": "WEB",
-      "url": "https://mattermost.com/security-updates"
-    }
-  ],
-  "database_specific": {
-    "cwe_ids": [
-      "CWE-1287"
-    ],
-    "severity": "MODERATE",
-    "github_reviewed": false,
-    "github_reviewed_at": null,
-    "nvd_published_at": "2025-01-15T17:15:19Z"
-  }
-}
\ No newline at end of file
diff --git a/advisories/unreviewed/2025/01/GHSA-8j3q-gc9x-7972/GHSA-8j3q-gc9x-7972.json b/advisories/unreviewed/2025/01/GHSA-8j3q-gc9x-7972/GHSA-8j3q-gc9x-7972.json
deleted file mode 100644
index 4997685c97f..00000000000
--- a/advisories/unreviewed/2025/01/GHSA-8j3q-gc9x-7972/GHSA-8j3q-gc9x-7972.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "schema_version": "1.4.0",
-  "id": "GHSA-8j3q-gc9x-7972",
-  "modified": "2025-01-15T18:30:56Z",
-  "published": "2025-01-15T18:30:56Z",
-  "aliases": [
-    "CVE-2025-21088"
-  ],
-  "details": "Mattermost versions 10.2.x <= 10.2.0, 9.11.x <= 9.11.5, 10.0.x <= 10.0.3, 10.1.x <= 10.1.3 fail to properly validate the style of proto supplied to an action's style in post.props.attachments, which allows an attacker to crash the frontend via crafted malicious input.",
-  "severity": [
-    {
-      "type": "CVSS_V3",
-      "score": "CVSS:3.1/AV:N/AC:L/PR:L/UI:N/S:U/C:N/I:N/A:H"
-    }
-  ],
-  "affected": [],
-  "references": [
-    {
-      "type": "ADVISORY",
-      "url": "https://nvd.nist.gov/vuln/detail/CVE-2025-21088"
-    },
-    {
-      "type": "WEB",
-      "url": "https://mattermost.com/security-updates"
-    }
-  ],
-  "database_specific": {
-    "cwe_ids": [
-      "CWE-704"
-    ],
-    "severity": "MODERATE",
-    "github_reviewed": false,
-    "github_reviewed_at": null,
-    "nvd_published_at": "2025-01-15T16:15:32Z"
-  }
-}
\ No newline at end of file