diff --git a/src/content/docs/bff/samples/index.mdx b/src/content/docs/bff/samples/index.mdx
index e1207e279..e5ce3f029 100644
--- a/src/content/docs/bff/samples/index.mdx
+++ b/src/content/docs/bff/samples/index.mdx
@@ -22,40 +22,40 @@ This sample shows how to use the BFF framework with a JavaScript-based frontend
 
 <LinkCard
   description="GitHub Repository for the BFF framework with JavaScript-based frontend"
-  href="https://github.com/DuendeSoftware/Samples/tree/main/BFF/v3/JsBffSample"
+  href="https://github.com/DuendeSoftware/Samples/tree/main/BFF/v4/JsBffSample"
   title="JavaScript Frontend Sample"
   target="_blank"
 />
 
 ## ReactJs Frontend
 
-This sample shows how to use the BFF framework with the .NET 6 React template.
+This sample shows how to use the BFF framework with React.
 
 <LinkCard
   description="GitHub Repository for the BFF framework with React"
-  href="https://github.com/DuendeSoftware/Samples/tree/main/BFF/v3/React"
+  href="https://github.com/DuendeSoftware/Samples/tree/main/BFF/v4/React"
   title="ReactJS Frontend Sample"
   target="_blank"
 />
 
 ## Angular Frontend
 
-This sample shows how to use the BFF framework with the .NET 8 Angular template.
+This sample shows how to use the BFF framework with Angular.
 
 <LinkCard
   description="GitHub Repository for the BFF framework with Angular"
-  href="https://github.com/DuendeSoftware/Samples/tree/main/BFF/v3/Angular"
+  href="https://github.com/DuendeSoftware/Samples/tree/main/BFF/v4/Angular"
   title="Angular Frontend Sample"
   target="_blank"
 />
 
 ## Vue Frontend :badge[Community]
 
-This sample shows how to use the BFF framework with the .NET 8 Vue template. (contributed by [@Marco Cabrera](https://github.com/mck231))
+This sample shows how to use the BFF framework with Vue. (contributed by [@Marco Cabrera](https://github.com/mck231))
 
 <LinkCard
   description="GitHub Repository for the BFF framework with Vue"
-  href="https://github.com/DuendeSoftware/Samples/tree/main/BFF/v3/Vue"
+  href="https://github.com/DuendeSoftware/Samples/tree/main/BFF/v4/Vue"
   title="Vue Frontend Sample (Community)"
   target="_blank"
 />
@@ -66,7 +66,7 @@ This sample shows how to use the BFF framework with Blazor WASM.
 
 <LinkCard
   description="GitHub Repository for the BFF framework with Blazor WASM"
-  href="https://github.com/DuendeSoftware/Samples/tree/main/BFF/v3/BlazorWasm"
+  href="https://github.com/DuendeSoftware/Samples/tree/main/BFF/v4/BlazorWasm"
   title="Blazor WASM Sample"
   target="_blank"
 />
@@ -77,7 +77,7 @@ This sample shows how to use Authentication in combination with Blazor's AutoRen
 
 <LinkCard
   description="GitHub Repository for the BFF framework using Blazor Auto Rendering"
-  href="https://github.com/DuendeSoftware/Samples/tree/main/BFF/v3/BlazorAutoRendering"
+  href="https://github.com/DuendeSoftware/Samples/tree/main/BFF/v4/BlazorAutoRendering"
   title="Blazor Auto Rendering Sample"
   target="_blank"
 />
@@ -88,20 +88,19 @@ This sample shows how to use the BFF extensions for Microsoft YARP.
 
 <LinkCard
   description="GitHub Repository for the BFF framework integration with YARP"
-  href="https://github.com/DuendeSoftware/Samples/tree/main/BFF/v3/JsBffYarpSample"
+  href="https://github.com/DuendeSoftware/Samples/tree/main/BFF/v4/JsBffYarpSample"
   title="YARP Integration Sample"
   target="_blank"
 />
 
-## OpenAPI and SwaggerUI
+## OpenAPI
 
-This sample shows how to use OpenAPI and SwaggerUI in combination with BFF.
-A walkthrough is available [on the Duende blog](https://duendesoftware.com/blog/20250430-managing-openapi-specifications-with-backend-for-frontend-and-swagger-ui).
+This sample shows how to use OpenAPI in combination with BFF.
 
 <LinkCard
-  description="GitHub Repository for the BFF framework integration with OpenAPI and SwaggerUI"
-  href="https://github.com/DuendeSoftware/samples/tree/main/BFF/v3/OpenApi"
-  title="OpenAPI and SwaggerUI Sample"
+  description="GitHub Repository for the BFF framework integration with OpenAPI"
+  href="https://github.com/DuendeSoftware/samples/tree/main/BFF/v4/OpenApi"
+  title="OpenAPI Sample"
   target="_blank"
 />
 
@@ -111,7 +110,7 @@ This sample shows how to have separate projects from the frontend and backend, u
 
 <LinkCard
   description="GitHub Repository for separate projects using CORS"
-  href="https://github.com/DuendeSoftware/Samples/tree/main/BFF/v3/SplitHosts"
+  href="https://github.com/DuendeSoftware/Samples/tree/main/BFF/v4/SplitHosts"
   title="Separate Host for UI Sample"
   target="_blank"
 />
@@ -122,18 +121,18 @@ This sample shows how to host the BFF framework and IdentityServer with Docker.
 
 <LinkCard
   description="GitHub Repository for hosting BFF and IdentityServer in with Docker containers."
-  href="https://github.com/DuendeSoftware/Samples/tree/main/BFF/v3/docker"
+  href="https://github.com/DuendeSoftware/Samples/tree/main/BFF/v4/docker"
   title="Docker Sample (Community)"
   target="_blank"
 />
 
 ## DPoP
 
-This sample shows how to configure the BFF to use [DPoP](/identityserver/tokens/pop.md) to obtain sender-constrained tokens.
+This sample shows how to configure the BFF for [DPoP](/identityserver/tokens/pop.md) so that it uses sender-constrained tokens.
 
 <LinkCard
   description="GitHub Repository for configuring DPoP with BFF"
-  href="https://github.com/DuendeSoftware/Samples/tree/main/BFF/v3/DPoP"
+  href="https://github.com/DuendeSoftware/Samples/tree/main/BFF/v4/DPoP"
   title="DPoP Sample"
   target="_blank"
 />
@@ -144,7 +143,7 @@ This sample shows how to extend the BFF with an _IAccessTokenRetriever_. This ex
 
 <LinkCard
   description="GitHub Repository for token exchange using the IAccessTokenRetriever"
-  href="https://github.com/DuendeSoftware/Samples/tree/main/BFF/v3/TokenExchange"
+  href="https://github.com/DuendeSoftware/Samples/tree/main/BFF/v4/TokenExchange"
   title="Token Exchange Sample"
   target="_blank"
 />