diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3fed7e4145184d4..bf0fdb9c172193f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -49,8 +49,9 @@
 
 # Changelogs
 
-/src/content/changelog/ @cloudflare/pm-changelogs @cloudflare/pcx-cloudflare-one
-/src/assets/images/changelog/ @cloudflare/pm-changelogs @cloudflare/pcx-cloudflare-one
+/src/content/changelog/ @cloudflare/pm-changelogs @cloudflare/pcx-technical-writing
+/src/content/changelog/waf/ @cloudflare/firewall @vs-mg @cloudflare/pm-changelogs @cloudflare/pcx-technical-writing
+/src/assets/images/changelog/ @cloudflare/pm-changelogs @cloudflare/pcx-technical-writing
 /src/assets/images/ @cloudflare/pm-changelogs @cloudflare/pcx-technical-writing
 
 # Cloudflare One
diff --git a/public/__redirects b/public/__redirects
index 93fccf3dbdca244..5fc8208995b662f 100644
--- a/public/__redirects
+++ b/public/__redirects
@@ -35,6 +35,8 @@
 /network-interconnect/changelog/index.xml /changelog/rss/network-interconnect.xml 301
 /rules/changelog/index.xml /changelog/rss/rules.xml 301
 /ssl/changelog/index.xml /changelog/rss/ssl.xml 301
+/waf/change-log/index.xml /changelog/rss/waf.xml 301
+/waf/change-log/general-updates/index.xml /changelog/rss/waf.xml 301
 
 ## legacy
 /release-notes/index.xml /changelog/rss/index.xml 301
@@ -1550,7 +1552,34 @@
 /support/firewall/tools/ /waf/ 301
 /support/firewall/tools/configuring-cloudflare-rate-limiting/ /waf/reference/legacy/old-rate-limiting/ 301
 /support/firewall/tools/troubleshooting-cloudflare-rate-limiting/ /waf/reference/legacy/old-rate-limiting/troubleshooting/ 301
+/waf/change-log/2025-01-06/ /changelog/2025-01-06-waf-release/ 301
+/waf/change-log/2025-01-13/ /changelog/2025-01-13-waf-release/ 301
+/waf/change-log/2025-01-21/ /changelog/2025-01-21-waf-release/ 301
+/waf/change-log/2025-02-11/ /changelog/2025-02-11-waf-release/ 301
+/waf/change-log/2025-02-18/ /changelog/2025-02-18-waf-release/ 301
+/waf/change-log/2025-02-24/ /changelog/2025-02-24-waf-release/ 301
+/waf/change-log/2025-03-03/ /changelog/2025-03-03-waf-release/ 301
+/waf/change-log/2025-03-10/ /changelog/2025-03-10-waf-release/ 301
+/waf/change-log/2025-03-11-emergency/ /changelog/2025-03-11-emergency-waf-release/ 301
+/waf/change-log/2025-03-17/ /changelog/2025-03-17-waf-release/ 301
+/waf/change-log/2025-03-19-emergency/ /changelog/2025-03-19-emergency-waf-release/ 301
+/waf/change-log/2025-03-22-emergency/ /changelog/2025-03-22-emergency-waf-release/ 301
+/waf/change-log/2025-04-02/ /changelog/2025-04-02-waf-release/ 301
+/waf/change-log/2025-04-14/ /changelog/2025-04-14-waf-release/ 301
+/waf/change-log/2025-04-22/ /changelog/2025-04-22-waf-release/ 301
+/waf/change-log/2025-04-26-emergency/ /changelog/2025-04-26-emergency-waf-release/ 301
+/waf/change-log/2025-05-05/ /changelog/2025-05-05-waf-release/ 301
+/waf/change-log/2025-05-19/ /changelog/2025-05-19-waf-release/ 301
+/waf/change-log/2025-05-27/ /changelog/2025-05-27-waf-release/ 301
+/waf/change-log/2025-06-02/ /changelog/2025-06-02-waf-release/ 301
+/waf/change-log/2025-06-09/ /changelog/2025-06-09-waf-release/ 301
+/waf/change-log/2025-06-16/ /changelog/2025-06-16-waf-release/ 301
+/waf/change-log/2025-07-07/ /changelog/2025-07-07-waf-release/ 301
+/waf/change-log/2025-07-14/ /changelog/2025-07-14-waf-release/ 301
+/waf/change-log/2025-07-21/ /changelog/2025-07-21-waf-release/ 301
+/waf/change-log/2025-07-21-emergency/ /changelog/2025-07-21-emergency/ 301
 /waf/change-log/historical/ /waf/change-log/historical-2019/ 301
+/waf/change-log/managed-rulesets/ /waf/change-log/ 301
 /waf/custom-rules/manage-dashboard/ /waf/custom-rules/create-dashboard/ 301
 /waf/security-analytics/ /waf/analytics/security-analytics/ 301
 /waf/custom-rules/use-cases/require-valid-hmac-token/ /waf/custom-rules/use-cases/configure-token-authentication/ 301
