diff --git a/advisories/github-reviewed/2025/04/GHSA-h4rr-f37j-4hh7/GHSA-h4rr-f37j-4hh7.json b/advisories/github-reviewed/2025/04/GHSA-h4rr-f37j-4hh7/GHSA-h4rr-f37j-4hh7.json
new file mode 100644
index 00000000000..7d98c7e72a6
--- /dev/null
+++ b/advisories/github-reviewed/2025/04/GHSA-h4rr-f37j-4hh7/GHSA-h4rr-f37j-4hh7.json
@@ -0,0 +1,118 @@
+{
+  "schema_version": "1.4.0",
+  "id": "GHSA-h4rr-f37j-4hh7",
+  "modified": "2025-04-16T14:53:24Z",
+  "published": "2025-04-16T09:32:13Z",
+  "aliases": [
+    "CVE-2025-27571"
+  ],
+  "summary": "Mattermost Incorrect Authorization vulnerability",
+  "details": "Mattermost versions 10.5.x <= 10.5.1, 10.4.x <= 10.4.3, 9.11.x <= 9.11.9 fail to check the \"Allow Users to View Archived Channels\" configuration when fetching channel metadata of a post from archived channels, which allows authenticated users to access such information when a channel is archived.",
+  "severity": [
+    {
+      "type": "CVSS_V3",
+      "score": "CVSS:3.1/AV:N/AC:L/PR:L/UI:N/S:U/C:L/I:N/A:N"
+    }
+  ],
+  "affected": [
+    {
+      "package": {
+        "ecosystem": "Go",
+        "name": "github.com/mattermost/mattermost/server/v8"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "10.5.0"
+            },
+            {
+              "fixed": "10.5.2"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "package": {
+        "ecosystem": "Go",
+        "name": "github.com/mattermost/mattermost/server/v8"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "10.4.0"
+            },
+            {
+              "fixed": "10.4.4"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "package": {
+        "ecosystem": "Go",
+        "name": "github.com/mattermost/mattermost/server/v8"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "9.11.0"
+            },
+            {
+              "fixed": "9.11.10"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "package": {
+        "ecosystem": "Go",
+        "name": "github.com/mattermost/mattermost/server/v8"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "0"
+            },
+            {
+              "fixed": "8.0.0-20250218121836-2b5275d87136"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "references": [
+    {
+      "type": "ADVISORY",
+      "url": "https://nvd.nist.gov/vuln/detail/CVE-2025-27571"
+    },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/mattermost/mattermost"
+    },
+    {
+      "type": "WEB",
+      "url": "https://mattermost.com/security-updates"
+    }
+  ],
+  "database_specific": {
+    "cwe_ids": [
+      "CWE-863"
+    ],
+    "severity": "MODERATE",
+    "github_reviewed": true,
+    "github_reviewed_at": "2025-04-16T14:53:24Z",
+    "nvd_published_at": "2025-04-16T08:15:14Z"
+  }
+}
\ No newline at end of file
diff --git a/advisories/github-reviewed/2025/04/GHSA-j5jw-m2ph-3jjf/GHSA-j5jw-m2ph-3jjf.json b/advisories/github-reviewed/2025/04/GHSA-j5jw-m2ph-3jjf/GHSA-j5jw-m2ph-3jjf.json
new file mode 100644
index 00000000000..7e1ac993ad3
--- /dev/null
+++ b/advisories/github-reviewed/2025/04/GHSA-j5jw-m2ph-3jjf/GHSA-j5jw-m2ph-3jjf.json
@@ -0,0 +1,99 @@
+{
+  "schema_version": "1.4.0",
+  "id": "GHSA-j5jw-m2ph-3jjf",
+  "modified": "2025-04-16T14:52:35Z",
+  "published": "2025-04-16T09:32:13Z",
+  "aliases": [
+    "CVE-2025-27538"
+  ],
+  "summary": "Mattermost Missing Authentication for Critical Function",
+  "details": "Mattermost versions 10.5.x <= 10.5.1, 9.11.x <= 9.11.9 fail to enforce MFA checks in PUT /api/v4/users/user-id/mfa when the requesting user differs from the target user ID, which allows users with edit_other_users permission to activate or deactivate MFA for other users, even if those users have not set up MFA.",
+  "severity": [
+    {
+      "type": "CVSS_V3",
+      "score": "CVSS:3.1/AV:N/AC:H/PR:H/UI:N/S:U/C:N/I:L/A:N"
+    }
+  ],
+  "affected": [
+    {
+      "package": {
+        "ecosystem": "Go",
+        "name": "github.com/mattermost/mattermost/server/v8"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "10.5.0"
+            },
+            {
+              "fixed": "10.5.2"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "package": {
+        "ecosystem": "Go",
+        "name": "github.com/mattermost/mattermost/server/v8"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "9.11.0"
+            },
+            {
+              "fixed": "9.11.10"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "package": {
+        "ecosystem": "Go",
+        "name": "github.com/mattermost/mattermost/server/v8"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "0"
+            },
+            {
+              "fixed": "8.0.0-20250218121836-2b5275d87136"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "references": [
+    {
+      "type": "ADVISORY",
+      "url": "https://nvd.nist.gov/vuln/detail/CVE-2025-27538"
+    },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/mattermost/mattermost"
+    },
+    {
+      "type": "WEB",
+      "url": "https://mattermost.com/security-updates"
+    }
+  ],
+  "database_specific": {
+    "cwe_ids": [
+      "CWE-306"
+    ],
+    "severity": "LOW",
+    "github_reviewed": true,
+    "github_reviewed_at": "2025-04-16T14:52:34Z",
+    "nvd_published_at": "2025-04-16T08:15:14Z"
+  }
+}
\ No newline at end of file
diff --git a/advisories/unreviewed/2025/04/GHSA-h4rr-f37j-4hh7/GHSA-h4rr-f37j-4hh7.json b/advisories/unreviewed/2025/04/GHSA-h4rr-f37j-4hh7/GHSA-h4rr-f37j-4hh7.json
deleted file mode 100644
index 36cd8752148..00000000000
--- a/advisories/unreviewed/2025/04/GHSA-h4rr-f37j-4hh7/GHSA-h4rr-f37j-4hh7.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "schema_version": "1.4.0",
-  "id": "GHSA-h4rr-f37j-4hh7",
-  "modified": "2025-04-16T09:32:13Z",
-  "published": "2025-04-16T09:32:13Z",
-  "aliases": [
-    "CVE-2025-27571"
-  ],
-  "details": "Mattermost versions 10.5.x <= 10.5.1, 10.4.x <= 10.4.3, 9.11.x <= 9.11.9 fail to check the \"Allow Users to View Archived Channels\" configuration when fetching channel metadata of a post from archived channels, which allows authenticated users to access such information when a channel is archived.",
-  "severity": [
-    {
-      "type": "CVSS_V3",
-      "score": "CVSS:3.1/AV:N/AC:L/PR:L/UI:N/S:U/C:L/I:N/A:N"
-    }
-  ],
-  "affected": [],
-  "references": [
-    {
-      "type": "ADVISORY",
-      "url": "https://nvd.nist.gov/vuln/detail/CVE-2025-27571"
-    },
-    {
-      "type": "WEB",
-      "url": "https://mattermost.com/security-updates"
-    }
-  ],
-  "database_specific": {
-    "cwe_ids": [
-      "CWE-863"
-    ],
-    "severity": "MODERATE",
-    "github_reviewed": false,
-    "github_reviewed_at": null,
-    "nvd_published_at": "2025-04-16T08:15:14Z"
-  }
-}
\ No newline at end of file
diff --git a/advisories/unreviewed/2025/04/GHSA-j5jw-m2ph-3jjf/GHSA-j5jw-m2ph-3jjf.json b/advisories/unreviewed/2025/04/GHSA-j5jw-m2ph-3jjf/GHSA-j5jw-m2ph-3jjf.json
deleted file mode 100644
index f65f5686e65..00000000000
--- a/advisories/unreviewed/2025/04/GHSA-j5jw-m2ph-3jjf/GHSA-j5jw-m2ph-3jjf.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "schema_version": "1.4.0",
-  "id": "GHSA-j5jw-m2ph-3jjf",
-  "modified": "2025-04-16T09:32:13Z",
-  "published": "2025-04-16T09:32:13Z",
-  "aliases": [
-    "CVE-2025-27538"
-  ],
-  "details": "Mattermost versions 10.5.x <= 10.5.1, 9.11.x <= 9.11.9 fail to enforce MFA checks in PUT /api/v4/users/user-id/mfa when the requesting user differs from the target user ID, which allows users with edit_other_users permission to activate or deactivate MFA for other users, even if those users have not set up MFA.",
-  "severity": [
-    {
-      "type": "CVSS_V3",
-      "score": "CVSS:3.1/AV:N/AC:H/PR:H/UI:N/S:U/C:N/I:L/A:N"
-    }
-  ],
-  "affected": [],
-  "references": [
-    {
-      "type": "ADVISORY",
-      "url": "https://nvd.nist.gov/vuln/detail/CVE-2025-27538"
-    },
-    {
-      "type": "WEB",
-      "url": "https://mattermost.com/security-updates"
-    }
-  ],
-  "database_specific": {
-    "cwe_ids": [
-      "CWE-306"
-    ],
-    "severity": "LOW",
-    "github_reviewed": false,
-    "github_reviewed_at": null,
-    "nvd_published_at": "2025-04-16T08:15:14Z"
-  }
-}
\ No newline at end of file