Repository: nginx/nginx-gateway-fabric

Issue:
Release 2.0
Issue to track the release tasks for 2.0 following our [release process](https://github.com/nginx/nginx-gateway-fabric/blob/main/docs/developer/release-process.md).

### Tasks
- [ ] Create release PR
- [ ] Merge release PR
- [ ] Create release tag
- [ ] Create release PR for main branch
- [ ] Publish release docs

Release Owner Rotation
Saylor <<
Saloni
Ben
Ciara
Tina


Hints from issue comments:

Solution patch:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f285969..325a055b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,71 @@ This document includes a curated changelog for each release. We also publish a c
 a [GitHub release](https://github.com/nginx/nginx-gateway-fabric/releases), which, by contrast, is auto-generated
 and includes links to all PRs that went into the release.
 
+## Release 2.0.0
+
+_June 5, 2025_
+
+BREAKING CHANGES:
+
+[How to upgrade to 2.0.0](https://docs.nginx.com/nginx-gateway-fabric/install/upgrade-version/#upgrade-from-v1x-to-v2x).
+
+The following changes are breaking and require users to fully uninstall NGINX Gateway Fabric (including NGINX Gateway Fabric CRDs) before re-installing the new version. Gateway API resources (such as Gateway, HTTPRoute, etc) are unaffected and can be left alone. [3318](https://github.com/nginx/nginx-gateway-fabric/pull/3318)
+
+- Control plane and data plane have been separated into different Deployments. The control plane will provision an NGINX data plane Deployment and Service when a Gateway object is created.
+- NginxProxy CRD resource is now namespace-scoped (was cluster-scoped).
+- NginxProxy resource controls infrastructure fields for the NGINX Deployment and Service, such as replicas, loadBalancerIP, serviceType, etc. Users who want to set or update these fields must do so either at installation time through the helm chart (which sets them globally), or per Gateway. Updating these fields directly on a provisioned nginx Deployment or Service will not take effect. This does not apply to the the NGINX Gateway Fabric control plane Deployment.
+- Helm values structure has changed slightly to better support the separate Deployments.
+- `nginxGateway.replicaCount` Helm value has been renamed to `nginxGateway.replicas`.
+
+FEATURES:
+
+- Support for creating and deploying multiple Gateways. [3318](https://github.com/nginx/nginx-gateway-fabric/pull/3318)
+- NginxProxy resource can now additionally be attached to a Gateway, and will overwrite any settings that are attached at the GatewayClass level, for the Gateway that it's attached to. [3318](https://github.com/nginx/nginx-gateway-fabric/pull/3318)
+- Listener isolation supported for all routes. [3067](https://github.com/nginx/nginx-gateway-fabric/pull/3067)
+- Allow configuration of NGINX Plus API access. [3066](https://github.com/nginx/nginx-gateway-fabric/pull/3066)
+- Adds regex matching for headers and query params for HTTPRoutes and headers for GRPCRoutes. [3093](https://github.com/nginx/nginx-gateway-fabric/pull/3093)
+- Add support for request mirroring using the RequestMirror filter. [3066](https://github.com/nginx/nginx-gateway-fabric/pull/3306)
+
+BUG FIXES:
+
+- Fix an issue where default headers were still being set when overwritten by a user. [3249](https://github.com/nginx/nginx-gateway-fabric/pull/3249)
+- Add 503 status code when there are zero upstream endpoints. [3406](https://github.com/nginx/nginx-gateway-fabric/pull/3406)
+- Fixed bug that occurred when a route's ParentRef does not include a sectionName and the Gateway's listeners have duplicate hostnames. This would cause conflicts when the route tries to attach to all the listeners and falsely trigger validation checks around overlapping routes. [3418](https://github.com/nginx/nginx-gateway-fabric/pull/3418)
+
+DOCUMENTATION:
+
+- Migrated the documentation website into the [NGINX documentation repository](https://github.com/nginx/documentation). [3047](https://github.com/nginx/nginx-gateway-fabric/pull/3047)
+
+HELM CHART:
+
+- The version of the Helm chart is now 2.0.0
+- Helm values structure has changed slightly to better support the separate Deployments.
+- `nginxGateway.replicaCount` Helm value has been renamed to `nginxGateway.replicas`.
+- Add support for control plane Deployment labels. [3194](https://github.com/nginx/nginx-gateway-fabric/pull/3194). Thanks to [Butterneck](https://github.com/Butterneck).
+
+UPGRADE:
+
+- [Upgrade to 2.0.0](https://docs.nginx.com/nginx-gateway-fabric/install/upgrade-version/#upgrade-from-v1x-to-v2x)
+
+DEPENDENCIES:
+
+- NGINX Plus was updated to R34. [3281](https://github.com/nginx/nginx-gateway-fabric/pull/3281)
+- Update to v1.3.0 of the Gateway API. [3348](https://github.com/nginx/nginx-gateway-fabric/pull/3348)
+
+COMPATIBILITY:
+
+- Gateway API version: `1.3.0`
+- NGINX version: `1.28.0`
+- NGINX Plus version: `R34`
+- NGINX Agent version: `v3.0.0`
+- Kubernetes version: `1.25+`
+
+CONTAINER IMAGES:
+
+- Control plane: `ghcr.io/nginx/nginx-gateway-fabric:2.0.0`
+- Data plane: `ghcr.io/nginx/nginx-gateway-fabric/nginx:2.0.0`
+- Data plane with NGINX Plus: `private-registry.nginx.com/nginx-gateway-fabric/nginx-plus:2.0.0`
+
 ## Release 1.6.2
 
 _March 11, 2025_
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5428414b..f94c2485 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -32,7 +32,7 @@ Reserve GitHub issues for feature requests and bugs rather than general question
 
 ## Getting Started
 
-Follow our [Installation Instructions](https://docs.nginx.com/nginx-gateway-fabric/installation/) to get the NGINX Gateway Fabric up and running.
+Follow our [Installation Instructions](https://docs.nginx.com/nginx-gateway-fabric/install/) to get the NGINX Gateway Fabric up and running.
 
 ### Project Structure
 
diff --git a/README.md b/README.md
index 6e5d4a88..fa19afec 100644
--- a/README.md
+++ b/README.md
@@ -20,12 +20,14 @@ the [Gateway API Compatibility](https://docs.nginx.com/nginx-gateway-fabric/over
 
 Learn about our [design principles](/docs/developer/design-principles.md) and [architecture](https://docs.nginx.com/nginx-gateway-fabric/overview/gateway-architecture/).
 
+NGINX Gateway Fabric uses [NGINX Agent](https://github.com/nginx/agent) to configure NGINX.
+
 ## Getting Started
 
 1. [Get started using a kind cluster](https://docs.nginx.com/nginx-gateway-fabric/get-started/).
-2. [Install](https://docs.nginx.com/nginx-gateway-fabric/installation/) NGINX Gateway Fabric.
+2. [Install](https://docs.nginx.com/nginx-gateway-fabric/install/) NGINX Gateway Fabric.
 3. Deploy various [examples](examples).
-4. Read our [How-to guides](https://docs.nginx.com/nginx-gateway-fabric/how-to/).
+4. Follow instructions for common use cases such as [routing](https://docs.nginx.com/nginx-gateway-fabric/traffic-management/) and [securing](https://docs.nginx.com/nginx-gateway-fabric/traffic-security/) traffic, or [monitoring](https://docs.nginx.com/nginx-gateway-fabric//monitoring/) your cluster.
 
 You can find the comprehensive NGINX Gateway Fabric user documentation on the [NGINX Documentation](https://docs.nginx.com/nginx-gateway-fabric/) website.
 
@@ -34,7 +36,7 @@ You can find the comprehensive NGINX Gateway Fabric user documentation on the [N
 We publish NGINX Gateway Fabric releases on GitHub. See
 our [releases page](https://github.com/nginx/nginx-gateway-fabric/releases).
 
-The latest release is [1.6.2](https://github.com/nginx/nginx-gateway-fabric/releases/tag/v1.6.2).
+The latest release is [2.0.0](https://github.com/nginx/nginx-gateway-fabric/releases/tag/v2.0.0).
 
 The edge version is useful for experimenting with new features that are not yet published in a release. To use, choose
 the _edge_ version built from the [latest commit](https://github.com/nginx/nginx-gateway-fabric/commits/main)
@@ -45,7 +47,7 @@ to the correct versions:
 
 | Version        | Description                              | Installation Manifests                                                         | Documentation and Examples                                                                                                                                           |
 |----------------|------------------------------------------|--------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Latest release | For production use                       | [Manifests](https://github.com/nginx/nginx-gateway-fabric/tree/v1.6.2/deploy). | [Documentation](https://docs.nginx.com/nginx-gateway-fabric). [Examples](https://github.com/nginx/nginx-gateway-fabric/tree/v1.6.2/examples).                        |
+| Latest release | For production use                       | [Manifests](https://github.com/nginx/nginx-gateway-fabric/tree/v2.0.0/deploy). | [Documentation](https://docs.nginx.com/nginx-gateway-fabric). [Examples](https://github.com/nginx/nginx-gateway-fabric/tree/v2.0.0/examples).                        |
 | Edge           | For experimental use and latest features | [Manifests](https://github.com/nginx/nginx-gateway-fabric/tree/main/deploy).   | [Examples](https://github.com/nginx/nginx-gateway-fabric/tree/main/examples). |
 
 ### Versioning
@@ -64,19 +66,20 @@ the [Issue Lifecycle](ISSUE_LIFECYCLE.md) document for information on issue crea
 
 The following table lists the software versions NGINX Gateway Fabric supports.
 
-| NGINX Gateway Fabric | Gateway API | Kubernetes | NGINX OSS | NGINX Plus |
-|----------------------|-------------|------------|-----------|------------|
-| Edge                 | 1.3.0       | 1.25+      | 1.28.0    | R34        |
-| 1.6.2                | 1.2.1       | 1.25+      | 1.27.4    | R33        |
-| 1.6.1                | 1.2.1       | 1.25+      | 1.27.4    | R33        |
-| 1.6.0                | 1.2.1       | 1.25+      | 1.27.3    | R33        |
-| 1.5.1                | 1.2.0       | 1.25+      | 1.27.2    | R33        |
-| 1.5.0                | 1.2.0       | 1.25+      | 1.27.2    | R33        |
-| 1.4.0                | 1.1.0       | 1.25+      | 1.27.1    | R32        |
-| 1.3.0                | 1.1.0       | 1.25+      | 1.27.0    | R32        |
-| 1.2.0                | 1.0.0       | 1.23+      | 1.25.4    | R31        |
-| 1.1.0                | 1.0.0       | 1.23+      | 1.25.3    | n/a        |
-| 1.0.0                | 0.8.1       | 1.23+      | 1.25.2    | n/a        |
+| NGINX Gateway Fabric | Gateway API | Kubernetes | NGINX OSS | NGINX Plus | NGINX Agent |
+|----------------------|-------------|------------|-----------|------------|-------------|
+| Edge                 | 1.3.0       | 1.25+      | 1.28.0    | R34        | v3.0.0      |
+| 2.0.0                | 1.3.0       | 1.25+      | 1.28.0    | R34        | v3.0.0      |
+| 1.6.2                | 1.2.1       | 1.25+      | 1.27.4    | R33        | ---         |
+| 1.6.1                | 1.2.1       | 1.25+      | 1.27.4    | R33        | ---         |
+| 1.6.0                | 1.2.1       | 1.25+      | 1.27.3    | R33        | ---         |
+| 1.5.1                | 1.2.0       | 1.25+      | 1.27.2    | R33        | ---         |
+| 1.5.0                | 1.2.0       | 1.25+      | 1.27.2    | R33        | ---         |
+| 1.4.0                | 1.1.0       | 1.25+      | 1.27.1    | R32        | ---         |
+| 1.3.0                | 1.1.0       | 1.25+      | 1.27.0    | R32        | ---         |
+| 1.2.0                | 1.0.0       | 1.23+      | 1.25.4    | R31        | ---         |
+| 1.1.0                | 1.0.0       | 1.23+      | 1.25.3    | n/a        | ---         |
+| 1.0.0                | 0.8.1       | 1.23+      | 1.25.2    | n/a        | ---         |
 
 ## SBOM (Software Bill of Materials)
 
@@ -103,7 +106,7 @@ docker buildx imagetools inspect ghcr.io/nginx/nginx-gateway-fabric:edge --forma
 
 ## Troubleshooting
 
-For troubleshooting help, see the [Troubleshooting](https://docs.nginx.com/nginx-gateway-fabric/how-to/monitoring/troubleshooting/) document.
+For troubleshooting help, see the [Troubleshooting](https://docs.nginx.com/nginx-gateway-fabric/troubleshooting/) document.
 
 ## Contacts
 
@@ -133,4 +136,4 @@ Please read our [Contributing guide](CONTRIBUTING.md) if you'd like to contribut
 
 If your team needs dedicated support for NGINX Gateway Fabric in your environment, or you would like to leverage our [advanced NGINX Plus features](https://docs.nginx.com/nginx-gateway-fabric/overview/nginx-plus/), you can reach out [here](https://www.f5.com/content/f5-com/en_us/products/get-f5).
 
-To try NGINX Gateway Fabric with NGINX Plus, you can start your free [30-day trial](https://www.f5.com/trials), then follow the [installation guide](https://docs.nginx.com/nginx-gateway-fabric/installation/installing-ngf/helm/) for installing with NGINX Plus.
+To try NGINX Gateway Fabric with NGINX Plus, you can start your free [30-day trial](https://www.f5.com/trials), then follow the [installation guide](https://docs.nginx.com/nginx-gateway-fabric/install/helm/) for installing with NGINX Plus.
diff --git a/charts/nginx-gateway-fabric/Chart.yaml b/charts/nginx-gateway-fabric/Chart.yaml
index c78af513..a294536c 100644
--- a/charts/nginx-gateway-fabric/Chart.yaml
+++ b/charts/nginx-gateway-fabric/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: nginx-gateway-fabric
 description: NGINX Gateway Fabric
 type: application
-version: 1.6.2
+version: 2.0.0
 appVersion: "edge"
 kubeVersion: ">= 1.25.0-0"
 home: https://github.com/nginx/nginx-gateway-fabric
diff --git a/charts/nginx-gateway-fabric/README.md b/charts/nginx-gateway-fabric/README.md
index d2a1f953..65a006b5 100644
--- a/charts/nginx-gateway-fabric/README.md
+++ b/charts/nginx-gateway-fabric/README.md
@@ -1,7 +1,7 @@
 
 # NGINX Gateway Fabric Helm Chart
 
-![Version: 1.6.2](https://img.shields.io/badge/Version-1.6.2-informational?style=flat-square) ![AppVersion: edge](https://img.shields.io/badge/AppVersion-edge-informational?style=flat-square)
+![Version: 2.0.0](https://img.shields.io/badge/Version-2.0.0-informational?style=flat-square) ![AppVersion: edge](https://img.shields.io/badge/AppVersion-edge-informational?style=flat-square)
 
 - [NGINX Gateway Fabric Helm Chart](#nginx-gateway-fabric-helm-chart)
   - [Introduction](#introduction)
diff --git a/deploy/README.md b/deploy/README.md
index ade7d43f..3d342741 100644
--- a/deploy/README.md
+++ b/deploy/README.md
@@ -12,4 +12,4 @@ use the following command to apply the manifests:
 kubectl kustomize | kubectl apply -f -
 ```
 
-For more information on how to deploy NGINX Gateway Fabric and the Gateway API CRDs see the [installation guide](https://docs.nginx.com/nginx-gateway-fabric/installation/installing-ngf/manifests/).
+For more information on how to deploy NGINX Gateway Fabric and the Gateway API CRDs see the [installation guide](https://docs.nginx.com/nginx-gateway-fabric/install/manifests/).
diff --git a/design/control-data-plane-separation/design.md b/design/control-data-plane-separation/design.md
index 905bc5c8..0699a283 100644
--- a/design/control-data-plane-separation/design.md
+++ b/design/control-data-plane-separation/design.md
@@ -713,7 +713,7 @@ have a use case for runtime configuration at the moment.
 
 [agent-config]: https://github.com/nginx/agent/blob/ea3a1b4df5d7ecf95bd3d9297d26e420f5e1dd57/sdk/proto/agent.pb.go#L320
 
-[cli]: https://docs.nginx.com/nginx-management-suite/nginx-agent/install-nginx-agent/#nginx-agent-cli-flags-usage
+[cli]: https://docs.nginx.com/nginx-agent/configuration/configuration-overview/#cli-flags--environment-variables
 
 ## Edge Cases
 
diff --git a/docs/developer/quickstart.md b/docs/developer/quickstart.md
index 697acf50..0b835da9 100644
--- a/docs/developer/quickstart.md
+++ b/docs/developer/quickstart.md
@@ -121,7 +121,7 @@ This will build the docker images `nginx-gateway-fabric:<your-user>` and `nginx-
 
 > Note: You will need a valid NGINX Plus license certificate and key named `nginx-repo.crt` and `nginx-repo.key` in the
 > root of this repo to build the NGINX Plus image.
-> You will also need a valid NGINX Plus JSON Web Token (JWT) to deploy NGF with NGINX Plus. That JWT should be stored in the `license.jwt` file in the root of the `nginx-gateway-fabric/` directory. See the [documentation](https://docs.nginx.com/nginx-gateway-fabric/installation/nginx-plus-jwt/) for instructions on how to download and set up the JWT.
+> You will also need a valid NGINX Plus JSON Web Token (JWT) to deploy NGF with NGINX Plus. That JWT should be stored in the `license.jwt` file in the root of the `nginx-gateway-fabric/` directory. See the [documentation](https://docs.nginx.com/nginx-gateway-fabric/install/nginx-plus/) for instructions on how to download and set up the JWT.
 > Additionally, you need to set the NGINX Plus usage endpoint in your environment. For development and testing, export `PLUS_USAGE_ENDPOINT=<N1 staging endpoint>`.
 
 To build the NGINX Gateway Fabric and NGINX Plus container images from source run the following make command:
diff --git a/examples/advanced-routing/README.md b/examples/advanced-routing/README.md
index fc1cb56e..feb4e884 100644
--- a/examples/advanced-routing/README.md
+++ b/examples/advanced-routing/README.md
@@ -1,3 +1,3 @@
 # Advanced Routing
 
-This directory contains the YAML files used in the [Advanced Routing](https://docs.nginx.com/nginx-gateway-fabric/how-to/traffic-management/advanced-routing/) guide.
+This directory contains the YAML files used in the [Advanced Routing](https://docs.nginx.com/nginx-gateway-fabric/traffic-management/advanced-routing/) guide.
diff --git a/examples/cafe-example/README.md b/examples/cafe-example/README.md
index d10f871e..6357da5d 100644
--- a/examples/cafe-example/README.md
+++ b/examples/cafe-example/README.md
@@ -7,7 +7,7 @@ to route traffic to that application using HTTPRoute resources.
 
 ## 1. Deploy NGINX Gateway Fabric
 
-1. Follow the [installation instructions](https://docs.nginx.com/nginx-gateway-fabric/installation/) to deploy NGINX Gateway Fabric.
+1. Follow the [installation instructions](https://docs.nginx.com/nginx-gateway-fabric/install/) to deploy NGINX Gateway Fabric.
 
 ## 2. Deploy the Cafe Application
 
diff --git a/examples/client-settings-policy/README.md b/examples/client-settings-policy/README.md
index 4b192f08..53db514e 100644
--- a/examples/client-settings-policy/README.md
+++ b/examples/client-settings-policy/README.md
@@ -1,3 +1,3 @@
 # Client Settings Policy
 
-This directory contains the YAML files used in the [ClientSettingsPolicy](https://docs.nginx.com/nginx-gateway-fabric/how-to/traffic-management/client-settings/) guide.
+This directory contains the YAML files used in the [ClientSettingsPolicy](https://docs.nginx.com/nginx-gateway-fabric/traffic-management/client-settings/) guide.
diff --git a/examples/cross-namespace-routing/README.md b/examples/cross-namespace-routing/README.md
index 9e98908a..663081b0 100644
--- a/examples/cross-namespace-routing/README.md
+++ b/examples/cross-namespace-routing/README.md
@@ -7,7 +7,7 @@ in a different namespace from our HTTPRoutes.
 
 ## 1. Deploy NGINX Gateway Fabric
 
-1. Follow the [installation instructions](https://docs.nginx.com/nginx-gateway-fabric/installation/) to deploy NGINX Gateway Fabric.
+1. Follow the [installation instructions](https://docs.nginx.com/nginx-gateway-fabric/install/) to deploy NGINX Gateway Fabric.
 
 ## 2. Deploy the Cafe Application
 
diff --git a/examples/grpc-routing/README.md b/examples/grpc-routing/README.md
index 3f294978..c3fab9db 100644
--- a/examples/grpc-routing/README.md
+++ b/examples/grpc-routing/README.md
@@ -7,7 +7,7 @@ to route traffic to that application using GRPCRoute resources.
 
 ## 1. Deploy NGINX Gateway Fabric
 
-1. Follow the [installation instructions](https://docs.nginx.com/nginx-gateway-fabric/installation/) to deploy NGINX Gateway Fabric.
+1. Follow the [installation instructions](https://docs.nginx.com/nginx-gateway-fabric/install/) to deploy NGINX Gateway Fabric.
 
 ## 2. Deploy the Helloworld Application
 
diff --git a/examples/http-request-header-filter/README.md b/examples/http-request-header-filter/README.md
index 0dc7e36a..5de5be7c 100644
--- a/examples/http-request-header-filter/README.md
+++ b/examples/http-request-header-filter/README.md
@@ -1,3 +1,3 @@
 # HTTP request headers example
 
-This directory contains the YAML files used in the [Modify HTTP request and response headers](https://docs.nginx.com/nginx-gateway-fabric/how-to/traffic-management/request-response-headers/) guide.
+This directory contains the YAML files used in the [Modify HTTP request and response headers](https://docs.nginx.com/nginx-gateway-fabric/traffic-management/request-response-headers/) guide.
diff --git a/examples/http-response-header-filter/README.md b/examples/http-response-header-filter/README.md
index ba59ed22..e6b20f7e 100644
--- a/examples/http-response-header-filter/README.md
+++ b/examples/http-response-header-filter/README.md
@@ -1,3 +1,3 @@
 # HTTP response headers example
 
-This directory contains the YAML files used in the [Modify HTTP request and response headers](https://docs.nginx.com/nginx-gateway-fabric/how-to/traffic-management/request-response-headers/) guide.
+This directory contains the YAML files used in the [Modify HTTP request and response headers](https://docs.nginx.com/nginx-gateway-fabric/traffic-management/request-response-headers/) guide.
diff --git a/examples/https-termination/README.md b/examples/https-termination/README.md
index 8e7245e4..6af8c9a1 100644
--- a/examples/https-termination/README.md
+++ b/examples/https-termination/README.md
@@ -1,3 +1,3 @@
 # HTTPS Termination
 
-This directory contains the YAML files used in the [HTTPS Termination](https://docs.nginx.com/nginx-gateway-fabric/how-to/traffic-management/https-termination/) guide.
+This directory contains the YAML files used in the [HTTPS Termination](https://docs.nginx.com/nginx-gateway-fabric/traffic-management/https-termination/) guide.
diff --git a/examples/snippets-filter/README.md b/examples/snippets-filter/README.md
index dce01579..ab2b999e 100644
--- a/examples/snippets-filter/README.md
+++ b/examples/snippets-filter/README.md
@@ -1,3 +1,3 @@
 # SnippetsFilter
 
-This directory contains the YAML files used in the [SnippetsFilter API](https://docs.nginx.com/nginx-gateway-fabric/how-to/traffic-management/snippets/) guide.
+This directory contains the YAML files used in the [SnippetsFilter API](https://docs.nginx.com/nginx-gateway-fabric/traffic-management/snippets/) guide.
diff --git a/examples/traffic-splitting/README.md b/examples/traffic-splitting/README.md
index d3a07061..55ff9daa 100644
--- a/examples/traffic-splitting/README.md
+++ b/examples/traffic-splitting/README.md
@@ -9,7 +9,7 @@ and `coffee-v2`.
 
 ## 1. Deploy NGINX Gateway Fabric
 
-1. Follow the [installation instructions](https://docs.nginx.com/nginx-gateway-fabric/installation/) to deploy NGINX Gateway Fabric.
+1. Follow the [installation instructions](https://docs.nginx.com/nginx-gateway-fabric/install/) to deploy NGINX Gateway Fabric.
 
 ## 2. Deploy the Coffee Application
 
diff --git a/examples/upstream-settings-policy/README.md b/examples/upstream-settings-policy/README.md
index e2f1d2e5..98ae8c5b 100644
--- a/examples/upstream-settings-policy/README.md
+++ b/examples/upstream-settings-policy/README.md
@@ -1,3 +1,3 @@
 # UpstreamSettingsPolicy
 
-This directory contains the YAML files used in the [UpstreamSettingsPolicy](https://docs.nginx.com/nginx-gateway-fabric/how-to/traffic-management/upstream-settings/) guide.
+This directory contains the YAML files used in the [UpstreamSettingsPolicy](https://docs.nginx.com/nginx-gateway-fabric/traffic-management/upstream-settings/) guide.



Test patch:
diff --git a/tests/Makefile b/tests/Makefile
index 193802fc..89cb350a 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -7,7 +7,7 @@ GINKGO_FLAGS =
 GINKGO_LABEL =
 GITHUB_OUTPUT =
 GW_API_VERSION ?= $(shell sed -n 's/.*ref=v\(.*\)/\1/p' ../config/crd/gateway-api/standard/kustomization.yaml)## Supported Gateway API version from current NGF
-GW_API_PREV_VERSION ?= 1.2.1## Supported Gateway API version from previous NGF release
+GW_API_PREV_VERSION ?= 1.3.0## Supported Gateway API version from previous NGF release
 GW_SERVICE_TYPE = NodePort## Service type to use for the gateway
 NGF_VERSION ?= edge## NGF version to be tested
 PULL_POLICY = Never## Pull policy for the images