diff --git a/src/components/AvailableChangelogFeeds.astro b/src/components/AvailableChangelogFeeds.astro
index cfde0f469f0eebd..7f08f3c212fd987 100644
--- a/src/components/AvailableChangelogFeeds.astro
+++ b/src/components/AvailableChangelogFeeds.astro
@@ -64,11 +64,10 @@ const productsByGroup = Object.entries(
 				</ul>
 			</Details>
 			{group === "Application security" && (
-				<Aside type="note" title="DDoS and WAF ruleset feeds">
+				<Aside type="note" title="DDoS ruleset feeds">
 					<p>
-						For <a href="/ddos-protection/">DDoS Protection</a> or{" "}
-						<a href="/waf/">WAF</a> updates to managed rulesets, please refer to
-						their independent feeds:
+						For <a href="/ddos-protection/">DDoS Protection</a> updates to
+						managed rulesets, please refer to their independent feeds:
 						<ul>
 							<li>
 								<p>
@@ -86,12 +85,6 @@ const productsByGroup = Object.entries(
 								</p>
 								<RSSButton href="/ddos-protection/change-log/http/index.xml" />
 							</li>
-							<li>
-								<p>
-									<a href="/waf/change-log/">WAF managed ruleset</a>
-								</p>
-								<RSSButton href="/waf/change-log/index.xml" />
-							</li>
 						</ul>
 					</p>
 				</Aside>
diff --git a/src/components/ProductChangelog.astro b/src/components/ProductChangelog.astro
index 454bfa248b4e5dd..d7f54d152ea9b52 100644
--- a/src/components/ProductChangelog.astro
+++ b/src/components/ProductChangelog.astro
@@ -22,6 +22,7 @@ const props = z
 	.and(
 		z.object({
 			hideEntry: z.string().optional(),
+			scheduled: z.boolean().default(false),
 		}),
 	);
 
@@ -37,7 +38,8 @@ if ("product" in input) {
 		return (
 			!e.data.hidden &&
 			e.data.products.some(({ id }) => id === input.product.id) &&
-			input.hideEntry !== e.id
+			input.hideEntry !== e.id &&
+			input.scheduled == e.data.scheduled
 		);
 	};
 } else {
@@ -57,6 +59,8 @@ const changelogs = await getChangelogs({ filter });
 
 <RSSButton href={rss} />
 
+{changelogs.length === 0 && <p>There are no scheduled entries at this time.</p>}
+
 {
 	changelogs.map(async (entry) => {
 		const { Content } = await render(entry);
diff --git a/src/content/changelog/waf/2024-05-23-improved-detection-capabilities.mdx b/src/content/changelog/waf/2024-05-23-improved-detection-capabilities.mdx
new file mode 100644
index 000000000000000..d6e207bc44052af
--- /dev/null
+++ b/src/content/changelog/waf/2024-05-23-improved-detection-capabilities.mdx
@@ -0,0 +1,7 @@
+---
+title: Improved detection capabilities
+description: WAF attack score now detects Base64 and Unicode escapes.
+date: 2024-05-23
+---
+
+[WAF attack score](/waf/detections/attack-score/) now automatically detects and decodes Base64 and JavaScript (Unicode escape sequences) in HTTP requests. This update is available for all customers with access to WAF attack score (Business customers with access to a single field and Enterprise customers).
diff --git a/src/content/changelog/waf/2024-08-29-fixed-occasional-attack-score-mismatches.mdx b/src/content/changelog/waf/2024-08-29-fixed-occasional-attack-score-mismatches.mdx
new file mode 100644
index 000000000000000..93c9a28b866d368
--- /dev/null
+++ b/src/content/changelog/waf/2024-08-29-fixed-occasional-attack-score-mismatches.mdx
@@ -0,0 +1,7 @@
+---
+title: Fixed occasional attack score mismatches
+description: Fixed mismatches between WAF attack score and subscores.
+date: 2024-08-29
+---
+
+Fixed an issue causing score mismatches between the global [WAF attack score](/waf/detections/attack-score/) and subscores. In certain cases, subscores were higher (not an attack) than expected while the global attack score was lower than expected (attack), leading to false positives.
diff --git a/src/content/changelog/waf/2024-11-04-new-table-in-security-analytics-and-security-events.mdx b/src/content/changelog/waf/2024-11-04-new-table-in-security-analytics-and-security-events.mdx
new file mode 100644
index 000000000000000..2bd1f183f4dd6b8
--- /dev/null
+++ b/src/content/changelog/waf/2024-11-04-new-table-in-security-analytics-and-security-events.mdx
@@ -0,0 +1,7 @@
+---
+title: New table in Security Analytics and Security Events
+description: New responsive table in Security Analytics and Events.
+date: 2024-11-04
+---
+
+Switched to a new, more responsive table in Security Analytics and Security Events.
diff --git a/src/content/changelog/waf/2024-11-14-security-events-pagination.mdx b/src/content/changelog/waf/2024-11-14-security-events-pagination.mdx
new file mode 100644
index 000000000000000..c8e9a70977a8a31
--- /dev/null
+++ b/src/content/changelog/waf/2024-11-14-security-events-pagination.mdx
@@ -0,0 +1,7 @@
+---
+title: Security Events pagination
+description: Fixed pagination and log count issues in Security Events.
+date: 2024-11-14
+---
+
+Fixed an issue with pagination in Security Events' sampled logs where some pages were missing data. Also removed the total count from the events log as these are only sampled logs.
diff --git a/src/content/changelog/waf/2024-12-10-change-order-of-list-items-in-ip-lists.mdx b/src/content/changelog/waf/2024-12-10-change-order-of-list-items-in-ip-lists.mdx
new file mode 100644
index 000000000000000..0424b513e16c0be
--- /dev/null
+++ b/src/content/changelog/waf/2024-12-10-change-order-of-list-items-in-ip-lists.mdx
@@ -0,0 +1,7 @@
+---
+title: Change the order of list items in IP Lists (for API and Terraform users)
+description: API and Terraform users may see changes in IP list item order.
+date: 2024-12-10
+---
+
+Due to changes in the API implementation, the order of list items in an IP list obtained via API or Terraform may change, which may cause Terraform to detect a change in Terraform state. To fix this issue, resync the Terraform state or upgrade the version of your Terraform Cloudflare provider to [version 4.44.0](https://github.com/cloudflare/terraform-provider-cloudflare/releases/tag/v4.44.0) or later.
diff --git a/src/content/changelog/waf/2024-12-18-improved-vpn-managed-list.mdx b/src/content/changelog/waf/2024-12-18-improved-vpn-managed-list.mdx
new file mode 100644
index 000000000000000..bcabb3e8eea1c17
--- /dev/null
+++ b/src/content/changelog/waf/2024-12-18-improved-vpn-managed-list.mdx
@@ -0,0 +1,7 @@
+---
+title: Improved VPN Managed List
+description: Improved management of VPN IP traffic.
+date: 2024-12-18
+---
+
+Customers can now effectively manage incoming traffic identified as originating from VPN IPs. Customers with compliance restrictions can now ensure compliance with local laws and regulations. Customers with CDN restrictions can use the improved VPN Managed List to prevent unauthorized access from users attempting to bypass geographical restrictions. With the new VPN Managed List enhancements, customers can improve their overall security posture to reduce exposure to unwanted or malicious traffic.
diff --git a/src/content/docs/waf/change-log/2025-01-06.mdx b/src/content/changelog/waf/2025-01-06-waf-release.mdx
similarity index 98%
rename from src/content/docs/waf/change-log/2025-01-06.mdx
rename to src/content/changelog/waf/2025-01-06-waf-release.mdx
index 666a26e371d042e..7b973a3e7c9c5aa 100644
--- a/src/content/docs/waf/change-log/2025-01-06.mdx
+++ b/src/content/changelog/waf/2025-01-06-waf-release.mdx
@@ -1,10 +1,7 @@
 ---
-title: "2025-01-06"
-type: table
-pcx_content_type: release-notes
-sidebar:
-  order: 806
-tableOfContents: false
+title: "WAF Release - 2025-01-06"
+description: Cloudflare WAF managed rulesets 2025-01-06 release
+date: 2025-01-06
 ---
 
 import { RuleID } from "~/components";
diff --git a/src/content/docs/waf/change-log/2025-01-13.mdx b/src/content/changelog/waf/2025-01-13-waf-release.mdx
similarity index 93%
rename from src/content/docs/waf/change-log/2025-01-13.mdx
rename to src/content/changelog/waf/2025-01-13-waf-release.mdx
index da709a93fcd331a..0f6d21bac87759f 100644
--- a/src/content/docs/waf/change-log/2025-01-13.mdx
+++ b/src/content/changelog/waf/2025-01-13-waf-release.mdx
@@ -1,10 +1,7 @@
 ---
-title: "2025-01-13"
-type: table
-pcx_content_type: release-notes
-sidebar:
-  order: 805
-tableOfContents: false
+title: "WAF Release - 2025-01-13"
+description: Cloudflare WAF managed rulesets 2025-01-13 release
+date: 2025-01-13
 ---
 
 import { RuleID } from "~/components";
diff --git a/src/content/docs/waf/change-log/2025-01-21.mdx b/src/content/changelog/waf/2025-01-21-waf-release.mdx
similarity index 88%
rename from src/content/docs/waf/change-log/2025-01-21.mdx
rename to src/content/changelog/waf/2025-01-21-waf-release.mdx
index b6c6631c7013001..0ae26a3faecc552 100644
--- a/src/content/docs/waf/change-log/2025-01-21.mdx
+++ b/src/content/changelog/waf/2025-01-21-waf-release.mdx
@@ -1,10 +1,7 @@
 ---
-title: "2025-01-21"
-type: table
-pcx_content_type: release-notes
-sidebar:
-  order: 804
-tableOfContents: false
+title: "WAF Release - 2025-01-21"
+description: Cloudflare WAF managed rulesets 2025-01-21 release
+date: 2025-01-21
 ---
 
 import { RuleID } from "~/components";
diff --git a/src/content/changelog/waf/2025-02-04-updated-leaked-credentials-database.mdx b/src/content/changelog/waf/2025-02-04-updated-leaked-credentials-database.mdx
new file mode 100644
index 000000000000000..2ae5b1d005544d9
--- /dev/null
+++ b/src/content/changelog/waf/2025-02-04-updated-leaked-credentials-database.mdx
@@ -0,0 +1,7 @@
+---
+title: Updated leaked credentials database
+description: New records added to the leaked credentials database.
+date: 2025-02-04
+---
+
+Added new records to the leaked credentials database from a third-party database.
diff --git a/src/content/docs/waf/change-log/2025-02-11.mdx b/src/content/changelog/waf/2025-02-11-waf-release.mdx
similarity index 94%
rename from src/content/docs/waf/change-log/2025-02-11.mdx
rename to src/content/changelog/waf/2025-02-11-waf-release.mdx
index 87937a2351fee7b..482d21c71a01cb2 100644
--- a/src/content/docs/waf/change-log/2025-02-11.mdx
+++ b/src/content/changelog/waf/2025-02-11-waf-release.mdx
@@ -1,10 +1,7 @@
 ---
-title: "2025-02-11"
-type: table
-pcx_content_type: release-notes
-sidebar:
-  order: 803
-tableOfContents: false
+title: "WAF Release - 2025-02-11"
+description: Cloudflare WAF managed rulesets 2025-02-11 release
+date: 2025-02-11
 ---
 
 import { RuleID } from "~/components";
diff --git a/src/content/docs/waf/change-log/2025-02-18.mdx b/src/content/changelog/waf/2025-02-18-waf-release.mdx
similarity index 93%
rename from src/content/docs/waf/change-log/2025-02-18.mdx
rename to src/content/changelog/waf/2025-02-18-waf-release.mdx
index 4e735fbe4b8b25d..a5753f90445f849 100644
--- a/src/content/docs/waf/change-log/2025-02-18.mdx
+++ b/src/content/changelog/waf/2025-02-18-waf-release.mdx
@@ -1,10 +1,7 @@
 ---
-title: "2025-02-18"
-type: table
-pcx_content_type: release-notes
-sidebar:
-  order: 802
-tableOfContents: false
+title: "WAF Release - 2025-02-18"
+description: Cloudflare WAF managed rulesets 2025-02-18 release
+date: 2025-02-18
 ---
 
 import { RuleID } from "~/components";
diff --git a/src/content/docs/waf/change-log/2025-02-24.mdx b/src/content/changelog/waf/2025-02-24-waf-release.mdx
similarity index 88%
rename from src/content/docs/waf/change-log/2025-02-24.mdx
rename to src/content/changelog/waf/2025-02-24-waf-release.mdx
index 77baae9353a3577..e9576ac8c745b5a 100644
--- a/src/content/docs/waf/change-log/2025-02-24.mdx
+++ b/src/content/changelog/waf/2025-02-24-waf-release.mdx
@@ -1,10 +1,7 @@
 ---
-title: "2025-02-24"
-type: table
-pcx_content_type: release-notes
-sidebar:
-  order: 801
-tableOfContents: false
+title: "WAF Release - 2025-02-24"
+description: Cloudflare WAF managed rulesets 2025-02-24 release
+date: 2025-02-24
 ---
 
 import { RuleID } from "~/components";
diff --git a/src/content/docs/waf/change-log/2025-03-03.mdx b/src/content/changelog/waf/2025-03-03-waf-release.mdx
similarity index 67%
rename from src/content/docs/waf/change-log/2025-03-03.mdx
rename to src/content/changelog/waf/2025-03-03-waf-release.mdx
index d571f7b9a00ca90..f42a0362fa57a13 100644
--- a/src/content/docs/waf/change-log/2025-03-03.mdx
+++ b/src/content/changelog/waf/2025-03-03-waf-release.mdx
@@ -1,10 +1,7 @@
 ---
-title: "2025-03-03"
-type: table
-pcx_content_type: release-notes
-sidebar:
-  order: 800
-tableOfContents: false
+title: "WAF Release - 2025-03-03"
+description: Cloudflare WAF managed rulesets 2025-03-03 release
+date: 2025-03-03
 ---
 
 import { RuleID } from "~/components";
@@ -28,7 +25,10 @@ import { RuleID } from "~/components";
 				<RuleID id="90356ececae3444b9accb3d393e63099" />
 			</td>
 			<td>100721</td>
-			<td>Ivanti - Remote Code Execution - CVE:CVE-2024-13159, CVE:CVE-2024-13160, CVE:CVE-2024-13161</td>
+			<td>
+				Ivanti - Remote Code Execution - CVE:CVE-2024-13159, CVE:CVE-2024-13160,
+				CVE:CVE-2024-13161
+			</td>
 			<td>Log</td>
 			<td>Block</td>
 			<td>This is a New Detection</td>
@@ -39,7 +39,10 @@ import { RuleID } from "~/components";
 				<RuleID id="6cf09ce2fa73482abb7f677ecac42ce2" />
 			</td>
 			<td>100596</td>
-			<td>Citrix Content Collaboration ShareFile - Remote Code Execution - CVE:CVE-2023-24489</td>
+			<td>
+				Citrix Content Collaboration ShareFile - Remote Code Execution -
+				CVE:CVE-2023-24489
+			</td>
 			<td>N/A</td>
 			<td>Block</td>
 			<td></td>
diff --git a/src/content/changelog/waf/2025-03-07-updated-leaked-credentials-database.mdx b/src/content/changelog/waf/2025-03-07-updated-leaked-credentials-database.mdx
new file mode 100644
index 000000000000000..2e607e87a64175e
--- /dev/null
+++ b/src/content/changelog/waf/2025-03-07-updated-leaked-credentials-database.mdx
@@ -0,0 +1,7 @@
+---
+title: Updated leaked credentials database
+description: New records added to the leaked credentials database.
+date: 2025-03-07
+---
+
+Added new records to the leaked credentials database. The record sources are: Have I Been Pwned (HIBP) database, RockYou 2024 dataset, and another third-party database.
diff --git a/src/content/docs/waf/change-log/2025-03-10.mdx b/src/content/changelog/waf/2025-03-10-waf-release.mdx
similarity index 88%
rename from src/content/docs/waf/change-log/2025-03-10.mdx
rename to src/content/changelog/waf/2025-03-10-waf-release.mdx
index cc03d045f04e772..193312809e1b62e 100644
--- a/src/content/docs/waf/change-log/2025-03-10.mdx
+++ b/src/content/changelog/waf/2025-03-10-waf-release.mdx
@@ -1,10 +1,7 @@
 ---
-title: "2025-03-10"
-type: table
-pcx_content_type: release-notes
-sidebar:
-  order: 799
-tableOfContents: false
+title: "WAF Release - 2025-03-10"
+description: Cloudflare WAF managed rulesets 2025-03-10 release
+date: 2025-03-10
 ---
 
 import { RuleID } from "~/components";
diff --git a/src/content/docs/waf/change-log/2025-03-11-emergency.mdx b/src/content/changelog/waf/2025-03-11-emergency-waf-release.mdx
similarity index 80%
rename from src/content/docs/waf/change-log/2025-03-11-emergency.mdx
rename to src/content/changelog/waf/2025-03-11-emergency-waf-release.mdx
index 366466cef248cad..45d9eb221c07a2b 100644
--- a/src/content/docs/waf/change-log/2025-03-11-emergency.mdx
+++ b/src/content/changelog/waf/2025-03-11-emergency-waf-release.mdx
@@ -1,10 +1,7 @@
 ---
-title: "2025-03-11 - Emergency"
-type: table
-pcx_content_type: release-notes
-sidebar:
-  order: 798
-tableOfContents: false
+title: "WAF Release - 2025-03-11 - Emergency"
+description: Cloudflare WAF managed rulesets 2025-03-11 emergency release
+date: 2025-03-11
 ---
 
 import { RuleID } from "~/components";
diff --git a/src/content/docs/waf/change-log/2025-03-17.mdx b/src/content/changelog/waf/2025-03-17-waf-release.mdx
similarity index 86%
rename from src/content/docs/waf/change-log/2025-03-17.mdx
rename to src/content/changelog/waf/2025-03-17-waf-release.mdx
index 67b8f3c38956f5c..9b56d8c4b75b65a 100644
--- a/src/content/docs/waf/change-log/2025-03-17.mdx
+++ b/src/content/changelog/waf/2025-03-17-waf-release.mdx
@@ -1,10 +1,7 @@
 ---
-title: "2025-03-17"
-type: table
-pcx_content_type: release-notes
-sidebar:
-  order: 797
-tableOfContents: false
+title: "WAF Release - 2025-03-17"
+description: Cloudflare WAF managed rulesets 2025-03-17 release
+date: 2025-03-17
 ---
 
 import { RuleID } from "~/components";
@@ -28,7 +25,10 @@ import { RuleID } from "~/components";
 				<RuleID id="28b2a12993a04e62a98abcd9e59ec18a" />
 			</td>
 			<td>100725</td>
-			<td>Fortinet FortiManager - Remote Code Execution - CVE:CVE-2023-42791, CVE:CVE-2024-23666</td>
+			<td>
+				Fortinet FortiManager - Remote Code Execution - CVE:CVE-2023-42791,
+				CVE:CVE-2024-23666
+			</td>
 			<td>Log</td>
 			<td>Block</td>
 			<td></td>
@@ -83,7 +83,9 @@ import { RuleID } from "~/components";
 				<RuleID id="35fe23e7bd324d00816c82d098d47b69" />
 			</td>
 			<td>100730</td>
-			<td>Pentaho - Template Injection - CVE:CVE-2022-43769, CVE:CVE-2022-43939</td>
+			<td>
+				Pentaho - Template Injection - CVE:CVE-2022-43769, CVE:CVE-2022-43939
+			</td>
 			<td>Log</td>
 			<td>Block</td>
 			<td></td>
diff --git a/src/content/docs/waf/change-log/2025-03-19-emergency.mdx b/src/content/changelog/waf/2025-03-19-emergency-waf-release.mdx
similarity index 81%
rename from src/content/docs/waf/change-log/2025-03-19-emergency.mdx
rename to src/content/changelog/waf/2025-03-19-emergency-waf-release.mdx
index a120faf907b9ff2..51ef54287e29c4f 100644
--- a/src/content/docs/waf/change-log/2025-03-19-emergency.mdx
+++ b/src/content/changelog/waf/2025-03-19-emergency-waf-release.mdx
@@ -1,10 +1,7 @@
 ---
-title: "2025-03-19 - Emergency"
-type: table
-pcx_content_type: release-notes
-sidebar:
-  order: 796
-tableOfContents: false
+title: "WAF Release - 2025-03-19 - Emergency"
+description: Cloudflare WAF managed rulesets 2025-03-19 release
+date: 2025-03-19
 ---
 
 import { RuleID } from "~/components";
diff --git a/src/content/docs/waf/change-log/2025-03-22-emergency.mdx b/src/content/changelog/waf/2025-03-22-emergency-waf-release.mdx
similarity index 81%
rename from src/content/docs/waf/change-log/2025-03-22-emergency.mdx
rename to src/content/changelog/waf/2025-03-22-emergency-waf-release.mdx
index da56cb7e0d60479..a06dc296a81fb35 100644
--- a/src/content/docs/waf/change-log/2025-03-22-emergency.mdx
+++ b/src/content/changelog/waf/2025-03-22-emergency-waf-release.mdx
@@ -1,10 +1,7 @@
 ---
-title: "2025-03-22 - Emergency"
-type: table
-pcx_content_type: release-notes
-sidebar:
-  order: 795
-tableOfContents: false
+title: "WAF Release - 2025-03-22 - Emergency"
+description: Cloudflare WAF managed rulesets 2025-03-22 release
+date: 2025-03-22
 ---
 
 import { RuleID } from "~/components";
diff --git a/src/content/docs/waf/change-log/2025-04-02.mdx b/src/content/changelog/waf/2025-04-02-waf-release.mdx
similarity index 90%
rename from src/content/docs/waf/change-log/2025-04-02.mdx
rename to src/content/changelog/waf/2025-04-02-waf-release.mdx
index 72b357bede5dcfd..581fb75617968ac 100644
--- a/src/content/docs/waf/change-log/2025-04-02.mdx
+++ b/src/content/changelog/waf/2025-04-02-waf-release.mdx
@@ -1,10 +1,7 @@
 ---
-title: "2025-04-02"
-type: table
-pcx_content_type: release-notes
-sidebar:
-  order: 794
-tableOfContents: false
+title: "WAF Release - 2025-04-02"
+description: Cloudflare WAF managed rulesets 2025-04-02 release
+date: 2025-04-02
 ---
 
 import { RuleID } from "~/components";
@@ -39,7 +36,9 @@ import { RuleID } from "~/components";
 				<RuleID id="8350947451a1401c934f5e660f101cca" />
 			</td>
 			<td>100733</td>
-			<td>Angular-Base64-Upload - Remote Code Execution - CVE:CVE-2024-42640</td>
+			<td>
+				Angular-Base64-Upload - Remote Code Execution - CVE:CVE-2024-42640
+			</td>
 			<td>Log</td>
 			<td>Block</td>
 			<td>This is a New Detection</td>
@@ -61,7 +60,10 @@ import { RuleID } from "~/components";
 				<RuleID id="3d6bf99039b54312a1a2165590aea1ca" />
 			</td>
 			<td>100735</td>
-			<td>Progress Software WhatsUp Gold - Remote Code Execution - CVE:CVE-2024-4885</td>
+			<td>
+				Progress Software WhatsUp Gold - Remote Code Execution -
+				CVE:CVE-2024-4885
+			</td>
 			<td>Log</td>
 			<td>Block</td>
 			<td>This is a New Detection</td>
@@ -127,7 +129,10 @@ import { RuleID } from "~/components";
 				<RuleID id="e35c9a670b864a3ba0203ffb1bc977d1" />
 			</td>
 			<td>100005</td>
-			<td>DotNetNuke - File Inclusion - CVE:CVE-2018-9126, CVE:CVE-2011-1892, CVE:CVE-2022-31474</td>
+			<td>
+				DotNetNuke - File Inclusion - CVE:CVE-2018-9126, CVE:CVE-2011-1892,
+				CVE:CVE-2022-31474
+			</td>
 			<td>N/A</td>
 			<td>Disabled</td>
 			<td>N/A</td>
@@ -160,7 +165,10 @@ import { RuleID } from "~/components";
 				<RuleID id="533fbad558ce4c5ebcf013f09a5581d0" />
 			</td>
 			<td>100622C</td>
-			<td>Ivanti - Command Injection - CVE:CVE-2023-46805, CVE:CVE-2024-21887, CVE:CVE-2024-22024</td>
+			<td>
+				Ivanti - Command Injection - CVE:CVE-2023-46805, CVE:CVE-2024-21887,
+				CVE:CVE-2024-22024
+			</td>
 			<td>N/A</td>
 			<td>Block</td>
 			<td>N/A</td>
diff --git a/src/content/docs/waf/change-log/2025-04-14.mdx b/src/content/changelog/waf/2025-04-14-waf-release.mdx
similarity index 83%
rename from src/content/docs/waf/change-log/2025-04-14.mdx
rename to src/content/changelog/waf/2025-04-14-waf-release.mdx
index 2bad80d688a3736..c17eb0cbb292c21 100644
--- a/src/content/docs/waf/change-log/2025-04-14.mdx
+++ b/src/content/changelog/waf/2025-04-14-waf-release.mdx
@@ -1,10 +1,7 @@
 ---
-title: "2025-04-14"
-type: table
-pcx_content_type: release-notes
-sidebar:
-  order: 793
-tableOfContents: false
+title: "WAF Release - 2025-04-14"
+description: Cloudflare WAF managed rulesets 2025-04-14 release
+date: 2025-04-14
 ---
 
 import { RuleID } from "~/components";
diff --git a/src/content/docs/waf/change-log/2025-04-22.mdx b/src/content/changelog/waf/2025-04-22-waf-release.mdx
similarity index 96%
rename from src/content/docs/waf/change-log/2025-04-22.mdx
rename to src/content/changelog/waf/2025-04-22-waf-release.mdx
index 552e5b71d60013f..46e7b51d8872caf 100644
--- a/src/content/docs/waf/change-log/2025-04-22.mdx
+++ b/src/content/changelog/waf/2025-04-22-waf-release.mdx
@@ -1,10 +1,7 @@
 ---
-title: "2025-04-22"
-type: table
-pcx_content_type: release-notes
-sidebar:
-  order: 792
-tableOfContents: false
+title: "WAF Release - 2025-04-22"
+description: Cloudflare WAF managed rulesets 2025-04-22 release
+date: 2025-04-22
 ---
 
 import { RuleID } from "~/components";
diff --git a/src/content/docs/waf/change-log/2025-04-26-emergency.mdx b/src/content/changelog/waf/2025-04-26-emergency-waf-release.mdx
similarity index 66%
rename from src/content/docs/waf/change-log/2025-04-26-emergency.mdx
rename to src/content/changelog/waf/2025-04-26-emergency-waf-release.mdx
index b943a060e54142c..c330fdcb0e27caa 100644
--- a/src/content/docs/waf/change-log/2025-04-26-emergency.mdx
+++ b/src/content/changelog/waf/2025-04-26-emergency-waf-release.mdx
@@ -1,10 +1,7 @@
 ---
-title: "2025-04-26 - Emergency"
-type: table
-pcx_content_type: release-notes
-sidebar:
-  order: 791
-tableOfContents: false
+title: "WAF Release - 2025-04-26 - Emergency"
+description: Cloudflare WAF managed rulesets 2025-04-26 emergency release
+date: 2025-04-26
 ---
 
 import { RuleID } from "~/components";
@@ -28,10 +25,13 @@ import { RuleID } from "~/components";
 				<RuleID id="54ea354d7f2d43c69b238d1419fcc883" />
 			</td>
 			<td>100755</td>
-			<td>React.js - Router and Remix Vulnerability - CVE:CVE-2025-43864, CVE:CVE-2025-43865</td>
+			<td>
+				React.js - Router and Remix Vulnerability - CVE:CVE-2025-43864,
+				CVE:CVE-2025-43865
+			</td>
 			<td>Block</td>
 			<td>Block</td>
 			<td>This is a New Detection</td>
 		</tr>
 	</tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/src/content/docs/waf/change-log/2025-05-05.mdx b/src/content/changelog/waf/2025-05-05-waf-release.mdx
similarity index 92%
rename from src/content/docs/waf/change-log/2025-05-05.mdx
rename to src/content/changelog/waf/2025-05-05-waf-release.mdx
index 7f317aa58295797..9469aa256644a39 100644
--- a/src/content/docs/waf/change-log/2025-05-05.mdx
+++ b/src/content/changelog/waf/2025-05-05-waf-release.mdx
@@ -1,10 +1,7 @@
 ---
-title: "2025-05-05"
-type: table
-pcx_content_type: release-notes
-sidebar:
-  order: 790
-tableOfContents: false
+title: "WAF Release - 2025-05-05"
+description: Cloudflare WAF managed rulesets 2025-05-05 release
+date: 2025-05-05
 ---
 
 import { RuleID } from "~/components";
@@ -68,7 +65,10 @@ Customers using the Managed Ruleset will receive rule coverage following this we
 				<RuleID id="616ad0e03892473191ca1df4e9cf745d" />
 			</td>
 			<td>100750</td>
-			<td>SonicWall SMA - Dangerous File Upload - CVE:CVE-2021-20040, CVE:CVE-2021-20041, CVE:CVE-2021-20042</td>
+			<td>
+				SonicWall SMA - Dangerous File Upload - CVE:CVE-2021-20040,
+				CVE:CVE-2021-20041, CVE:CVE-2021-20042
+			</td>
 			<td>Log</td>
 			<td>Block</td>
 			<td>This is a New Detection</td>
diff --git a/src/content/docs/waf/change-log/2025-05-19.mdx b/src/content/changelog/waf/2025-05-19-waf-release.mdx
similarity index 90%
rename from src/content/docs/waf/change-log/2025-05-19.mdx
rename to src/content/changelog/waf/2025-05-19-waf-release.mdx
index 7f902a9a8e04561..1b2f97014d4eae8 100644
--- a/src/content/docs/waf/change-log/2025-05-19.mdx
+++ b/src/content/changelog/waf/2025-05-19-waf-release.mdx
@@ -1,10 +1,7 @@
 ---
-title: "2025-05-19"
-type: table
-pcx_content_type: release-notes
-sidebar:
-  order: 789
-tableOfContents: false
+title: "WAF Release - 2025-05-19"
+description: Cloudflare WAF managed rulesets 2025-05-19 release
+date: 2025-05-19
 ---
 
 import { RuleID } from "~/components";
@@ -16,8 +13,8 @@ This week's analysis covers four vulnerabilities, with three rated critical due
 - Commvault Command Center (CVE-2025-34028) exposes an unauthenticated RCE via insecure command injection paths in the web UI. This is critical due to its use in enterprise backup environments.
 - BentoML (CVE-2025-27520) reveals an exploitable vector where serialized payloads in model deployment APIs can lead to arbitrary command execution. This targets modern AI/ML infrastructure.
 - Craft CMS (CVE-2024-56145) allows RCE through template injection in unauthenticated endpoints. It poses a significant risk for content-heavy websites with plugin extensions.
-- Apache HTTP Server (CVE-2024-38475) discloses sensitive server config data due to misconfigured 
-`mod_proxy` behavior. While not RCE, this is useful for pre-attack recon.
+- Apache HTTP Server (CVE-2024-38475) discloses sensitive server config data due to misconfigured
+  `mod_proxy` behavior. While not RCE, this is useful for pre-attack recon.
 
 **Impact**
 
@@ -55,7 +52,9 @@ Apache HTTPD information leak can support targeted reconnaissance, increasing th
 				<RuleID id="28a22a685bba478d99bc904526a517f1" />
 			</td>
 			<td>100747</td>
-			<td>Commvault Command Center - Remote Code Execution - CVE:CVE-2025-34028</td>
+			<td>
+				Commvault Command Center - Remote Code Execution - CVE:CVE-2025-34028
+			</td>
 			<td>Log</td>
 			<td>Block</td>
 			<td>This is a New Detection</td>
diff --git a/src/content/docs/waf/change-log/2025-05-27.mdx b/src/content/changelog/waf/2025-05-27-waf-release.mdx
similarity index 97%
rename from src/content/docs/waf/change-log/2025-05-27.mdx
rename to src/content/changelog/waf/2025-05-27-waf-release.mdx
index 8200ee301144de8..341f10bd1c0b62e 100644
--- a/src/content/docs/waf/change-log/2025-05-27.mdx
+++ b/src/content/changelog/waf/2025-05-27-waf-release.mdx
@@ -1,10 +1,7 @@
 ---
-title: "2025-05-27"
-type: table
-pcx_content_type: release-notes
-sidebar:
-  order: 788
-tableOfContents: false
+title: "WAF Release - 2025-05-27"
+description: Cloudflare WAF managed rulesets 2025-05-27 release
+date: 2025-05-27
 ---
 
 import { RuleID } from "~/components";
diff --git a/src/content/changelog/waf/2025-05-28-updated-attack-score-model.mdx b/src/content/changelog/waf/2025-05-28-updated-attack-score-model.mdx
new file mode 100644
index 000000000000000..94b76d766cef561
--- /dev/null
+++ b/src/content/changelog/waf/2025-05-28-updated-attack-score-model.mdx
@@ -0,0 +1,9 @@
+---
+title: Updated attack score model
+description: An updated attack score model for Cloudflare WAF to reduce false positives.
+date: 2025-05-28
+---
+
+We have deployed an updated attack score model focused on enhancing the detection of multiple false positives (FPs).
+
+As a result of this improvement, some changes in observed attack scores are expected.
diff --git a/src/content/docs/waf/change-log/2025-06-02.mdx b/src/content/changelog/waf/2025-06-02-waf-release.mdx
similarity index 96%
rename from src/content/docs/waf/change-log/2025-06-02.mdx
rename to src/content/changelog/waf/2025-06-02-waf-release.mdx
index 90266241ee78ee6..dc18eab32ef706e 100644
--- a/src/content/docs/waf/change-log/2025-06-02.mdx
+++ b/src/content/changelog/waf/2025-06-02-waf-release.mdx
@@ -1,10 +1,7 @@
 ---
-title: "2025-06-02"
-type: table
-pcx_content_type: release-notes
-sidebar:
-  order: 787
-tableOfContents: false
+title: "WAF Release - 2025-06-02"
+description: Cloudflare WAF managed rulesets 2025-06-02 release
+date: 2025-06-02
 ---
 
 import { RuleID } from "~/components";
@@ -114,4 +111,4 @@ These vulnerabilities expose critical infrastructure across networking, AI platf
 			<td>This is a New Detection</td>
 		</tr>
 	</tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/src/content/docs/waf/change-log/2025-06-09.mdx b/src/content/changelog/waf/2025-06-09-waf-release.mdx
similarity index 92%
rename from src/content/docs/waf/change-log/2025-06-09.mdx
rename to src/content/changelog/waf/2025-06-09-waf-release.mdx
index 483df7a37196b84..2f6ff5b68b37d25 100644
--- a/src/content/docs/waf/change-log/2025-06-09.mdx
+++ b/src/content/changelog/waf/2025-06-09-waf-release.mdx
@@ -1,10 +1,7 @@
 ---
-title: "2025-06-09"
-type: table
-pcx_content_type: release-notes
-sidebar:
-  order: 786
-tableOfContents: false
+title: "WAF Release - 2025-06-09"
+description: Cloudflare WAF managed rulesets 2025-06-09 release
+date: 2025-06-09
 ---
 
 import { RuleID } from "~/components";
@@ -41,7 +38,9 @@ These vulnerabilities target widely deployed CMS, ERP, and VoIP systems. RCE fla
 				<RuleID id="4afd50a3ef1948bba87c4e620debd86e" />
 			</td>
 			<td>100769</td>
-			<td>WordPress OttoKit Plugin - Privilege Escalation - CVE:CVE-2025-27007</td>
+			<td>
+				WordPress OttoKit Plugin - Privilege Escalation - CVE:CVE-2025-27007
+			</td>
 			<td>Log</td>
 			<td>Block</td>
 			<td>This is a New Detection</td>
@@ -80,4 +79,4 @@ These vulnerabilities target widely deployed CMS, ERP, and VoIP systems. RCE fla
 			<td>This is a New Detection</td>
 		</tr>
 	</tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/src/content/docs/waf/change-log/2025-06-16.mdx b/src/content/changelog/waf/2025-06-16-waf-release.mdx
similarity index 93%
rename from src/content/docs/waf/change-log/2025-06-16.mdx
rename to src/content/changelog/waf/2025-06-16-waf-release.mdx
index 48ce283ce65224e..720c47ff07410f2 100644
--- a/src/content/docs/waf/change-log/2025-06-16.mdx
+++ b/src/content/changelog/waf/2025-06-16-waf-release.mdx
@@ -1,10 +1,7 @@
 ---
-title: "2025-06-16"
-type: table
-pcx_content_type: release-notes
-sidebar:
-  order: 785
-tableOfContents: false
+title: "WAF Release - 2025-06-16"
+description: Cloudflare WAF managed rulesets 2025-06-16 release
+date: 2025-06-16
 ---
 
 import { RuleID } from "~/components";
@@ -67,7 +64,10 @@ These vulnerabilities span core systems — from routers to e-commerce to email.
 				<RuleID id="2672b175a25548aa8e0107b12e1648d2" />
 			</td>
 			<td>100785</td>
-			<td>vBulletin - Remote Code Execution - CVE:CVE-2025-48827, CVE:CVE-2025-48828</td>
+			<td>
+				vBulletin - Remote Code Execution - CVE:CVE-2025-48827,
+				CVE:CVE-2025-48828
+			</td>
 			<td>Log</td>
 			<td>Block</td>
 			<td>This is a New Detection</td>
@@ -122,10 +122,13 @@ These vulnerabilities span core systems — from routers to e-commerce to email.
 				<RuleID id="d38e657bd43f4d809c28157dfa338296" />
 			</td>
 			<td>100794</td>
-			<td>WordPress WooCommerce Plugin - Dangerous File Upload - CVE:CVE-2025-47577</td>
+			<td>
+				WordPress WooCommerce Plugin - Dangerous File Upload -
+				CVE:CVE-2025-47577
+			</td>
 			<td>Log</td>
 			<td>Block</td>
 			<td>This is a New Detection</td>
 		</tr>
 	</tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/src/content/docs/waf/change-log/2025-07-07.mdx b/src/content/changelog/waf/2025-07-07-waf-release.mdx
similarity index 95%
rename from src/content/docs/waf/change-log/2025-07-07.mdx
rename to src/content/changelog/waf/2025-07-07-waf-release.mdx
index e55319fade05a17..7a8e3466f200391 100644
--- a/src/content/docs/waf/change-log/2025-07-07.mdx
+++ b/src/content/changelog/waf/2025-07-07-waf-release.mdx
@@ -1,10 +1,7 @@
 ---
-title: "2025-07-07"
-type: table
-pcx_content_type: release-notes
-sidebar:
-  order: 784
-tableOfContents: false
+title: "WAF Release - 2025-07-07"
+description: Cloudflare WAF managed rulesets 2025-07-07 release
+date: 2025-07-07
 ---
 
 import { RuleID } from "~/components";
@@ -68,4 +65,4 @@ These vulnerabilities affect core business infrastructure, from web interfaces t
 			<td>This is a New Detection</td>
 		</tr>
 	</tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/src/content/docs/waf/change-log/2025-07-14.mdx b/src/content/changelog/waf/2025-07-14-waf-release.mdx
similarity index 95%
rename from src/content/docs/waf/change-log/2025-07-14.mdx
rename to src/content/changelog/waf/2025-07-14-waf-release.mdx
index 75b841739f17565..2197fb5a4dd733a 100644
--- a/src/content/docs/waf/change-log/2025-07-14.mdx
+++ b/src/content/changelog/waf/2025-07-14-waf-release.mdx
@@ -1,10 +1,7 @@
 ---
-title: "2025-07-14"
-type: table
-pcx_content_type: release-notes
-sidebar:
-  order: 783
-tableOfContents: false
+title: "WAF Release - 2025-07-14"
+description: Cloudflare WAF managed rulesets 2025-07-14 release
+date: 2025-07-14
 ---
 
 import { RuleID } from "~/components";
@@ -68,4 +65,4 @@ These vulnerabilities target both user-facing components and back-end databases,
 			<td>This is a New Detection</td>
 		</tr>
 	</tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/src/content/changelog/waf/2025-07-21-emergency.mdx b/src/content/changelog/waf/2025-07-21-emergency.mdx
index 09ea5a6f09419a7..ce9154530bc73e3 100644
--- a/src/content/changelog/waf/2025-07-21-emergency.mdx
+++ b/src/content/changelog/waf/2025-07-21-emergency.mdx
@@ -1,5 +1,5 @@
 ---
-title: "2025-07-21 - Emergency WAF release"
+title: "WAF Release - 2025-07-21 - Emergency"
 description: This week's update highlights several high-impact vulnerabilities affecting Microsoft SharePoint Server.
 date: 2025-07-21
 ---
diff --git a/src/content/docs/waf/change-log/2025-07-21.mdx b/src/content/changelog/waf/2025-07-21-waf-release.mdx
similarity index 64%
rename from src/content/docs/waf/change-log/2025-07-21.mdx
rename to src/content/changelog/waf/2025-07-21-waf-release.mdx
index 9d1a8c5db47496d..f448f11f7952c70 100644
--- a/src/content/docs/waf/change-log/2025-07-21.mdx
+++ b/src/content/changelog/waf/2025-07-21-waf-release.mdx
@@ -1,19 +1,16 @@
 ---
-title: "2025-07-21"
-type: table
-pcx_content_type: release-notes
-sidebar:
-  order: 782
-tableOfContents: false
+title: "WAF Release - 2025-07-21"
+description: Cloudflare WAF managed rulesets 2025-07-21 release
+date: 2025-07-21
 ---
 
 import { RuleID } from "~/components";
 
-This week’s update spotlights several critical vulnerabilities across Citrix NetScaler Memory Disclosure, FTP servers and network application. Several flaws enable unauthenticated remote code execution or sensitive data exposure, posing a significant risk to enterprise security.
+This week's update spotlights several critical vulnerabilities across Citrix NetScaler Memory Disclosure, FTP servers and network application. Several flaws enable unauthenticated remote code execution or sensitive data exposure, posing a significant risk to enterprise security.
 
 **Key Findings**
 
-- Wing FTP Server (CVE-2025-47812):  A critical Remote Code Execution (RCE) vulnerability that enables unauthenticated attackers to execute arbitrary code with root/SYSTEM-level privileges by exploiting a Lua injection flaw.
+- Wing FTP Server (CVE-2025-47812): A critical Remote Code Execution (RCE) vulnerability that enables unauthenticated attackers to execute arbitrary code with root/SYSTEM-level privileges by exploiting a Lua injection flaw.
 - Infoblox NetMRI (CVE-2025-32813): A remote unauthenticated command injection flaw that allows an attacker to execute arbitrary commands, potentially leading to unauthorized access.
 - Citrix Netscaler ADC (CVE-2025-5777, CVE-2023-4966): A sensitive information disclosure vulnerability, also known as "Citrix Bleed2", that allows the disclosure of memory and subsequent remote access session hijacking.
 - Akamai CloudTest (CVE-2025-49493): An XML External Entity (XXE) injection that could lead to read local files on the system by manipulating XML input.
@@ -34,72 +31,72 @@ These vulnerabilities affect critical enterprise infrastructure, from file trans
 			<th>Comments</th>
 		</tr>
 	</thead>
-       <tbody>
- 		<tr>
+	<tbody>
+		<tr>
 			<td>Cloudflare Managed Ruleset</td>
 			<td>
-					<RuleID id="6ab3bd3b58fb4325ac2d3cc73461ec9e" />
+				<RuleID id="6ab3bd3b58fb4325ac2d3cc73461ec9e" />
 			</td>
 			<td>100804</td>
 			<td>BerriAI - SSRF - CVE:CVE-2024-6587</td>
 			<td>Log</td>
 			<td>Log</td>
 			<td>This is a New Detection</td>
- 		</tr>
- 		<tr>
+		</tr>
+		<tr>
 			<td>Cloudflare Managed Ruleset</td>
- 			<td>
- 					<RuleID id="0e17d8761f1a47d5a744a75b5199b58a" />
- 			</td>
- 			<td>100805</td>
- 			<td>Wing FTP Server - Remote Code Execution - CVE:CVE-2025-47812</td>
- 			<td>Log</td>
- 			<td>Block</td>
- 			<td>This is a New Detection</td>
-  		</tr>
- 		<tr>
+			<td>
+				<RuleID id="0e17d8761f1a47d5a744a75b5199b58a" />
+			</td>
+			<td>100805</td>
+			<td>Wing FTP Server - Remote Code Execution - CVE:CVE-2025-47812</td>
+			<td>Log</td>
+			<td>Block</td>
+			<td>This is a New Detection</td>
+		</tr>
+		<tr>
 			<td>Cloudflare Managed Ruleset</td>
 			<td>
-					<RuleID id="81ace5a851214a2f9c58a1e7919a91a4" />
+				<RuleID id="81ace5a851214a2f9c58a1e7919a91a4" />
 			</td>
 			<td>100807</td>
 			<td>Infoblox NetMRI - Command Injection - CVE:CVE-2025-32813</td>
 			<td>Log</td>
 			<td>Block</td>
 			<td>This is a New Detection</td>
- 		</tr>
- 		<tr>
+		</tr>
+		<tr>
 			<td>Cloudflare Managed Ruleset</td>
 			<td>
-					<RuleID id="cd8fa74e8f6f476c9380ae217899130f" />
+				<RuleID id="cd8fa74e8f6f476c9380ae217899130f" />
 			</td>
 			<td>100808</td>
 			<td>Citrix Netscaler ADC - Buffer Error - CVE:CVE-2025-5777</td>
 			<td>Log</td>
 			<td>Disabled</td>
 			<td>This is a New Detection</td>
-  		</tr>
- 		<tr>
+		</tr>
+		<tr>
 			<td>Cloudflare Managed Ruleset</td>
 			<td>
-					<RuleID id="e012c7bece304a1daf80935ed1cf8e08" />
+				<RuleID id="e012c7bece304a1daf80935ed1cf8e08" />
 			</td>
 			<td>100809</td>
 			<td>Citrix Netscaler ADC - Information Disclosure - CVE:CVE-2023-4966</td>
 			<td>Log</td>
 			<td>Block</td>
 			<td>This is a New Detection</td>
- 		</tr>
- 		<tr>
+		</tr>
+		<tr>
 			<td>Cloudflare Managed Ruleset</td>
 			<td>
-					<RuleID id="5d348a573a834ffd968faffc6e70469f" />
+				<RuleID id="5d348a573a834ffd968faffc6e70469f" />
 			</td>
 			<td>100810</td>
 			<td>Akamai CloudTest - XXE - CVE:CVE-2025-49493</td>
 			<td>Log</td>
 			<td>Block</td>
 			<td>This is a New Detection</td>
-    </tr>
-  </tbody>
-</table>
\ No newline at end of file
+		</tr>
+	</tbody>
+</table>
diff --git a/src/content/changelog/waf/scheduled-waf-release.mdx b/src/content/changelog/waf/scheduled-waf-release.mdx
new file mode 100644
index 000000000000000..7bbafb67a9f0117
--- /dev/null
+++ b/src/content/changelog/waf/scheduled-waf-release.mdx
@@ -0,0 +1,83 @@
+---
+title: WAF Release - Scheduled changes for 2025-07-28
+description: WAF managed ruleset changes scheduled for 2025-07-28
+date: 2025-07-21
+scheduled: true
+---
+
+import { RuleID } from "~/components";
+
+<table style="width: 100%">
+	<thead>
+		<tr>
+			<th>Announcement Date</th>
+			<th>Release Date</th>
+			<th>Release Behavior</th>
+			<th>Legacy Rule ID</th>
+			<th>Rule ID</th>
+			<th>Description</th>
+			<th>Comments</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+	    <td>2025-07-21</td>
+	    <td>2025-07-28</td>
+	    <td>Log</td>
+	    <td>100804</td>
+	    <td>
+	        <RuleID id="6ab3bd3b58fb4325ac2d3cc73461ec9e" />
+	    </td>
+	    <td>BerriAI - SSRF - CVE:CVE-2024-6587</td>
+	    <td>This is a New Detection</td>
+    </tr>
+		<tr>
+			<td>2025-07-21</td>
+			<td>2025-07-28</td>
+			<td>Log</td>
+			<td>100812</td>
+			<td>
+				<RuleID id="2e6c4d02f42a4c3ca90649d50cb13e1d" />
+			</td>
+			<td>Fortinet FortiWeb - Remote Code Execution - CVE:CVE-2025-25257</td>
+			<td>This is a New Detection</td>
+		</tr>
+		<tr>
+			<td>2025-07-21</td>
+			<td>2025-07-28</td>
+			<td>Log</td>
+			<td>100813</td>
+			<td>
+				<RuleID id="fd360d8fd9994e6bab6fb06067fae7f7" />
+			</td>
+			<td>Apache Tomcat - DoS - CVE:CVE-2025-31650</td>
+			<td>This is a New Detection</td>
+		</tr>
+		<tr>
+			<td>2025-07-21</td>
+			<td>2025-07-28</td>
+			<td>Log</td>
+			<td>100815</td>
+			<td>
+				<RuleID id="f9e01e28c5d6499cac66364b4b6a5bb1" />
+			</td>
+			<td>
+				MongoDB - Remote Code Execution - CVE:CVE-2024-53900, CVE:CVE-2025-23061
+			</td>
+			<td>This is a New Detection</td>
+		</tr>
+		<tr>
+			<td>2025-07-21</td>
+			<td>2025-07-28</td>
+			<td>Log</td>
+			<td>100816</td>
+			<td>
+				<RuleID id="700d4fcc7b1f481a80cbeee5688f8e79" />
+			</td>
+			<td>
+				MongoDB - Remote Code Execution - CVE:CVE-2024-53900, CVE:CVE-2025-23061
+			</td>
+			<td>This is a New Detection</td>
+		</tr>
+	</tbody>
+</table>
diff --git a/src/content/docs/style-guide/components/product-changelog.mdx b/src/content/docs/style-guide/components/product-changelog.mdx
new file mode 100644
index 000000000000000..69a6e67a5b42510
--- /dev/null
+++ b/src/content/docs/style-guide/components/product-changelog.mdx
@@ -0,0 +1,51 @@
+---
+title: ProductChangelog
+styleGuide:
+  component: ProductChangelog
+---
+
+This component can be used to display entries from the [changelog](/changelog/) for a given product or product area.
+
+## Import
+
+```mdx
+import { ProductChangelog } from "~/components";
+```
+
+## Usage
+
+```mdx
+import { ProductChangelog } from "~/components";
+
+<ProductChangelog product="workers" />
+```
+
+## `<ProductChangelog>` Props
+
+The `product` and `area` props cannot be used at the same time.
+
+### `product`
+
+**type:** `string`
+
+The name of the product.
+
+### `area`
+
+**type:** `string`
+
+The name of the product area.
+
+### `hideEntry`
+
+**type:** `string`
+
+The name of a specific entry to hide.
+
+### `scheduled`
+
+**type:** `boolean`
+
+**default:** `false`
+
+Used to only show scheduled entries (i.e for WAF changelogs).
diff --git a/src/content/docs/style-guide/documentation-content-strategy/content-types/changelog.mdx b/src/content/docs/style-guide/documentation-content-strategy/content-types/changelog.mdx
index 626a7152923620a..6b2ef764df705ae 100644
--- a/src/content/docs/style-guide/documentation-content-strategy/content-types/changelog.mdx
+++ b/src/content/docs/style-guide/documentation-content-strategy/content-types/changelog.mdx
@@ -47,6 +47,8 @@ The combination of these files allows us to:
 
 Your Markdown file needs to have several special values to pull in the changelog information. These values are highlighted in the sample page.
 
+For more information about the `ProductChangelog` component, refer to the [style guide](/style-guide/components/product-changelog/).
+
 ```mdx title="/src/content/docs/dns/changelog.mdx"
 ---
 pcx_content_type: changelog
@@ -119,7 +121,6 @@ Each changelog entries has the following properties:
 - `preview_image` <Type text="string" /> <MetaInfo text="optional" />
   - Path to an image file
 - `products` <Type text="Array<String>" /> <MetaInfo text="(default: current location) optional" />
-
   - The products list is case-sensitive. Only use lowercase.
   - This should be an array of strings, each referring to the name of a file in the products collection without the file extension.
   - The folder that your entry is in, such as `src/content/changelog/workers/2025-02-13-new-product-feature.mdx`, is inferred as part of this property. If you do not want to associate the entry with additional products, you can omit it from the frontmatter entirely.
diff --git a/src/content/docs/waf/change-log/2025-07-21-emergency.mdx b/src/content/docs/waf/change-log/2025-07-21-emergency.mdx
deleted file mode 100644
index 4111700b39cbcc9..000000000000000
--- a/src/content/docs/waf/change-log/2025-07-21-emergency.mdx
+++ /dev/null
@@ -1,59 +0,0 @@
----
-title: "2025-07-21 - Emergency"
-type: table
-pcx_content_type: release-notes
-sidebar:
-  order: 781
-tableOfContents: false
----
-
-import { RuleID } from "~/components";
-
-This week’s update highlights several high-impact vulnerabilities affecting Microsoft SharePoint Server. These flaws, involving unsafe deserialization, allow unauthenticated remote code execution over the network, posing a critical threat to enterprise environments relying on SharePoint for collaboration and document management.
-
-**Key Findings**
-
-- Microsoft SharePoint Server (CVE-2025-53770): A critical vulnerability involving unsafe deserialization of untrusted data, enabling unauthenticated remote code execution over the network. This flaw allows attackers to execute arbitrary code on vulnerable SharePoint servers without user interaction.
-- Microsoft SharePoint Server (CVE-2025-53771): A closely related deserialization issue that can be exploited by unauthenticated attackers, potentially leading to full system compromise. The vulnerability highlights continued risks around insecure serialization logic in enterprise collaboration platforms.
-
-**Impact**
-
-Together, these vulnerabilities significantly weaken the security posture of on-premise Microsoft SharePoint Server deployments. By enabling remote code execution without authentication, they open the door for attackers to gain persistent access, deploy malware, and move laterally across enterprise environments.
-
-<table style="width: 100%">
-	<thead>
-		<tr>
-			<th>Ruleset</th>
-			<th>Rule ID</th>
-			<th>Legacy Rule ID</th>
-			<th>Description</th>
-			<th>Previous Action</th>
-			<th>New Action</th>
-			<th>Comments</th>
-		</tr>
-	</thead>
-       <tbody>
- 		<tr>
-			<td>Cloudflare Managed Ruleset</td>
-			<td>
-					<RuleID id="34dac2b38b904163bc587cc32168f6f0" />
-			</td>
-			<td>100817</td>
-			<td>Microsoft SharePoint - Deserialization - CVE:CVE-2025-53770</td>
-			<td>N/A</td>
-			<td>Block</td>
-			<td>This is a New Detection</td>
- 		</tr>
- 		<tr>
-			<td>Cloudflare Managed Ruleset</td>
- 			<td>
- 					<RuleID id="d21f327516a145bc9d1b05678de656c4" />
- 			</td>
- 			<td>100818</td>
- 			<td>Microsoft SharePoint - Deserialization - CVE:CVE-2025-53771</td>
- 			<td>N/A</td>
- 			<td>Block</td>
- 			<td>This is a New Detection</td>
-		</tr>
-  </tbody>
-</table>
\ No newline at end of file
diff --git a/src/content/docs/waf/change-log/general-updates.mdx b/src/content/docs/waf/change-log/general-updates.mdx
index 8c142cf47cc3852..fdf49df643998cd 100644
--- a/src/content/docs/waf/change-log/general-updates.mdx
+++ b/src/content/docs/waf/change-log/general-updates.mdx
@@ -1,9 +1,6 @@
 ---
 title: "General updates"
 pcx_content_type: changelog
-release_notes_file_name:
-  - waf-general
-release_notes_name: WAF
 sidebar:
   order: 1
 head:
@@ -11,8 +8,10 @@ head:
     content: Changelog for general WAF updates
 ---
 
-import { ProductReleaseNotes } from "~/components";
+import { ProductChangelog } from "~/components";
 
-{/* <!-- Actual content lives in /src/content/release-notes/waf-general.yaml. Update the file there for new entries to appear here. For more details, refer to https://developers.cloudflare.com/style-guide/documentation-content-strategy/content-types/changelog/#yaml-file --> */}
+<ProductChangelog product="waf" />
 
-<ProductReleaseNotes />
+## Previous updates
+
+For preview WAF updates, refer to the [historical changelog (2024)](/waf/change-log/historical-2024/).
\ No newline at end of file
diff --git a/src/content/docs/waf/change-log/index.mdx b/src/content/docs/waf/change-log/index.mdx
index 94856e6c8687023..61af212954f178f 100644
--- a/src/content/docs/waf/change-log/index.mdx
+++ b/src/content/docs/waf/change-log/index.mdx
@@ -1,10 +1,6 @@
 ---
 title: "Changelog"
 pcx_content_type: changelog
-sidebar_toc: true
-release_notes_file_name:
-  - waf
-  - waf-general
 sidebar:
   order: 20
 head:
@@ -33,7 +29,7 @@ If you do notice a new or updated rule generating an increased volume of securit
 <LinkButton type="primary" href="/waf/change-log/scheduled-changes/">
 	View scheduled changes
 </LinkButton>
-<RSSButton href="/waf/change-log/index.xml" />
+<RSSButton href="/changelog/rss/waf.xml" />
 
 ## General updates
 
diff --git a/src/content/docs/waf/change-log/managed-rulesets.mdx b/src/content/docs/waf/change-log/managed-rulesets.mdx
deleted file mode 100644
index 2e723b10816abef..000000000000000
--- a/src/content/docs/waf/change-log/managed-rulesets.mdx
+++ /dev/null
@@ -1,15 +0,0 @@
----
-title: "Changelog for managed rulesets only"
-pcx_content_type: concept
-release_notes_file_name:
-  - waf
-release_notes_name: WAF
-sidebar:
-  order: 15000
-  hidden: true
-head:
-  - tag: title
-    content: Changelog for WAF managed rulesets only
----
-
-{/* <!-- Actual content lives in /src/content/release-notes/waf.yaml. Update the file there for new entries to appear here. For more details, refer to https://developers.cloudflare.com/style-guide/documentation-content-strategy/content-types/changelog/#yaml-file --> */}
diff --git a/src/content/docs/waf/change-log/scheduled-changes.mdx b/src/content/docs/waf/change-log/scheduled-changes.mdx
index 3c22558e47d3fb8..a4ad2b82600c375 100644
--- a/src/content/docs/waf/change-log/scheduled-changes.mdx
+++ b/src/content/docs/waf/change-log/scheduled-changes.mdx
@@ -1,83 +1,12 @@
 ---
-type: table
-pcx_content_type: release-notes
 title: Scheduled changes
 sidebar:
   order: 2
 tableOfContents: false
 ---
 
-import { RSSButton, RuleID } from "~/components";
+import { ProductChangelog } from "~/components";
 
-<RSSButton href="/waf/change-log/index.xml" />
+<ProductChangelog product="waf" scheduled />
 
-<table style="width: 100%">
-  <thead>
-    <tr>
-      <th>Announcement Date</th>
-      <th>Release Date</th>
-      <th>Release Behavior</th>
-      <th>Legacy Rule ID</th>
-      <th>Rule ID</th>
-      <th>Description</th>
-      <th>Comments</th>
-    </tr>
-  </thead>
-<tbody>
-	  <tr>
-	    <td>2025-07-21</td>
-	    <td>2025-07-28</td>
-	    <td>Log</td>
-	    <td>100804</td>
-	    <td>
-	        <RuleID id="6ab3bd3b58fb4325ac2d3cc73461ec9e" />
-	    </td>
-	    <td>BerriAI - SSRF - CVE:CVE-2024-6587</td>
-	    <td>This is a New Detection</td>
-    </tr>
-    <tr>
-	    <td>2025-07-21</td>
-	    <td>2025-07-28</td>
-	    <td>Log</td>
-	    <td>100812</td>
-	    <td>
-	        <RuleID id="2e6c4d02f42a4c3ca90649d50cb13e1d" />
-	    </td>
-	    <td>Fortinet FortiWeb - Remote Code Execution - CVE:CVE-2025-25257</td>
-	    <td>This is a New Detection</td>
-    </tr>
-    <tr>
-	    <td>2025-07-21</td>
-	    <td>2025-07-28</td>
-	    <td>Log</td>
-	    <td>100813</td>
-	    <td>
-	        <RuleID id="fd360d8fd9994e6bab6fb06067fae7f7" />
-	    </td>
-	    <td>Apache Tomcat - DoS - CVE:CVE-2025-31650</td>
-	    <td>This is a New Detection</td>
-    </tr>
-    <tr>
-	    <td>2025-07-21</td>
-	    <td>2025-07-28</td>
-	    <td>Log</td>
-	    <td>100815</td>
-	    <td>
-	        <RuleID id="f9e01e28c5d6499cac66364b4b6a5bb1" />
-	    </td>
-	    <td>MongoDB - Remote Code Execution - CVE:CVE-2024-53900, CVE:CVE-2025-23061</td>
-	    <td>This is a New Detection</td>
-    </tr>
-    <tr>
-	    <td>2025-07-21</td>
-	    <td>2025-07-28</td>
-	    <td>Log</td>
-	    <td>100816</td>
-	    <td>
-	        <RuleID id="700d4fcc7b1f481a80cbeee5688f8e79" />
-	    </td>
-	    <td>MongoDB - Remote Code Execution - CVE:CVE-2024-53900, CVE:CVE-2025-23061</td>
-	    <td>This is a New Detection</td>
-    </tr>
-  </tbody> 
-</table>
\ No newline at end of file
+For other WAF updates, refer to the [changelog](/changelog/?product=waf).
diff --git a/src/content/release-notes/waf-general.yaml b/src/content/release-notes/waf-general.yaml
deleted file mode 100644
index 1e8f75e478e1668..000000000000000
--- a/src/content/release-notes/waf-general.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-link: "/waf/change-log/general-updates/"
-productName: WAF
-productLink: "/waf/"
-subCategoryName: General updates
-topLevelLink: "/waf/change-log/"
-productArea: Application security
-productAreaLink: /fundamentals/reference/changelog/security/
-entries:
-  - publish_date: "2025-05-28"
-    title: Updated attack score model
-    description: |-
-      We have deployed an updated attack score model focused on enhancing the detection of multiple false positives (FPs). As a result of this improvement, some changes in observed attack scores are expected.
-  - publish_date: "2025-03-07"
-    title: Updated leaked credentials database
-    description: |-
-      Added new records to the leaked credentials database. The record sources are: Have I Been Pwned (HIBP) database, RockYou 2024 dataset, and another third-party database.
-  - publish_date: "2025-02-04"
-    title: Updated leaked credentials database
-    description: |-
-      Added new records to the leaked credentials database from a third-party database.
-  - publish_date: "2024-12-18"
-    title: Improved VPN Managed List
-    description: |-
-      Customers can now effectively manage incoming traffic identified as originating from VPN IPs. Customers with compliance restrictions can now ensure compliance with local laws and regulations. Customers with CDN restrictions can use the improved VPN Managed List to prevent unauthorized access from users attempting to bypass geographical restrictions. With the new VPN Managed List enhancements, customers can improve their overall security posture to reduce exposure to unwanted or malicious traffic.
-  - publish_date: "2024-12-10"
-    title: Change the order of list items in IP Lists (for API and Terraform users)
-    description: |-
-      Due to changes in the API implementation, the order of list items in an IP list obtained via API or Terraform may change, which may cause Terraform to detect a change in Terraform state. To fix this issue, resync the Terraform state or upgrade the version of your Terraform Cloudflare provider to [version 4.44.0](https://github.com/cloudflare/terraform-provider-cloudflare/releases/tag/v4.44.0) or later.
-  - publish_date: "2024-11-14"
-    title: Security Events pagination
-    description: |-
-      Fixed an issue with pagination in Security Events' sampled logs where some pages were missing data. Also removed the total count from the events log as these are only sampled logs.
-  - publish_date: "2024-11-04"
-    title: New table in Security Analytics and Security Events
-    description: |-
-      Switched to a new, more responsive table in Security Analytics and Security Events.
-  - publish_date: "2024-08-29"
-    title: Fixed occasional attack score mismatches
-    description: |-
-      Fixed an issue causing score mismatches between the global [WAF attack score](/waf/detections/attack-score/) and subscores. In certain cases, subscores were higher (not an attack) than expected while the global attack score was lower than expected (attack), leading to false positives.
-  - publish_date: "2024-05-23"
-    title: Improved detection capabilities
-    description: |-
-      [WAF attack score](/waf/detections/attack-score/) now automatically detects and decodes Base64 and JavaScript (Unicode escape sequences) in HTTP requests. This update is available for all customers with access to WAF attack score (Business customers with access to a single field and Enterprise customers).
diff --git a/src/content/release-notes/waf.yaml b/src/content/release-notes/waf.yaml
deleted file mode 100644
index bafa7b29fa8e51b..000000000000000
--- a/src/content/release-notes/waf.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-link: "/waf/change-log/"
-productName: WAF
-productLink: "/waf/"
-productArea: Application security
-productAreaLink: /fundamentals/reference/changelog/security/
-entries:
-  - publish_date: "2025-07-21"
-    scheduled_date: "2025-07-28"
-    individual_page: true
-    scheduled: true
-    link: "/waf/change-log/scheduled-changes/"
-  - publish_date: "2025-07-21"
-    individual_page: true
-    link: "/waf/change-log/2025-07-21-emergency/"
-  - publish_date: "2025-07-21"
-    individual_page: true
-    link: "/waf/change-log/2025-07-21/"
-  - publish_date: "2025-07-14"
-    individual_page: true
-    link: "/waf/change-log/2025-07-14/"
-  - publish_date: "2025-07-07"
-    individual_page: true
-    link: "/waf/change-log/2025-07-07/"
-  - publish_date: "2025-06-16"
-    individual_page: true
-    link: "/waf/change-log/2025-06-16/"
-  - publish_date: "2025-06-09"
-    individual_page: true
-    link: "/waf/change-log/2025-06-09/"
-  - publish_date: "2025-06-02"
-    individual_page: true
-    link: "/waf/change-log/2025-06-02/"
-  - publish_date: "2025-05-27"
-    individual_page: true
-    link: "/waf/change-log/2025-05-27/"
-  - publish_date: "2025-05-19"
-    individual_page: true
-    link: "/waf/change-log/2025-05-19/"
-  - publish_date: "2025-05-05"
-    individual_page: true
-    link: "/waf/change-log/2025-05-05/"
-  - publish_date: "2025-04-26"
-    individual_page: true
-    link: "/waf/change-log/2025-04-26-emergency/"
-  - publish_date: "2025-04-22"
-    individual_page: true
-    link: "/waf/change-log/2025-04-22/"
-  - publish_date: "2025-04-14"
-    individual_page: true
-    link: "/waf/change-log/2025-04-14/"
-  - publish_date: "2025-04-02"
-    individual_page: true
-    link: "/waf/change-log/2025-04-02/"
-  - publish_date: "2025-03-22"
-    individual_page: true
-    link: "/waf/change-log/2025-03-22-emergency/"
-  - publish_date: "2025-03-19"
-    individual_page: true
-    link: "/waf/change-log/2025-03-19-emergency/"
-  - publish_date: "2025-03-17"
-    individual_page: true
-    link: "/waf/change-log/2025-03-17/"
-  - publish_date: "2025-03-11"
-    individual_page: true
-    link: "/waf/change-log/2025-03-11-emergency/"
-  - publish_date: "2025-03-10"
-    individual_page: true
-    link: "/waf/change-log/2025-03-10/"
-  - publish_date: "2025-03-03"
-    individual_page: true
-    link: "/waf/change-log/2025-03-03/"
-  - publish_date: "2025-02-24"
-    individual_page: true
-    link: "/waf/change-log/2025-02-24/"
-  - publish_date: "2025-02-18"
-    individual_page: true
-    link: "/waf/change-log/2025-02-18/"
-  - publish_date: "2025-02-11"
-    individual_page: true
-    link: "/waf/change-log/2025-02-11/"
-  - publish_date: "2025-01-21"
-    individual_page: true
-    link: "/waf/change-log/2025-01-21/"
-  - publish_date: "2025-01-13"
-    individual_page: true
-    link: "/waf/change-log/2025-01-13/"
-  - publish_date: "2025-01-06"
-    individual_page: true
-    link: "/waf/change-log/2025-01-06/"
\ No newline at end of file
diff --git a/src/schemas/changelog.ts b/src/schemas/changelog.ts
index eb5d1605520da63..bd61e3734a7940d 100644
--- a/src/schemas/changelog.ts
+++ b/src/schemas/changelog.ts
@@ -6,6 +6,7 @@ export const changelogSchema = ({ image }: SchemaContext) =>
 		title: z.string(),
 		description: z.string(),
 		date: z.coerce.date(),
+		scheduled: z.boolean().default(false),
 		products: z
 			.array(reference("products"))
 			.default([])
diff --git a/src/util/changelog.ts b/src/util/changelog.ts
index 04c51d2ebfc2eab..bfa311a69b07061 100644
--- a/src/util/changelog.ts
+++ b/src/util/changelog.ts
@@ -65,6 +65,7 @@ async function getWARPReleases(): Promise<Array<CollectionEntry<"changelog">>> {
 				hidden: false,
 				date: releaseDate,
 				products: [{ id: "zero-trust-warp", collection: "products" }],
+				scheduled: false,
 			},
 			rendered: {
 				html: marked.parse([prefix, releaseNotes].join("\n\n"), {
@@ -171,8 +172,10 @@ export async function getRSSItems({
 
 			const content = String(file).trim();
 
+			const itemTitle = `${productTitles.join(", ")} - ${title}`;
+
 			return {
-				title: `${productTitles.join(", ")} - ${title}`,
+				title: itemTitle,
 				description: content,
 				pubDate: date,
 				categories: productTitles,
diff --git a/worker/index.worker.test.ts b/worker/index.worker.test.ts
index 9662cf04cbae172..866e69d52a4f1e6 100644
--- a/worker/index.worker.test.ts
+++ b/worker/index.worker.test.ts
@@ -170,27 +170,6 @@ describe("Cloudflare Docs", () => {
 				expect(item.category).toBe("Access");
 				expect(item.pubDate).toBe("Mon, 03 Mar 2025 00:00:00 GMT");
 			});
-
-			it("legacy product-specific", async () => {
-				const request = new Request("http://fakehost/waf/change-log/index.xml");
-				const response = await SELF.fetch(request);
-
-				expect(response.status).toBe(200);
-
-				const xml = await response.text();
-				const parsed = parser.parse(xml);
-				const { channel } = parsed.rss;
-
-				expect(channel.title).toBe("Changelog | WAF");
-
-				const item = channel.item.find(
-					(item: any) => item.title === "WAF - 2025-02-24",
-				);
-
-				expect(item).toBeDefined();
-				expect(item.product).toBeUndefined();
-				expect(item.pubDate).toBe("Mon, 24 Feb 2025 00:00:00 GMT");
-			});
 		});
 	});