diff --git a/advisories/github-reviewed/2025/04/GHSA-36vv-q5jv-94cj/GHSA-36vv-q5jv-94cj.json b/advisories/github-reviewed/2025/04/GHSA-36vv-q5jv-94cj/GHSA-36vv-q5jv-94cj.json
new file mode 100644
index 00000000000..3562729a62c
--- /dev/null
+++ b/advisories/github-reviewed/2025/04/GHSA-36vv-q5jv-94cj/GHSA-36vv-q5jv-94cj.json
@@ -0,0 +1,80 @@
+{
+  "schema_version": "1.4.0",
+  "id": "GHSA-36vv-q5jv-94cj",
+  "modified": "2025-04-02T17:10:12Z",
+  "published": "2025-04-01T00:30:34Z",
+  "aliases": [
+    "CVE-2025-31682"
+  ],
+  "summary": "Drupal Google Tag Cross-Site Scripting (XSS) vulnerability",
+  "details": "Improper Neutralization of Input During Web Page Generation ('Cross-site Scripting') vulnerability in Drupal Google Tag allows Cross-Site Scripting (XSS). This issue affects Google Tag: from 0.0.0 before 1.8.0, from 2.0.0 before 2.0.8.",
+  "severity": [
+    {
+      "type": "CVSS_V4",
+      "score": "CVSS:4.0/AV:N/AC:L/AT:N/PR:H/UI:P/VC:N/VI:N/VA:N/SC:L/SI:L/SA:N"
+    }
+  ],
+  "affected": [
+    {
+      "package": {
+        "ecosystem": "Packagist",
+        "name": "drupal/google_tag"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "0"
+            },
+            {
+              "fixed": "1.8.0"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "package": {
+        "ecosystem": "Packagist",
+        "name": "drupal/google_tag"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "2.0.0"
+            },
+            {
+              "fixed": "2.0.8"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "references": [
+    {
+      "type": "ADVISORY",
+      "url": "https://nvd.nist.gov/vuln/detail/CVE-2025-31682"
+    },
+    {
+      "type": "PACKAGE",
+      "url": "https://git.drupalcode.org/project/google_tag"
+    },
+    {
+      "type": "WEB",
+      "url": "https://www.drupal.org/sa-contrib-2025-011"
+    }
+  ],
+  "database_specific": {
+    "cwe_ids": [
+      "CWE-79"
+    ],
+    "severity": "MODERATE",
+    "github_reviewed": true,
+    "github_reviewed_at": "2025-04-02T17:10:12Z",
+    "nvd_published_at": "2025-03-31T22:15:20Z"
+  }
+}
\ No newline at end of file
diff --git a/advisories/github-reviewed/2025/04/GHSA-6chf-hhqf-749c/GHSA-6chf-hhqf-749c.json b/advisories/github-reviewed/2025/04/GHSA-6chf-hhqf-749c/GHSA-6chf-hhqf-749c.json
new file mode 100644
index 00000000000..e939ad71901
--- /dev/null
+++ b/advisories/github-reviewed/2025/04/GHSA-6chf-hhqf-749c/GHSA-6chf-hhqf-749c.json
@@ -0,0 +1,61 @@
+{
+  "schema_version": "1.4.0",
+  "id": "GHSA-6chf-hhqf-749c",
+  "modified": "2025-04-02T17:10:48Z",
+  "published": "2025-04-01T00:30:34Z",
+  "aliases": [
+    "CVE-2025-31684"
+  ],
+  "summary": "Drupal OAuth2 Client Cross-Site Request Forgery (CSRF)",
+  "details": "Cross-Site Request Forgery (CSRF) vulnerability in Drupal OAuth2 Client allows Cross Site Request Forgery. This issue affects OAuth2 Client: from 0.0.0 before 4.1.3.",
+  "severity": [
+    {
+      "type": "CVSS_V4",
+      "score": "CVSS:4.0/AV:N/AC:H/AT:N/PR:N/UI:N/VC:N/VI:L/VA:N/SC:N/SI:N/SA:N/E:U"
+    }
+  ],
+  "affected": [
+    {
+      "package": {
+        "ecosystem": "Packagist",
+        "name": "drupal/oauth2_client"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "0"
+            },
+            {
+              "fixed": "4.1.3"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "references": [
+    {
+      "type": "ADVISORY",
+      "url": "https://nvd.nist.gov/vuln/detail/CVE-2025-31684"
+    },
+    {
+      "type": "PACKAGE",
+      "url": "https://git.drupalcode.org/project/oauth2_client"
+    },
+    {
+      "type": "WEB",
+      "url": "https://www.drupal.org/sa-contrib-2025-013"
+    }
+  ],
+  "database_specific": {
+    "cwe_ids": [
+      "CWE-352"
+    ],
+    "severity": "LOW",
+    "github_reviewed": true,
+    "github_reviewed_at": "2025-04-02T17:10:48Z",
+    "nvd_published_at": "2025-03-31T22:15:20Z"
+  }
+}
\ No newline at end of file
diff --git a/advisories/github-reviewed/2025/04/GHSA-jwpx-6c4p-q4jq/GHSA-jwpx-6c4p-q4jq.json b/advisories/github-reviewed/2025/04/GHSA-jwpx-6c4p-q4jq/GHSA-jwpx-6c4p-q4jq.json
new file mode 100644
index 00000000000..f9cae54e984
--- /dev/null
+++ b/advisories/github-reviewed/2025/04/GHSA-jwpx-6c4p-q4jq/GHSA-jwpx-6c4p-q4jq.json
@@ -0,0 +1,61 @@
+{
+  "schema_version": "1.4.0",
+  "id": "GHSA-jwpx-6c4p-q4jq",
+  "modified": "2025-04-02T17:09:04Z",
+  "published": "2025-04-01T00:30:34Z",
+  "aliases": [
+    "CVE-2025-31681"
+  ],
+  "summary": "Drupal Authenticator Login Missing Authorization vulnerability",
+  "details": "Missing Authorization vulnerability in Drupal Authenticator Login allows Forceful Browsing. This issue affects Authenticator Login: from 0.0.0 before 2.0.6.",
+  "severity": [
+    {
+      "type": "CVSS_V4",
+      "score": "CVSS:4.0/AV:N/AC:L/AT:N/PR:N/UI:N/VC:L/VI:H/VA:N/SC:N/SI:N/SA:N/E:U"
+    }
+  ],
+  "affected": [
+    {
+      "package": {
+        "ecosystem": "Packagist",
+        "name": "drupal/alogin"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "0"
+            },
+            {
+              "fixed": "2.0.6"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "references": [
+    {
+      "type": "ADVISORY",
+      "url": "https://nvd.nist.gov/vuln/detail/CVE-2025-31681"
+    },
+    {
+      "type": "PACKAGE",
+      "url": "https://git.drupalcode.org/project/alogin"
+    },
+    {
+      "type": "WEB",
+      "url": "https://www.drupal.org/sa-contrib-2025-009"
+    }
+  ],
+  "database_specific": {
+    "cwe_ids": [
+      "CWE-862"
+    ],
+    "severity": "MODERATE",
+    "github_reviewed": true,
+    "github_reviewed_at": "2025-04-02T17:09:04Z",
+    "nvd_published_at": "2025-03-31T22:15:20Z"
+  }
+}
\ No newline at end of file
diff --git a/advisories/github-reviewed/2025/04/GHSA-qchr-8m24-7v66/GHSA-qchr-8m24-7v66.json b/advisories/github-reviewed/2025/04/GHSA-qchr-8m24-7v66/GHSA-qchr-8m24-7v66.json
new file mode 100644
index 00000000000..8212d175d76
--- /dev/null
+++ b/advisories/github-reviewed/2025/04/GHSA-qchr-8m24-7v66/GHSA-qchr-8m24-7v66.json
@@ -0,0 +1,80 @@
+{
+  "schema_version": "1.4.0",
+  "id": "GHSA-qchr-8m24-7v66",
+  "modified": "2025-04-02T17:10:30Z",
+  "published": "2025-04-01T00:30:34Z",
+  "aliases": [
+    "CVE-2025-31683"
+  ],
+  "summary": "Drupal Google Tag Cross-Site Request Forgery (CSRF)",
+  "details": "Cross-Site Request Forgery (CSRF) vulnerability in Drupal Google Tag allows Cross Site Request Forgery. This issue affects Google Tag: from 0.0.0 before 1.8.0, from 2.0.0 before 2.0.8.",
+  "severity": [
+    {
+      "type": "CVSS_V4",
+      "score": "CVSS:4.0/AV:N/AC:H/AT:N/PR:N/UI:N/VC:N/VI:L/VA:N/SC:N/SI:N/SA:N"
+    }
+  ],
+  "affected": [
+    {
+      "package": {
+        "ecosystem": "Packagist",
+        "name": "drupal/google_tag"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "0"
+            },
+            {
+              "fixed": "1.8.0"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "package": {
+        "ecosystem": "Packagist",
+        "name": "drupal/google_tag"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "2.0.0"
+            },
+            {
+              "fixed": "2.0.8"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "references": [
+    {
+      "type": "ADVISORY",
+      "url": "https://nvd.nist.gov/vuln/detail/CVE-2025-31683"
+    },
+    {
+      "type": "PACKAGE",
+      "url": "https://git.drupalcode.org/project/google_tag"
+    },
+    {
+      "type": "WEB",
+      "url": "https://www.drupal.org/sa-contrib-2025-012"
+    }
+  ],
+  "database_specific": {
+    "cwe_ids": [
+      "CWE-352"
+    ],
+    "severity": "MODERATE",
+    "github_reviewed": true,
+    "github_reviewed_at": "2025-04-02T17:10:30Z",
+    "nvd_published_at": "2025-03-31T22:15:20Z"
+  }
+}
\ No newline at end of file
diff --git a/advisories/unreviewed/2025/04/GHSA-36vv-q5jv-94cj/GHSA-36vv-q5jv-94cj.json b/advisories/unreviewed/2025/04/GHSA-36vv-q5jv-94cj/GHSA-36vv-q5jv-94cj.json
deleted file mode 100644
index 05dabe03f66..00000000000
--- a/advisories/unreviewed/2025/04/GHSA-36vv-q5jv-94cj/GHSA-36vv-q5jv-94cj.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "schema_version": "1.4.0",
-  "id": "GHSA-36vv-q5jv-94cj",
-  "modified": "2025-04-01T00:30:34Z",
-  "published": "2025-04-01T00:30:34Z",
-  "aliases": [
-    "CVE-2025-31682"
-  ],
-  "details": "Improper Neutralization of Input During Web Page Generation ('Cross-site Scripting') vulnerability in Drupal Google Tag allows Cross-Site Scripting (XSS).This issue affects Google Tag: from 0.0.0 before 1.8.0, from 2.0.0 before 2.0.8.",
-  "severity": [],
-  "affected": [],
-  "references": [
-    {
-      "type": "ADVISORY",
-      "url": "https://nvd.nist.gov/vuln/detail/CVE-2025-31682"
-    },
-    {
-      "type": "WEB",
-      "url": "https://www.drupal.org/sa-contrib-2025-011"
-    }
-  ],
-  "database_specific": {
-    "cwe_ids": [
-      "CWE-79"
-    ],
-    "severity": null,
-    "github_reviewed": false,
-    "github_reviewed_at": null,
-    "nvd_published_at": "2025-03-31T22:15:20Z"
-  }
-}
\ No newline at end of file
diff --git a/advisories/unreviewed/2025/04/GHSA-6chf-hhqf-749c/GHSA-6chf-hhqf-749c.json b/advisories/unreviewed/2025/04/GHSA-6chf-hhqf-749c/GHSA-6chf-hhqf-749c.json
deleted file mode 100644
index bf19a9ffe4d..00000000000
--- a/advisories/unreviewed/2025/04/GHSA-6chf-hhqf-749c/GHSA-6chf-hhqf-749c.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "schema_version": "1.4.0",
-  "id": "GHSA-6chf-hhqf-749c",
-  "modified": "2025-04-01T00:30:34Z",
-  "published": "2025-04-01T00:30:34Z",
-  "aliases": [
-    "CVE-2025-31684"
-  ],
-  "details": "Cross-Site Request Forgery (CSRF) vulnerability in Drupal OAuth2 Client allows Cross Site Request Forgery.This issue affects OAuth2 Client: from 0.0.0 before 4.1.3.",
-  "severity": [],
-  "affected": [],
-  "references": [
-    {
-      "type": "ADVISORY",
-      "url": "https://nvd.nist.gov/vuln/detail/CVE-2025-31684"
-    },
-    {
-      "type": "WEB",
-      "url": "https://www.drupal.org/sa-contrib-2025-013"
-    }
-  ],
-  "database_specific": {
-    "cwe_ids": [
-      "CWE-352"
-    ],
-    "severity": null,
-    "github_reviewed": false,
-    "github_reviewed_at": null,
-    "nvd_published_at": "2025-03-31T22:15:20Z"
-  }
-}
\ No newline at end of file
diff --git a/advisories/unreviewed/2025/04/GHSA-jwpx-6c4p-q4jq/GHSA-jwpx-6c4p-q4jq.json b/advisories/unreviewed/2025/04/GHSA-jwpx-6c4p-q4jq/GHSA-jwpx-6c4p-q4jq.json
deleted file mode 100644
index a0d21c1b5b4..00000000000
--- a/advisories/unreviewed/2025/04/GHSA-jwpx-6c4p-q4jq/GHSA-jwpx-6c4p-q4jq.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "schema_version": "1.4.0",
-  "id": "GHSA-jwpx-6c4p-q4jq",
-  "modified": "2025-04-01T00:30:34Z",
-  "published": "2025-04-01T00:30:34Z",
-  "aliases": [
-    "CVE-2025-31681"
-  ],
-  "details": "Missing Authorization vulnerability in Drupal Authenticator Login allows Forceful Browsing.This issue affects Authenticator Login: from 0.0.0 before 2.0.6.",
-  "severity": [],
-  "affected": [],
-  "references": [
-    {
-      "type": "ADVISORY",
-      "url": "https://nvd.nist.gov/vuln/detail/CVE-2025-31681"
-    },
-    {
-      "type": "WEB",
-      "url": "https://www.drupal.org/sa-contrib-2025-009"
-    }
-  ],
-  "database_specific": {
-    "cwe_ids": [
-      "CWE-862"
-    ],
-    "severity": null,
-    "github_reviewed": false,
-    "github_reviewed_at": null,
-    "nvd_published_at": "2025-03-31T22:15:20Z"
-  }
-}
\ No newline at end of file
diff --git a/advisories/unreviewed/2025/04/GHSA-qchr-8m24-7v66/GHSA-qchr-8m24-7v66.json b/advisories/unreviewed/2025/04/GHSA-qchr-8m24-7v66/GHSA-qchr-8m24-7v66.json
deleted file mode 100644
index ad1aecb9934..00000000000
--- a/advisories/unreviewed/2025/04/GHSA-qchr-8m24-7v66/GHSA-qchr-8m24-7v66.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "schema_version": "1.4.0",
-  "id": "GHSA-qchr-8m24-7v66",
-  "modified": "2025-04-01T00:30:34Z",
-  "published": "2025-04-01T00:30:34Z",
-  "aliases": [
-    "CVE-2025-31683"
-  ],
-  "details": "Cross-Site Request Forgery (CSRF) vulnerability in Drupal Google Tag allows Cross Site Request Forgery.This issue affects Google Tag: from 0.0.0 before 1.8.0, from 2.0.0 before 2.0.8.",
-  "severity": [],
-  "affected": [],
-  "references": [
-    {
-      "type": "ADVISORY",
-      "url": "https://nvd.nist.gov/vuln/detail/CVE-2025-31683"
-    },
-    {
-      "type": "WEB",
-      "url": "https://www.drupal.org/sa-contrib-2025-012"
-    }
-  ],
-  "database_specific": {
-    "cwe_ids": [
-      "CWE-352"
-    ],
-    "severity": null,
-    "github_reviewed": false,
-    "github_reviewed_at": null,
-    "nvd_published_at": "2025-03-31T22:15:20Z"
-  }
-}
\ No newline at end of file