diff --git a/advisories/github-reviewed/2025/04/GHSA-4vjp-327p-w4qv/GHSA-4vjp-327p-w4qv.json b/advisories/github-reviewed/2025/04/GHSA-4vjp-327p-w4qv/GHSA-4vjp-327p-w4qv.json
new file mode 100644
index 00000000000..5c87db548c3
--- /dev/null
+++ b/advisories/github-reviewed/2025/04/GHSA-4vjp-327p-w4qv/GHSA-4vjp-327p-w4qv.json
@@ -0,0 +1,65 @@
+{
+  "schema_version": "1.4.0",
+  "id": "GHSA-4vjp-327p-w4qv",
+  "modified": "2025-04-02T22:39:27Z",
+  "published": "2025-04-02T15:31:38Z",
+  "aliases": [
+    "CVE-2025-31722"
+  ],
+  "summary": "Jenkins Templating Engine Plugin Vulnerable to Arbitrary Code Execution",
+  "details": "Jenkins Templating Engine Plugin allows defining libraries both in the global configuration, as well as scoped to folders containing the pipelines using them. While libraries in the global configuration can only be set up by administrators and can therefore be trusted, libraries defined in folders can be configured by users with Item/Configure permission.\n\nIn Templating Engine Plugin 2.5.3 and earlier, libraries defined in folders are not subject to sandbox protection. This vulnerability allows attackers with Item/Configure permission to execute arbitrary code in the context of the Jenkins controller JVM.\n\nIn Templating Engine Plugin 2.5.4, libraries defined in folders are subject to sandbox protection.",
+  "severity": [
+    {
+      "type": "CVSS_V3",
+      "score": "CVSS:3.1/AV:N/AC:L/PR:L/UI:N/S:U/C:H/I:H/A:H"
+    }
+  ],
+  "affected": [
+    {
+      "package": {
+        "ecosystem": "Maven",
+        "name": "org.jenkins-ci.plugins:templating-engine"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "0"
+            },
+            {
+              "fixed": "2.5.4"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "references": [
+    {
+      "type": "ADVISORY",
+      "url": "https://nvd.nist.gov/vuln/detail/CVE-2025-31722"
+    },
+    {
+      "type": "WEB",
+      "url": "https://github.com/jenkinsci/templating-engine-plugin/commit/bb2b4468b3bf4cea494afb8549af4e6450972653"
+    },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/jenkinsci/templating-engine-plugin"
+    },
+    {
+      "type": "WEB",
+      "url": "https://www.jenkins.io/security/advisory/2025-04-02/#SECURITY-3505"
+    }
+  ],
+  "database_specific": {
+    "cwe_ids": [
+      "CWE-94"
+    ],
+    "severity": "HIGH",
+    "github_reviewed": true,
+    "github_reviewed_at": "2025-04-02T22:39:27Z",
+    "nvd_published_at": "2025-04-02T15:15:59Z"
+  }
+}
\ No newline at end of file
diff --git a/advisories/github-reviewed/2025/04/GHSA-wr6w-jxg7-qpfh/GHSA-wr6w-jxg7-qpfh.json b/advisories/github-reviewed/2025/04/GHSA-wr6w-jxg7-qpfh/GHSA-wr6w-jxg7-qpfh.json
new file mode 100644
index 00000000000..3cb62bb1d46
--- /dev/null
+++ b/advisories/github-reviewed/2025/04/GHSA-wr6w-jxg7-qpfh/GHSA-wr6w-jxg7-qpfh.json
@@ -0,0 +1,80 @@
+{
+  "schema_version": "1.4.0",
+  "id": "GHSA-wr6w-jxg7-qpfh",
+  "modified": "2025-04-02T22:38:27Z",
+  "published": "2025-04-02T15:31:38Z",
+  "aliases": [
+    "CVE-2025-31721"
+  ],
+  "summary": "Jenkins Missing Permission Check",
+  "details": "Jenkins 2.503 and earlier, LTS 2.492.2 and earlier does not perform a permission check in an HTTP endpoint.\n\nThis allows attackers with Computer/Create permission but without Computer/Configure permission to copy an agent, gaining access to encrypted secrets in its configuration.\n\nThis is due to an incomplete fix of [SECURITY-3495](https://www.jenkins.io/security/advisory/2025-03-05/#SECURITY-3495)/CVE-2025-27622.\n\nJenkins 2.504, LTS 2.492.3 requires Computer/Configure permission to copy an agent containing secrets.",
+  "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": "Maven",
+        "name": "org.jenkins-ci.main:jenkins-core"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "2.500"
+            },
+            {
+              "fixed": "2.504"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "package": {
+        "ecosystem": "Maven",
+        "name": "org.jenkins-ci.main:jenkins-core"
+      },
+      "ranges": [
+        {
+          "type": "ECOSYSTEM",
+          "events": [
+            {
+              "introduced": "0"
+            },
+            {
+              "fixed": "2.492.3"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "references": [
+    {
+      "type": "ADVISORY",
+      "url": "https://nvd.nist.gov/vuln/detail/CVE-2025-31721"
+    },
+    {
+      "type": "WEB",
+      "url": "https://github.com/jenkinsci/jenkins/commit/b3651b475302e8dba20fc63c1ff89d144ec652f0"
+    },
+    {
+      "type": "WEB",
+      "url": "https://www.jenkins.io/security/advisory/2025-04-02/#SECURITY-3513"
+    }
+  ],
+  "database_specific": {
+    "cwe_ids": [
+      "CWE-862"
+    ],
+    "severity": "MODERATE",
+    "github_reviewed": true,
+    "github_reviewed_at": "2025-04-02T22:38:27Z",
+    "nvd_published_at": "2025-04-02T15:15:59Z"
+  }
+}
\ No newline at end of file
diff --git a/advisories/unreviewed/2025/04/GHSA-4vjp-327p-w4qv/GHSA-4vjp-327p-w4qv.json b/advisories/unreviewed/2025/04/GHSA-4vjp-327p-w4qv/GHSA-4vjp-327p-w4qv.json
deleted file mode 100644
index 740de2d4791..00000000000
--- a/advisories/unreviewed/2025/04/GHSA-4vjp-327p-w4qv/GHSA-4vjp-327p-w4qv.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "schema_version": "1.4.0",
-  "id": "GHSA-4vjp-327p-w4qv",
-  "modified": "2025-04-02T18:30:50Z",
-  "published": "2025-04-02T15:31:38Z",
-  "aliases": [
-    "CVE-2025-31722"
-  ],
-  "details": "In Jenkins Templating Engine Plugin 2.5.3 and earlier, libraries defined in folders are not subject to sandbox protection, allowing attackers with Item/Configure permission to execute arbitrary code in the context of the Jenkins controller JVM.",
-  "severity": [
-    {
-      "type": "CVSS_V3",
-      "score": "CVSS:3.1/AV:N/AC:L/PR:L/UI:N/S:U/C:H/I:H/A:H"
-    }
-  ],
-  "affected": [],
-  "references": [
-    {
-      "type": "ADVISORY",
-      "url": "https://nvd.nist.gov/vuln/detail/CVE-2025-31722"
-    },
-    {
-      "type": "WEB",
-      "url": "https://www.jenkins.io/security/advisory/2025-04-02/#SECURITY-3505"
-    }
-  ],
-  "database_specific": {
-    "cwe_ids": [
-      "CWE-94"
-    ],
-    "severity": "HIGH",
-    "github_reviewed": false,
-    "github_reviewed_at": null,
-    "nvd_published_at": "2025-04-02T15:15:59Z"
-  }
-}
\ No newline at end of file
diff --git a/advisories/unreviewed/2025/04/GHSA-wr6w-jxg7-qpfh/GHSA-wr6w-jxg7-qpfh.json b/advisories/unreviewed/2025/04/GHSA-wr6w-jxg7-qpfh/GHSA-wr6w-jxg7-qpfh.json
deleted file mode 100644
index fe2bd35de96..00000000000
--- a/advisories/unreviewed/2025/04/GHSA-wr6w-jxg7-qpfh/GHSA-wr6w-jxg7-qpfh.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "schema_version": "1.4.0",
-  "id": "GHSA-wr6w-jxg7-qpfh",
-  "modified": "2025-04-02T18:30:50Z",
-  "published": "2025-04-02T15:31:38Z",
-  "aliases": [
-    "CVE-2025-31721"
-  ],
-  "details": "A missing permission check in Jenkins 2.503 and earlier, LTS 2.492.2 and earlier allows attackers with Computer/Create permission but without Computer/Configure permission to copy an agent, gaining access to encrypted secrets in its configuration.",
-  "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-31721"
-    },
-    {
-      "type": "WEB",
-      "url": "https://www.jenkins.io/security/advisory/2025-04-02/#SECURITY-3513"
-    }
-  ],
-  "database_specific": {
-    "cwe_ids": [
-      "CWE-862"
-    ],
-    "severity": "MODERATE",
-    "github_reviewed": false,
-    "github_reviewed_at": null,
-    "nvd_published_at": "2025-04-02T15:15:59Z"
-  }
-}
\ No newline at end of file