diff --git a/advisories/github-reviewed/2025/04/GHSA-4f8q-mwgc-3mwc/GHSA-4f8q-mwgc-3mwc.json b/advisories/github-reviewed/2025/04/GHSA-4f8q-mwgc-3mwc/GHSA-4f8q-mwgc-3mwc.json
new file mode 100644
index 00000000000..8b0303cdc66
--- /dev/null
+++ b/advisories/github-reviewed/2025/04/GHSA-4f8q-mwgc-3mwc/GHSA-4f8q-mwgc-3mwc.json
@@ -0,0 +1,61 @@
+{
+  "schema_version": "1.4.0",
+  "id": "GHSA-4f8q-mwgc-3mwc",
+  "modified": "2025-04-02T17:13:34Z",
+  "published": "2025-04-01T00:30:35Z",
+  "aliases": [
+    "CVE-2025-31691"
+  ],
+  "summary": "Drupal OAuth2 Server Missing Authorization vulnerability",
+  "details": "Missing Authorization vulnerability in Drupal OAuth2 Server allows Forceful Browsing. This issue affects OAuth2 Server: from 0.0.0 before 2.1.0.",
+  "severity": [
+    {
+      "type": "CVSS_V4",
+      "score": "CVSS:4.0/AV:N/AC:L/AT:N/PR:N/UI:N/VC:L/VI:L/VA:N/SC:N/SI:N/SA:N/E:U"
+    }
+  ],
+  "affected": [
+    {
+      "package": {
+        "ecosystem": "Packagist",
+        "name": "drupal/oauth2_server"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "0"
+            },
+            {
+              "fixed": "2.1.0"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "references": [
+    {
+      "type": "ADVISORY",
+      "url": "https://nvd.nist.gov/vuln/detail/CVE-2025-31691"
+    },
+    {
+      "type": "PACKAGE",
+      "url": "https://git.drupalcode.org/project/oauth2_server"
+    },
+    {
+      "type": "WEB",
+      "url": "https://www.drupal.org/sa-contrib-2025-020"
+    }
+  ],
+  "database_specific": {
+    "cwe_ids": [
+      "CWE-862"
+    ],
+    "severity": "LOW",
+    "github_reviewed": true,
+    "github_reviewed_at": "2025-04-02T17:13:34Z",
+    "nvd_published_at": "2025-03-31T22:15:21Z"
+  }
+}
\ No newline at end of file
diff --git a/advisories/github-reviewed/2025/04/GHSA-pwjq-fx3v-8f9r/GHSA-pwjq-fx3v-8f9r.json b/advisories/github-reviewed/2025/04/GHSA-pwjq-fx3v-8f9r/GHSA-pwjq-fx3v-8f9r.json
new file mode 100644
index 00000000000..87023099690
--- /dev/null
+++ b/advisories/github-reviewed/2025/04/GHSA-pwjq-fx3v-8f9r/GHSA-pwjq-fx3v-8f9r.json
@@ -0,0 +1,61 @@
+{
+  "schema_version": "1.4.0",
+  "id": "GHSA-pwjq-fx3v-8f9r",
+  "modified": "2025-04-02T17:14:06Z",
+  "published": "2025-04-01T00:30:35Z",
+  "aliases": [
+    "CVE-2025-31692"
+  ],
+  "summary": "Drupal AI Vulnerable to OS Command Injection via Optional Automator Types",
+  "details": "Improper Neutralization of Special Elements used in an OS Command ('OS Command Injection') vulnerability in Drupal AI (Artificial Intelligence) allows OS Command Injection. This issue affects AI (Artificial Intelligence): from 0.0.0 before 1.0.5.",
+  "severity": [
+    {
+      "type": "CVSS_V4",
+      "score": "CVSS:4.0/AV:N/AC:H/AT:N/PR:L/UI:N/VC:H/VI:H/VA:N/SC:N/SI:N/SA:N/E:U"
+    }
+  ],
+  "affected": [
+    {
+      "package": {
+        "ecosystem": "Packagist",
+        "name": "drupal/ai"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "0"
+            },
+            {
+              "fixed": "1.0.5"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "references": [
+    {
+      "type": "ADVISORY",
+      "url": "https://nvd.nist.gov/vuln/detail/CVE-2025-31692"
+    },
+    {
+      "type": "PACKAGE",
+      "url": "https://git.drupalcode.org/project/ai"
+    },
+    {
+      "type": "WEB",
+      "url": "https://www.drupal.org/sa-contrib-2025-021"
+    }
+  ],
+  "database_specific": {
+    "cwe_ids": [
+      "CWE-78"
+    ],
+    "severity": "MODERATE",
+    "github_reviewed": true,
+    "github_reviewed_at": "2025-04-02T17:14:06Z",
+    "nvd_published_at": "2025-03-31T22:15:21Z"
+  }
+}
\ No newline at end of file
diff --git a/advisories/github-reviewed/2025/04/GHSA-vx9m-rfxq-gr74/GHSA-vx9m-rfxq-gr74.json b/advisories/github-reviewed/2025/04/GHSA-vx9m-rfxq-gr74/GHSA-vx9m-rfxq-gr74.json
new file mode 100644
index 00000000000..1c7bc846183
--- /dev/null
+++ b/advisories/github-reviewed/2025/04/GHSA-vx9m-rfxq-gr74/GHSA-vx9m-rfxq-gr74.json
@@ -0,0 +1,61 @@
+{
+  "schema_version": "1.4.0",
+  "id": "GHSA-vx9m-rfxq-gr74",
+  "modified": "2025-04-02T17:14:57Z",
+  "published": "2025-04-01T00:30:34Z",
+  "aliases": [
+    "CVE-2025-31693"
+  ],
+  "summary": "Drupal AI Vulnerable to OS Command Injection",
+  "details": "Improper Neutralization of Special Elements used in an OS Command ('OS Command Injection') vulnerability in Drupal AI (Artificial Intelligence) allows OS Command Injection. This issue affects AI (Artificial Intelligence): from 0.0.0 before 1.0.5.",
+  "severity": [
+    {
+      "type": "CVSS_V4",
+      "score": "CVSS:4.0/AV:N/AC:H/AT:N/PR:H/UI:N/VC:H/VI:H/VA:N/SC:N/SI:N/SA:N/E:U"
+    }
+  ],
+  "affected": [
+    {
+      "package": {
+        "ecosystem": "Packagist",
+        "name": "drupal/ai"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "0"
+            },
+            {
+              "fixed": "1.0.5"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "references": [
+    {
+      "type": "ADVISORY",
+      "url": "https://nvd.nist.gov/vuln/detail/CVE-2025-31693"
+    },
+    {
+      "type": "PACKAGE",
+      "url": "https://git.drupalcode.org/project/ai"
+    },
+    {
+      "type": "WEB",
+      "url": "https://www.drupal.org/sa-contrib-2025-022"
+    }
+  ],
+  "database_specific": {
+    "cwe_ids": [
+      "CWE-78"
+    ],
+    "severity": "MODERATE",
+    "github_reviewed": true,
+    "github_reviewed_at": "2025-04-02T17:14:57Z",
+    "nvd_published_at": "2025-03-31T22:15:21Z"
+  }
+}
\ No newline at end of file
diff --git a/advisories/unreviewed/2025/04/GHSA-4f8q-mwgc-3mwc/GHSA-4f8q-mwgc-3mwc.json b/advisories/unreviewed/2025/04/GHSA-4f8q-mwgc-3mwc/GHSA-4f8q-mwgc-3mwc.json
deleted file mode 100644
index 2f845e3335b..00000000000
--- a/advisories/unreviewed/2025/04/GHSA-4f8q-mwgc-3mwc/GHSA-4f8q-mwgc-3mwc.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "schema_version": "1.4.0",
-  "id": "GHSA-4f8q-mwgc-3mwc",
-  "modified": "2025-04-01T00:30:35Z",
-  "published": "2025-04-01T00:30:35Z",
-  "aliases": [
-    "CVE-2025-31691"
-  ],
-  "details": "Missing Authorization vulnerability in Drupal OAuth2 Server allows Forceful Browsing.This issue affects OAuth2 Server: from 0.0.0 before 2.1.0.",
-  "severity": [],
-  "affected": [],
-  "references": [
-    {
-      "type": "ADVISORY",
-      "url": "https://nvd.nist.gov/vuln/detail/CVE-2025-31691"
-    },
-    {
-      "type": "WEB",
-      "url": "https://www.drupal.org/sa-contrib-2025-020"
-    }
-  ],
-  "database_specific": {
-    "cwe_ids": [
-      "CWE-862"
-    ],
-    "severity": null,
-    "github_reviewed": false,
-    "github_reviewed_at": null,
-    "nvd_published_at": "2025-03-31T22:15:21Z"
-  }
-}
\ No newline at end of file
diff --git a/advisories/unreviewed/2025/04/GHSA-pwjq-fx3v-8f9r/GHSA-pwjq-fx3v-8f9r.json b/advisories/unreviewed/2025/04/GHSA-pwjq-fx3v-8f9r/GHSA-pwjq-fx3v-8f9r.json
deleted file mode 100644
index 96f5b9a897b..00000000000
--- a/advisories/unreviewed/2025/04/GHSA-pwjq-fx3v-8f9r/GHSA-pwjq-fx3v-8f9r.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "schema_version": "1.4.0",
-  "id": "GHSA-pwjq-fx3v-8f9r",
-  "modified": "2025-04-01T00:30:35Z",
-  "published": "2025-04-01T00:30:35Z",
-  "aliases": [
-    "CVE-2025-31692"
-  ],
-  "details": "Improper Neutralization of Special Elements used in an OS Command ('OS Command Injection') vulnerability in Drupal AI (Artificial Intelligence) allows OS Command Injection.This issue affects AI (Artificial Intelligence): from 0.0.0 before 1.0.5.",
-  "severity": [],
-  "affected": [],
-  "references": [
-    {
-      "type": "ADVISORY",
-      "url": "https://nvd.nist.gov/vuln/detail/CVE-2025-31692"
-    },
-    {
-      "type": "WEB",
-      "url": "https://www.drupal.org/sa-contrib-2025-021"
-    }
-  ],
-  "database_specific": {
-    "cwe_ids": [
-      "CWE-78"
-    ],
-    "severity": null,
-    "github_reviewed": false,
-    "github_reviewed_at": null,
-    "nvd_published_at": "2025-03-31T22:15:21Z"
-  }
-}
\ No newline at end of file
diff --git a/advisories/unreviewed/2025/04/GHSA-vx9m-rfxq-gr74/GHSA-vx9m-rfxq-gr74.json b/advisories/unreviewed/2025/04/GHSA-vx9m-rfxq-gr74/GHSA-vx9m-rfxq-gr74.json
deleted file mode 100644
index e454e3da68b..00000000000
--- a/advisories/unreviewed/2025/04/GHSA-vx9m-rfxq-gr74/GHSA-vx9m-rfxq-gr74.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "schema_version": "1.4.0",
-  "id": "GHSA-vx9m-rfxq-gr74",
-  "modified": "2025-04-01T00:30:34Z",
-  "published": "2025-04-01T00:30:34Z",
-  "aliases": [
-    "CVE-2025-31693"
-  ],
-  "details": "Improper Neutralization of Special Elements used in an OS Command ('OS Command Injection') vulnerability in Drupal AI (Artificial Intelligence) allows OS Command Injection.This issue affects AI (Artificial Intelligence): from 0.0.0 before 1.0.5.",
-  "severity": [],
-  "affected": [],
-  "references": [
-    {
-      "type": "ADVISORY",
-      "url": "https://nvd.nist.gov/vuln/detail/CVE-2025-31693"
-    },
-    {
-      "type": "WEB",
-      "url": "https://www.drupal.org/sa-contrib-2025-022"
-    }
-  ],
-  "database_specific": {
-    "cwe_ids": [
-      "CWE-78"
-    ],
-    "severity": null,
-    "github_reviewed": false,
-    "github_reviewed_at": null,
-    "nvd_published_at": "2025-03-31T22:15:21Z"
-  }
-}
\ No newline at end of file