diff --git a/.portal-docs/docker-hub/README.aspire-dashboard.md b/.portal-docs/docker-hub/README.aspire-dashboard.md
index e5e342d4aa..dd4c9ba5fb 100644
--- a/.portal-docs/docker-hub/README.aspire-dashboard.md
+++ b/.portal-docs/docker-hub/README.aspire-dashboard.md
@@ -102,7 +102,7 @@ Limits are per-resource. For example, a `MaxLogCount` value of 10,000 configures
 * [dotnet/nightly/runtime](https://hub.docker.com/r/microsoft/dotnet-nightly-runtime/): .NET Runtime (Preview)
 * [dotnet/nightly/runtime-deps](https://hub.docker.com/r/microsoft/dotnet-nightly-runtime-deps/): .NET Runtime Dependencies (Preview)
 * [dotnet/nightly/monitor](https://hub.docker.com/r/microsoft/dotnet-nightly-monitor/): .NET Monitor Tool (Preview)
-* [dotnet/nightly/reverse-proxy](https://hub.docker.com/r/microsoft/dotnet-nightly-reverse-proxy/): .NET Reverse Proxy (YARP) (Preview)
+* [dotnet/nightly/yarp](https://hub.docker.com/r/microsoft/dotnet-nightly-yarp/): YARP (Yet Another Reverse Proxy) (Preview)
 * [dotnet/samples](https://hub.docker.com/r/microsoft/dotnet-samples/): .NET Samples
 
 .NET Framework:
diff --git a/.portal-docs/docker-hub/README.aspnet.md b/.portal-docs/docker-hub/README.aspnet.md
index e01d7b966f..c39e223574 100644
--- a/.portal-docs/docker-hub/README.aspnet.md
+++ b/.portal-docs/docker-hub/README.aspnet.md
@@ -69,7 +69,7 @@ For more information, see the [composite images section in the Image Variants do
 * [dotnet/nightly/runtime-deps](https://hub.docker.com/r/microsoft/dotnet-nightly-runtime-deps/): .NET Runtime Dependencies (Preview)
 * [dotnet/nightly/monitor](https://hub.docker.com/r/microsoft/dotnet-nightly-monitor/): .NET Monitor Tool (Preview)
 * [dotnet/nightly/aspire-dashboard](https://hub.docker.com/r/microsoft/dotnet-nightly-aspire-dashboard/): .NET Aspire Dashboard (Preview)
-* [dotnet/nightly/reverse-proxy](https://hub.docker.com/r/microsoft/dotnet-nightly-reverse-proxy/): .NET Reverse Proxy (YARP) (Preview)
+* [dotnet/nightly/yarp](https://hub.docker.com/r/microsoft/dotnet-nightly-yarp/): YARP (Yet Another Reverse Proxy) (Preview)
 * [dotnet/samples](https://hub.docker.com/r/microsoft/dotnet-samples/): .NET Samples
 
 .NET Framework:
diff --git a/.portal-docs/docker-hub/README.monitor-base.md b/.portal-docs/docker-hub/README.monitor-base.md
index 61d7108eae..bb7dab1cb0 100644
--- a/.portal-docs/docker-hub/README.monitor-base.md
+++ b/.portal-docs/docker-hub/README.monitor-base.md
@@ -38,7 +38,7 @@ The following Dockerfiles demonstrate how you can use this base image to build a
 * [dotnet/nightly/runtime-deps](https://hub.docker.com/r/microsoft/dotnet-nightly-runtime-deps/): .NET Runtime Dependencies (Preview)
 * [dotnet/nightly/monitor](https://hub.docker.com/r/microsoft/dotnet-nightly-monitor/): .NET Monitor Tool (Preview)
 * [dotnet/nightly/aspire-dashboard](https://hub.docker.com/r/microsoft/dotnet-nightly-aspire-dashboard/): .NET Aspire Dashboard (Preview)
-* [dotnet/nightly/reverse-proxy](https://hub.docker.com/r/microsoft/dotnet-nightly-reverse-proxy/): .NET Reverse Proxy (YARP) (Preview)
+* [dotnet/nightly/yarp](https://hub.docker.com/r/microsoft/dotnet-nightly-yarp/): YARP (Yet Another Reverse Proxy) (Preview)
 * [dotnet/samples](https://hub.docker.com/r/microsoft/dotnet-samples/): .NET Samples
 
 .NET Framework:
diff --git a/.portal-docs/docker-hub/README.monitor.md b/.portal-docs/docker-hub/README.monitor.md
index 2078ac0be6..521674aadf 100644
--- a/.portal-docs/docker-hub/README.monitor.md
+++ b/.portal-docs/docker-hub/README.monitor.md
@@ -37,7 +37,7 @@ See [documentation](https://go.microsoft.com/fwlink/?linkid=2158052) for how to
 * [dotnet/nightly/runtime-deps](https://hub.docker.com/r/microsoft/dotnet-nightly-runtime-deps/): .NET Runtime Dependencies (Preview)
 * [dotnet/nightly/monitor/base](https://hub.docker.com/r/microsoft/dotnet-nightly-monitor-base/): .NET Monitor Base (Preview)
 * [dotnet/nightly/aspire-dashboard](https://hub.docker.com/r/microsoft/dotnet-nightly-aspire-dashboard/): .NET Aspire Dashboard (Preview)
-* [dotnet/nightly/reverse-proxy](https://hub.docker.com/r/microsoft/dotnet-nightly-reverse-proxy/): .NET Reverse Proxy (YARP) (Preview)
+* [dotnet/nightly/yarp](https://hub.docker.com/r/microsoft/dotnet-nightly-yarp/): YARP (Yet Another Reverse Proxy) (Preview)
 * [dotnet/samples](https://hub.docker.com/r/microsoft/dotnet-samples/): .NET Samples
 
 .NET Framework:
diff --git a/.portal-docs/docker-hub/README.runtime-deps.md b/.portal-docs/docker-hub/README.runtime-deps.md
index ca436d9539..fab6c9d45c 100644
--- a/.portal-docs/docker-hub/README.runtime-deps.md
+++ b/.portal-docs/docker-hub/README.runtime-deps.md
@@ -50,7 +50,7 @@ They contain the following features:
 * [dotnet/nightly/runtime](https://hub.docker.com/r/microsoft/dotnet-nightly-runtime/): .NET Runtime (Preview)
 * [dotnet/nightly/monitor](https://hub.docker.com/r/microsoft/dotnet-nightly-monitor/): .NET Monitor Tool (Preview)
 * [dotnet/nightly/aspire-dashboard](https://hub.docker.com/r/microsoft/dotnet-nightly-aspire-dashboard/): .NET Aspire Dashboard (Preview)
-* [dotnet/nightly/reverse-proxy](https://hub.docker.com/r/microsoft/dotnet-nightly-reverse-proxy/): .NET Reverse Proxy (YARP) (Preview)
+* [dotnet/nightly/yarp](https://hub.docker.com/r/microsoft/dotnet-nightly-yarp/): YARP (Yet Another Reverse Proxy) (Preview)
 * [dotnet/samples](https://hub.docker.com/r/microsoft/dotnet-samples/): .NET Samples
 
 .NET Framework:
diff --git a/.portal-docs/docker-hub/README.runtime.md b/.portal-docs/docker-hub/README.runtime.md
index 42a5eea638..b69966a9de 100644
--- a/.portal-docs/docker-hub/README.runtime.md
+++ b/.portal-docs/docker-hub/README.runtime.md
@@ -58,7 +58,7 @@ They contain the following features:
 * [dotnet/nightly/runtime-deps](https://hub.docker.com/r/microsoft/dotnet-nightly-runtime-deps/): .NET Runtime Dependencies (Preview)
 * [dotnet/nightly/monitor](https://hub.docker.com/r/microsoft/dotnet-nightly-monitor/): .NET Monitor Tool (Preview)
 * [dotnet/nightly/aspire-dashboard](https://hub.docker.com/r/microsoft/dotnet-nightly-aspire-dashboard/): .NET Aspire Dashboard (Preview)
-* [dotnet/nightly/reverse-proxy](https://hub.docker.com/r/microsoft/dotnet-nightly-reverse-proxy/): .NET Reverse Proxy (YARP) (Preview)
+* [dotnet/nightly/yarp](https://hub.docker.com/r/microsoft/dotnet-nightly-yarp/): YARP (Yet Another Reverse Proxy) (Preview)
 * [dotnet/samples](https://hub.docker.com/r/microsoft/dotnet-samples/): .NET Samples
 
 .NET Framework:
diff --git a/.portal-docs/docker-hub/README.sdk.md b/.portal-docs/docker-hub/README.sdk.md
index f48e340777..3eeb359d93 100644
--- a/.portal-docs/docker-hub/README.sdk.md
+++ b/.portal-docs/docker-hub/README.sdk.md
@@ -54,7 +54,7 @@ The [Image Variants documentation](https://github.com/dotnet/dotnet-docker/blob/
 * [dotnet/nightly/runtime-deps](https://hub.docker.com/r/microsoft/dotnet-nightly-runtime-deps/): .NET Runtime Dependencies (Preview)
 * [dotnet/nightly/monitor](https://hub.docker.com/r/microsoft/dotnet-nightly-monitor/): .NET Monitor Tool (Preview)
 * [dotnet/nightly/aspire-dashboard](https://hub.docker.com/r/microsoft/dotnet-nightly-aspire-dashboard/): .NET Aspire Dashboard (Preview)
-* [dotnet/nightly/reverse-proxy](https://hub.docker.com/r/microsoft/dotnet-nightly-reverse-proxy/): .NET Reverse Proxy (YARP) (Preview)
+* [dotnet/nightly/yarp](https://hub.docker.com/r/microsoft/dotnet-nightly-yarp/): YARP (Yet Another Reverse Proxy) (Preview)
 * [dotnet/samples](https://hub.docker.com/r/microsoft/dotnet-samples/): .NET Samples
 
 .NET Framework:
diff --git a/.portal-docs/docker-hub/README.reverse-proxy.md b/.portal-docs/docker-hub/README.yarp.md
similarity index 86%
rename from .portal-docs/docker-hub/README.reverse-proxy.md
rename to .portal-docs/docker-hub/README.yarp.md
index ec781ce5f5..e737aeb613 100644
--- a/.portal-docs/docker-hub/README.reverse-proxy.md
+++ b/.portal-docs/docker-hub/README.yarp.md
@@ -5,7 +5,7 @@
 # Featured Tags
 
 * `2.3-preview`
-  * `docker pull mcr.microsoft.com/dotnet/nightly/reverse-proxy:2.3-preview`
+  * `docker pull mcr.microsoft.com/dotnet/nightly/yarp:2.3-preview`
 
 # About
 
@@ -19,7 +19,7 @@ The [.NET Docker samples](https://github.com/dotnet/dotnet-docker/blob/main/samp
 
 You can run this image to launch a YARP instance.
 
-YARP expects the config file to be in `/etc/reverse-proxy.config`, and listens by default on port 5000.
+YARP expects the config file to be in `/etc/yarp.config`, and listens by default on port 5000.
 
 Example of configuration:
 
@@ -62,14 +62,14 @@ It can then be used with the following command (where `my-config.config` is a fi
 
 ```bash
 docker run --rm --name myaspnetapp -d -t  mcr.microsoft.com/dotnet/samples:aspnetapp 
-docker run --rm -v $(pwd)/my-config.config:/etc/reverse-proxy.config -p 5000:5000 --link myaspnetapp:aspnetapp1 mcr.microsoft.com/dotnet/reverse-proxy:latest
+docker run --rm -v $(pwd)/my-config.config:/etc/yarp.config -p 5000:5000 --link myaspnetapp:aspnetapp1 mcr.microsoft.com/dotnet/yarp:latest
 ```
 
 This example will proxy every requests from `http://localhost:5000/aspnetapp` to the `mcr.microsoft.com/dotnet/samples:aspnetapp` container deployed.
 
-The [YARP GitHub repository](https://github.com/microsoft/reverse-proxy/tree/main/samples/) contains more configuration samples.
+The [YARP GitHub repository](https://github.com/dotnet/yarp/tree/main/samples/) contains more configuration samples.
 
-For more details, see the [documentation](https://microsoft.github.io/reverse-proxy/articles/index.html) for how to configure the image and documentation for the reverse proxy configuration.
+For more details, see the [documentation](https://aka.ms/YarpDocumentation) for how to configure the image and documentation for the reverse proxy configuration.
 
 # Related Repositories
 
@@ -91,13 +91,13 @@ For more details, see the [documentation](https://microsoft.github.io/reverse-pr
 
 # Full Tag Listing
 
-View the current tags at the [Microsoft Artifact Registry portal](https://mcr.microsoft.com/product/dotnet/nightly/reverse-proxy/tags) or on [GitHub](https://github.com/dotnet/dotnet-docker/blob/nightly/README.reverse-proxy.md#full-tag-listing).
+View the current tags at the [Microsoft Artifact Registry portal](https://mcr.microsoft.com/product/dotnet/nightly/yarp/tags) or on [GitHub](https://github.com/dotnet/dotnet-docker/blob/nightly/README.yarp.md#full-tag-listing).
 
 # Support
 
 ## Lifecycle
 
-* [Microsoft Support for YARP](https://github.com/microsoft/reverse-proxy/blob/main/docs/roadmap.md)
+* [Microsoft Support for YARP](https://github.com/dotnet/yarp/blob/main/docs/roadmap.md)
 * [Microsoft Support for .NET](https://github.com/dotnet/core/blob/main/support.md)
 * [Supported Container Platforms Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-platforms.md)
 * [Supported Tags Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-tags.md)
diff --git a/.portal-docs/mar/README.aspire-dashboard.portal.md b/.portal-docs/mar/README.aspire-dashboard.portal.md
index 0c50a99805..5a2b388445 100644
--- a/.portal-docs/mar/README.aspire-dashboard.portal.md
+++ b/.portal-docs/mar/README.aspire-dashboard.portal.md
@@ -24,7 +24,7 @@ Watch [discussions](https://github.com/dotnet/dotnet-docker/discussions/categori
 * [dotnet/nightly/runtime](https://mcr.microsoft.com/product/dotnet/nightly/runtime/about): .NET Runtime (Preview)
 * [dotnet/nightly/runtime-deps](https://mcr.microsoft.com/product/dotnet/nightly/runtime-deps/about): .NET Runtime Dependencies (Preview)
 * [dotnet/nightly/monitor](https://mcr.microsoft.com/product/dotnet/nightly/monitor/about): .NET Monitor Tool (Preview)
-* [dotnet/nightly/reverse-proxy](https://mcr.microsoft.com/product/dotnet/nightly/reverse-proxy/about): .NET Reverse Proxy (YARP) (Preview)
+* [dotnet/nightly/yarp](https://mcr.microsoft.com/product/dotnet/nightly/yarp/about): YARP (Yet Another Reverse Proxy) (Preview)
 * [dotnet/samples](https://mcr.microsoft.com/product/dotnet/samples/about): .NET Samples
 
 .NET Framework:
diff --git a/.portal-docs/mar/README.aspnet.portal.md b/.portal-docs/mar/README.aspnet.portal.md
index 40a009f9ad..a39fefa2f6 100644
--- a/.portal-docs/mar/README.aspnet.portal.md
+++ b/.portal-docs/mar/README.aspnet.portal.md
@@ -26,7 +26,7 @@ Watch [discussions](https://github.com/dotnet/dotnet-docker/discussions/categori
 * [dotnet/nightly/runtime-deps](https://mcr.microsoft.com/product/dotnet/nightly/runtime-deps/about): .NET Runtime Dependencies (Preview)
 * [dotnet/nightly/monitor](https://mcr.microsoft.com/product/dotnet/nightly/monitor/about): .NET Monitor Tool (Preview)
 * [dotnet/nightly/aspire-dashboard](https://mcr.microsoft.com/product/dotnet/nightly/aspire-dashboard/about): .NET Aspire Dashboard (Preview)
-* [dotnet/nightly/reverse-proxy](https://mcr.microsoft.com/product/dotnet/nightly/reverse-proxy/about): .NET Reverse Proxy (YARP) (Preview)
+* [dotnet/nightly/yarp](https://mcr.microsoft.com/product/dotnet/nightly/yarp/about): YARP (Yet Another Reverse Proxy) (Preview)
 * [dotnet/samples](https://mcr.microsoft.com/product/dotnet/samples/about): .NET Samples
 
 .NET Framework:
diff --git a/.portal-docs/mar/README.monitor-base.portal.md b/.portal-docs/mar/README.monitor-base.portal.md
index d7e1d74c73..f544d6c162 100644
--- a/.portal-docs/mar/README.monitor-base.portal.md
+++ b/.portal-docs/mar/README.monitor-base.portal.md
@@ -29,7 +29,7 @@ Watch [discussions](https://github.com/dotnet/dotnet-docker/discussions/categori
 * [dotnet/nightly/runtime-deps](https://mcr.microsoft.com/product/dotnet/nightly/runtime-deps/about): .NET Runtime Dependencies (Preview)
 * [dotnet/nightly/monitor](https://mcr.microsoft.com/product/dotnet/nightly/monitor/about): .NET Monitor Tool (Preview)
 * [dotnet/nightly/aspire-dashboard](https://mcr.microsoft.com/product/dotnet/nightly/aspire-dashboard/about): .NET Aspire Dashboard (Preview)
-* [dotnet/nightly/reverse-proxy](https://mcr.microsoft.com/product/dotnet/nightly/reverse-proxy/about): .NET Reverse Proxy (YARP) (Preview)
+* [dotnet/nightly/yarp](https://mcr.microsoft.com/product/dotnet/nightly/yarp/about): YARP (Yet Another Reverse Proxy) (Preview)
 * [dotnet/samples](https://mcr.microsoft.com/product/dotnet/samples/about): .NET Samples
 
 .NET Framework:
diff --git a/.portal-docs/mar/README.monitor.portal.md b/.portal-docs/mar/README.monitor.portal.md
index 63e962b772..16d2a9f22f 100644
--- a/.portal-docs/mar/README.monitor.portal.md
+++ b/.portal-docs/mar/README.monitor.portal.md
@@ -27,7 +27,7 @@ Watch [discussions](https://github.com/dotnet/dotnet-docker/discussions/categori
 * [dotnet/nightly/runtime-deps](https://mcr.microsoft.com/product/dotnet/nightly/runtime-deps/about): .NET Runtime Dependencies (Preview)
 * [dotnet/nightly/monitor/base](https://mcr.microsoft.com/product/dotnet/nightly/monitor/base/about): .NET Monitor Base (Preview)
 * [dotnet/nightly/aspire-dashboard](https://mcr.microsoft.com/product/dotnet/nightly/aspire-dashboard/about): .NET Aspire Dashboard (Preview)
-* [dotnet/nightly/reverse-proxy](https://mcr.microsoft.com/product/dotnet/nightly/reverse-proxy/about): .NET Reverse Proxy (YARP) (Preview)
+* [dotnet/nightly/yarp](https://mcr.microsoft.com/product/dotnet/nightly/yarp/about): YARP (Yet Another Reverse Proxy) (Preview)
 * [dotnet/samples](https://mcr.microsoft.com/product/dotnet/samples/about): .NET Samples
 
 .NET Framework:
diff --git a/.portal-docs/mar/README.runtime-deps.portal.md b/.portal-docs/mar/README.runtime-deps.portal.md
index 3afdc310f8..7ab24d94cb 100644
--- a/.portal-docs/mar/README.runtime-deps.portal.md
+++ b/.portal-docs/mar/README.runtime-deps.portal.md
@@ -26,7 +26,7 @@ Watch [discussions](https://github.com/dotnet/dotnet-docker/discussions/categori
 * [dotnet/nightly/runtime](https://mcr.microsoft.com/product/dotnet/nightly/runtime/about): .NET Runtime (Preview)
 * [dotnet/nightly/monitor](https://mcr.microsoft.com/product/dotnet/nightly/monitor/about): .NET Monitor Tool (Preview)
 * [dotnet/nightly/aspire-dashboard](https://mcr.microsoft.com/product/dotnet/nightly/aspire-dashboard/about): .NET Aspire Dashboard (Preview)
-* [dotnet/nightly/reverse-proxy](https://mcr.microsoft.com/product/dotnet/nightly/reverse-proxy/about): .NET Reverse Proxy (YARP) (Preview)
+* [dotnet/nightly/yarp](https://mcr.microsoft.com/product/dotnet/nightly/yarp/about): YARP (Yet Another Reverse Proxy) (Preview)
 * [dotnet/samples](https://mcr.microsoft.com/product/dotnet/samples/about): .NET Samples
 
 .NET Framework:
diff --git a/.portal-docs/mar/README.runtime.portal.md b/.portal-docs/mar/README.runtime.portal.md
index 7b248fcea7..a63f72f418 100644
--- a/.portal-docs/mar/README.runtime.portal.md
+++ b/.portal-docs/mar/README.runtime.portal.md
@@ -26,7 +26,7 @@ Watch [discussions](https://github.com/dotnet/dotnet-docker/discussions/categori
 * [dotnet/nightly/runtime-deps](https://mcr.microsoft.com/product/dotnet/nightly/runtime-deps/about): .NET Runtime Dependencies (Preview)
 * [dotnet/nightly/monitor](https://mcr.microsoft.com/product/dotnet/nightly/monitor/about): .NET Monitor Tool (Preview)
 * [dotnet/nightly/aspire-dashboard](https://mcr.microsoft.com/product/dotnet/nightly/aspire-dashboard/about): .NET Aspire Dashboard (Preview)
-* [dotnet/nightly/reverse-proxy](https://mcr.microsoft.com/product/dotnet/nightly/reverse-proxy/about): .NET Reverse Proxy (YARP) (Preview)
+* [dotnet/nightly/yarp](https://mcr.microsoft.com/product/dotnet/nightly/yarp/about): YARP (Yet Another Reverse Proxy) (Preview)
 * [dotnet/samples](https://mcr.microsoft.com/product/dotnet/samples/about): .NET Samples
 
 .NET Framework:
diff --git a/.portal-docs/mar/README.sdk.portal.md b/.portal-docs/mar/README.sdk.portal.md
index fcc3c68e6e..7f72f3744a 100644
--- a/.portal-docs/mar/README.sdk.portal.md
+++ b/.portal-docs/mar/README.sdk.portal.md
@@ -32,7 +32,7 @@ Watch [discussions](https://github.com/dotnet/dotnet-docker/discussions/categori
 * [dotnet/nightly/runtime-deps](https://mcr.microsoft.com/product/dotnet/nightly/runtime-deps/about): .NET Runtime Dependencies (Preview)
 * [dotnet/nightly/monitor](https://mcr.microsoft.com/product/dotnet/nightly/monitor/about): .NET Monitor Tool (Preview)
 * [dotnet/nightly/aspire-dashboard](https://mcr.microsoft.com/product/dotnet/nightly/aspire-dashboard/about): .NET Aspire Dashboard (Preview)
-* [dotnet/nightly/reverse-proxy](https://mcr.microsoft.com/product/dotnet/nightly/reverse-proxy/about): .NET Reverse Proxy (YARP) (Preview)
+* [dotnet/nightly/yarp](https://mcr.microsoft.com/product/dotnet/nightly/yarp/about): YARP (Yet Another Reverse Proxy) (Preview)
 * [dotnet/samples](https://mcr.microsoft.com/product/dotnet/samples/about): .NET Samples
 
 .NET Framework:
diff --git a/.portal-docs/mar/README.reverse-proxy.portal.md b/.portal-docs/mar/README.yarp.portal.md
similarity index 88%
rename from .portal-docs/mar/README.reverse-proxy.portal.md
rename to .portal-docs/mar/README.yarp.portal.md
index ccbae14264..158aeb9001 100644
--- a/.portal-docs/mar/README.reverse-proxy.portal.md
+++ b/.portal-docs/mar/README.yarp.portal.md
@@ -11,7 +11,7 @@ Watch [discussions](https://github.com/dotnet/dotnet-docker/discussions/categori
 ## Featured Tags
 
 * `2.3-preview`
-  * `docker pull mcr.microsoft.com/dotnet/nightly/reverse-proxy:2.3-preview`
+  * `docker pull mcr.microsoft.com/dotnet/nightly/yarp:2.3-preview`
 
 ## Related Repositories
 
@@ -37,7 +37,7 @@ The [.NET Docker samples](https://github.com/dotnet/dotnet-docker/blob/main/samp
 
 You can run this image to launch a YARP instance.
 
-YARP expects the config file to be in `/etc/reverse-proxy.config`, and listens by default on port 5000.
+YARP expects the config file to be in `/etc/yarp.config`, and listens by default on port 5000.
 
 Example of configuration:
 
@@ -80,20 +80,20 @@ It can then be used with the following command (where `my-config.config` is a fi
 
 ```bash
 docker run --rm --name myaspnetapp -d -t  mcr.microsoft.com/dotnet/samples:aspnetapp 
-docker run --rm -v $(pwd)/my-config.config:/etc/reverse-proxy.config -p 5000:5000 --link myaspnetapp:aspnetapp1 mcr.microsoft.com/dotnet/reverse-proxy:latest
+docker run --rm -v $(pwd)/my-config.config:/etc/yarp.config -p 5000:5000 --link myaspnetapp:aspnetapp1 mcr.microsoft.com/dotnet/yarp:latest
 ```
 
 This example will proxy every requests from `http://localhost:5000/aspnetapp` to the `mcr.microsoft.com/dotnet/samples:aspnetapp` container deployed.
 
-The [YARP GitHub repository](https://github.com/microsoft/reverse-proxy/tree/main/samples/) contains more configuration samples.
+The [YARP GitHub repository](https://github.com/dotnet/yarp/tree/main/samples/) contains more configuration samples.
 
-For more details, see the [documentation](https://microsoft.github.io/reverse-proxy/articles/index.html) for how to configure the image and documentation for the reverse proxy configuration.
+For more details, see the [documentation](https://aka.ms/YarpDocumentation) for how to configure the image and documentation for the reverse proxy configuration.
 
 ## Support
 
 ### Lifecycle
 
-* [Microsoft Support for YARP](https://github.com/microsoft/reverse-proxy/blob/main/docs/roadmap.md)
+* [Microsoft Support for YARP](https://github.com/dotnet/yarp/blob/main/docs/roadmap.md)
 * [Microsoft Support for .NET](https://github.com/dotnet/core/blob/main/support.md)
 * [Supported Container Platforms Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-platforms.md)
 * [Supported Tags Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-tags.md)
diff --git a/README.aspire-dashboard.md b/README.aspire-dashboard.md
index 2c433683f8..89d77fe93e 100644
--- a/README.aspire-dashboard.md
+++ b/README.aspire-dashboard.md
@@ -104,7 +104,7 @@ Limits are per-resource. For example, a `MaxLogCount` value of 10,000 configures
 * [dotnet/nightly/runtime](https://github.com/dotnet/dotnet-docker/blob/nightly/README.runtime.md): .NET Runtime (Preview)
 * [dotnet/nightly/runtime-deps](https://github.com/dotnet/dotnet-docker/blob/nightly/README.runtime-deps.md): .NET Runtime Dependencies (Preview)
 * [dotnet/nightly/monitor](https://github.com/dotnet/dotnet-docker/blob/nightly/README.monitor.md): .NET Monitor Tool (Preview)
-* [dotnet/nightly/reverse-proxy](https://github.com/dotnet/dotnet-docker/blob/nightly/README.reverse-proxy.md): .NET Reverse Proxy (YARP) (Preview)
+* [dotnet/nightly/yarp](https://github.com/dotnet/dotnet-docker/blob/nightly/README.yarp.md): YARP (Yet Another Reverse Proxy) (Preview)
 * [dotnet/samples](https://github.com/dotnet/dotnet-docker/blob/main/README.samples.md): .NET Samples
 
 .NET Framework:
diff --git a/README.aspnet.md b/README.aspnet.md
index 447102b03d..2bbefbe16b 100644
--- a/README.aspnet.md
+++ b/README.aspnet.md
@@ -71,7 +71,7 @@ For more information, see the [composite images section in the Image Variants do
 * [dotnet/nightly/runtime-deps](https://github.com/dotnet/dotnet-docker/blob/nightly/README.runtime-deps.md): .NET Runtime Dependencies (Preview)
 * [dotnet/nightly/monitor](https://github.com/dotnet/dotnet-docker/blob/nightly/README.monitor.md): .NET Monitor Tool (Preview)
 * [dotnet/nightly/aspire-dashboard](https://github.com/dotnet/dotnet-docker/blob/nightly/README.aspire-dashboard.md): .NET Aspire Dashboard (Preview)
-* [dotnet/nightly/reverse-proxy](https://github.com/dotnet/dotnet-docker/blob/nightly/README.reverse-proxy.md): .NET Reverse Proxy (YARP) (Preview)
+* [dotnet/nightly/yarp](https://github.com/dotnet/dotnet-docker/blob/nightly/README.yarp.md): YARP (Yet Another Reverse Proxy) (Preview)
 * [dotnet/samples](https://github.com/dotnet/dotnet-docker/blob/main/README.samples.md): .NET Samples
 
 .NET Framework:
diff --git a/README.monitor-base.md b/README.monitor-base.md
index 9cdbc1a522..7f3215fde1 100644
--- a/README.monitor-base.md
+++ b/README.monitor-base.md
@@ -40,7 +40,7 @@ The following Dockerfiles demonstrate how you can use this base image to build a
 * [dotnet/nightly/runtime-deps](https://github.com/dotnet/dotnet-docker/blob/nightly/README.runtime-deps.md): .NET Runtime Dependencies (Preview)
 * [dotnet/nightly/monitor](https://github.com/dotnet/dotnet-docker/blob/nightly/README.monitor.md): .NET Monitor Tool (Preview)
 * [dotnet/nightly/aspire-dashboard](https://github.com/dotnet/dotnet-docker/blob/nightly/README.aspire-dashboard.md): .NET Aspire Dashboard (Preview)
-* [dotnet/nightly/reverse-proxy](https://github.com/dotnet/dotnet-docker/blob/nightly/README.reverse-proxy.md): .NET Reverse Proxy (YARP) (Preview)
+* [dotnet/nightly/yarp](https://github.com/dotnet/dotnet-docker/blob/nightly/README.yarp.md): YARP (Yet Another Reverse Proxy) (Preview)
 * [dotnet/samples](https://github.com/dotnet/dotnet-docker/blob/main/README.samples.md): .NET Samples
 
 .NET Framework:
diff --git a/README.monitor.md b/README.monitor.md
index 17987b01d8..ef0eef34e5 100644
--- a/README.monitor.md
+++ b/README.monitor.md
@@ -39,7 +39,7 @@ See [documentation](https://go.microsoft.com/fwlink/?linkid=2158052) for how to
 * [dotnet/nightly/runtime-deps](https://github.com/dotnet/dotnet-docker/blob/nightly/README.runtime-deps.md): .NET Runtime Dependencies (Preview)
 * [dotnet/nightly/monitor/base](https://github.com/dotnet/dotnet-docker/blob/nightly/README.monitor-base.md): .NET Monitor Base (Preview)
 * [dotnet/nightly/aspire-dashboard](https://github.com/dotnet/dotnet-docker/blob/nightly/README.aspire-dashboard.md): .NET Aspire Dashboard (Preview)
-* [dotnet/nightly/reverse-proxy](https://github.com/dotnet/dotnet-docker/blob/nightly/README.reverse-proxy.md): .NET Reverse Proxy (YARP) (Preview)
+* [dotnet/nightly/yarp](https://github.com/dotnet/dotnet-docker/blob/nightly/README.yarp.md): YARP (Yet Another Reverse Proxy) (Preview)
 * [dotnet/samples](https://github.com/dotnet/dotnet-docker/blob/main/README.samples.md): .NET Samples
 
 .NET Framework:
diff --git a/README.runtime-deps.md b/README.runtime-deps.md
index 12964e30eb..75d9535d32 100644
--- a/README.runtime-deps.md
+++ b/README.runtime-deps.md
@@ -52,7 +52,7 @@ They contain the following features:
 * [dotnet/nightly/runtime](https://github.com/dotnet/dotnet-docker/blob/nightly/README.runtime.md): .NET Runtime (Preview)
 * [dotnet/nightly/monitor](https://github.com/dotnet/dotnet-docker/blob/nightly/README.monitor.md): .NET Monitor Tool (Preview)
 * [dotnet/nightly/aspire-dashboard](https://github.com/dotnet/dotnet-docker/blob/nightly/README.aspire-dashboard.md): .NET Aspire Dashboard (Preview)
-* [dotnet/nightly/reverse-proxy](https://github.com/dotnet/dotnet-docker/blob/nightly/README.reverse-proxy.md): .NET Reverse Proxy (YARP) (Preview)
+* [dotnet/nightly/yarp](https://github.com/dotnet/dotnet-docker/blob/nightly/README.yarp.md): YARP (Yet Another Reverse Proxy) (Preview)
 * [dotnet/samples](https://github.com/dotnet/dotnet-docker/blob/main/README.samples.md): .NET Samples
 
 .NET Framework:
diff --git a/README.runtime.md b/README.runtime.md
index 61d605047c..dfcf95e22b 100644
--- a/README.runtime.md
+++ b/README.runtime.md
@@ -60,7 +60,7 @@ They contain the following features:
 * [dotnet/nightly/runtime-deps](https://github.com/dotnet/dotnet-docker/blob/nightly/README.runtime-deps.md): .NET Runtime Dependencies (Preview)
 * [dotnet/nightly/monitor](https://github.com/dotnet/dotnet-docker/blob/nightly/README.monitor.md): .NET Monitor Tool (Preview)
 * [dotnet/nightly/aspire-dashboard](https://github.com/dotnet/dotnet-docker/blob/nightly/README.aspire-dashboard.md): .NET Aspire Dashboard (Preview)
-* [dotnet/nightly/reverse-proxy](https://github.com/dotnet/dotnet-docker/blob/nightly/README.reverse-proxy.md): .NET Reverse Proxy (YARP) (Preview)
+* [dotnet/nightly/yarp](https://github.com/dotnet/dotnet-docker/blob/nightly/README.yarp.md): YARP (Yet Another Reverse Proxy) (Preview)
 * [dotnet/samples](https://github.com/dotnet/dotnet-docker/blob/main/README.samples.md): .NET Samples
 
 .NET Framework:
diff --git a/README.sdk.md b/README.sdk.md
index 718c2fed80..c42f514fbf 100644
--- a/README.sdk.md
+++ b/README.sdk.md
@@ -56,7 +56,7 @@ The [Image Variants documentation](https://github.com/dotnet/dotnet-docker/blob/
 * [dotnet/nightly/runtime-deps](https://github.com/dotnet/dotnet-docker/blob/nightly/README.runtime-deps.md): .NET Runtime Dependencies (Preview)
 * [dotnet/nightly/monitor](https://github.com/dotnet/dotnet-docker/blob/nightly/README.monitor.md): .NET Monitor Tool (Preview)
 * [dotnet/nightly/aspire-dashboard](https://github.com/dotnet/dotnet-docker/blob/nightly/README.aspire-dashboard.md): .NET Aspire Dashboard (Preview)
-* [dotnet/nightly/reverse-proxy](https://github.com/dotnet/dotnet-docker/blob/nightly/README.reverse-proxy.md): .NET Reverse Proxy (YARP) (Preview)
+* [dotnet/nightly/yarp](https://github.com/dotnet/dotnet-docker/blob/nightly/README.yarp.md): YARP (Yet Another Reverse Proxy) (Preview)
 * [dotnet/samples](https://github.com/dotnet/dotnet-docker/blob/main/README.samples.md): .NET Samples
 
 .NET Framework:
diff --git a/README.reverse-proxy.md b/README.yarp.md
similarity index 86%
rename from README.reverse-proxy.md
rename to README.yarp.md
index 48cf860d5b..9adf9c088a 100644
--- a/README.reverse-proxy.md
+++ b/README.yarp.md
@@ -1,4 +1,4 @@
-# .NET Reverse Proxy (YARP)
+# YARP (Yet Another Reverse Proxy)
 
 > **Important**: The images from the dotnet/nightly repositories include last-known-good (LKG) builds for the next release of [.NET](https://github.com/dotnet/core).
 >
@@ -7,7 +7,7 @@
 ## Featured Tags
 
 * `2.3-preview`
-  * `docker pull mcr.microsoft.com/dotnet/nightly/reverse-proxy:2.3-preview`
+  * `docker pull mcr.microsoft.com/dotnet/nightly/yarp:2.3-preview`
 
 ## About
 
@@ -21,7 +21,7 @@ The [.NET Docker samples](https://github.com/dotnet/dotnet-docker/blob/main/samp
 
 You can run this image to launch a YARP instance.
 
-YARP expects the config file to be in `/etc/reverse-proxy.config`, and listens by default on port 5000.
+YARP expects the config file to be in `/etc/yarp.config`, and listens by default on port 5000.
 
 Example of configuration:
 
@@ -64,14 +64,14 @@ It can then be used with the following command (where `my-config.config` is a fi
 
 ```bash
 docker run --rm --name myaspnetapp -d -t  mcr.microsoft.com/dotnet/samples:aspnetapp 
-docker run --rm -v $(pwd)/my-config.config:/etc/reverse-proxy.config -p 5000:5000 --link myaspnetapp:aspnetapp1 mcr.microsoft.com/dotnet/reverse-proxy:latest
+docker run --rm -v $(pwd)/my-config.config:/etc/yarp.config -p 5000:5000 --link myaspnetapp:aspnetapp1 mcr.microsoft.com/dotnet/yarp:latest
 ```
 
 This example will proxy every requests from `http://localhost:5000/aspnetapp` to the `mcr.microsoft.com/dotnet/samples:aspnetapp` container deployed.
 
-The [YARP GitHub repository](https://github.com/microsoft/reverse-proxy/tree/main/samples/) contains more configuration samples.
+The [YARP GitHub repository](https://github.com/dotnet/yarp/tree/main/samples/) contains more configuration samples.
 
-For more details, see the [documentation](https://microsoft.github.io/reverse-proxy/articles/index.html) for how to configure the image and documentation for the reverse proxy configuration.
+For more details, see the [documentation](https://aka.ms/YarpDocumentation) for how to configure the image and documentation for the reverse proxy configuration.
 
 ## Related Repositories
 
@@ -97,22 +97,22 @@ For more details, see the [documentation](https://microsoft.github.io/reverse-pr
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-2.3.0-preview.1, 2.3-preview, 2-preview, latest | [Dockerfile](src/reverse-proxy/2.3/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0
+2.3.0-preview.1, 2.3-preview, 2-preview, latest | [Dockerfile](src/yarp/2.3/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0
 
 ### Linux arm64 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-2.3.0-preview.1, 2.3-preview, 2-preview, latest | [Dockerfile](src/reverse-proxy/2.3/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
+2.3.0-preview.1, 2.3-preview, 2-preview, latest | [Dockerfile](src/yarp/2.3/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
 <!--End of generated tags-->
 
-*Tags not listed in the table above are not supported. See the [Supported Tags Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-tags.md). See the [full list of tags](https://mcr.microsoft.com/v2/dotnet/nightly/reverse-proxy/tags/list) for all supported and unsupported tags.*
+*Tags not listed in the table above are not supported. See the [Supported Tags Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-tags.md). See the [full list of tags](https://mcr.microsoft.com/v2/dotnet/nightly/yarp/tags/list) for all supported and unsupported tags.*
 
 ## Support
 
 ### Lifecycle
 
-* [Microsoft Support for YARP](https://github.com/microsoft/reverse-proxy/blob/main/docs/roadmap.md)
+* [Microsoft Support for YARP](https://github.com/dotnet/yarp/blob/main/docs/roadmap.md)
 * [Microsoft Support for .NET](https://github.com/dotnet/core/blob/main/support.md)
 * [Supported Container Platforms Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-platforms.md)
 * [Supported Tags Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-tags.md)
diff --git a/build-and-test.ps1 b/build-and-test.ps1
index 012537644c..1b7746d647 100644
--- a/build-and-test.ps1
+++ b/build-and-test.ps1
@@ -20,8 +20,8 @@ param(
     [string]$Mode = "BuildAndTest",
 
     # Categories of tests to run
-    [ValidateSet("runtime", "runtime-deps", "aspnet", "sdk", "pre-build", "sample", "image-size", "monitor", "aspire-dashboard", "reverse-proxy")]
-    [string[]]$TestCategories = @("runtime", "runtime-deps", "aspnet", "sdk", "monitor", "aspire-dashboard", "reverse-proxy")
+    [ValidateSet("runtime", "runtime-deps", "aspnet", "sdk", "pre-build", "sample", "image-size", "monitor", "aspire-dashboard", "yarp")]
+    [string[]]$TestCategories = @("runtime", "runtime-deps", "aspnet", "sdk", "monitor", "aspire-dashboard", "yarp")
 )
 
 [System.Collections.ArrayList]$TestCategories = $TestCategories
diff --git a/eng/dockerfile-templates/reverse-proxy/Dockerfile.envs b/eng/dockerfile-templates/yarp/Dockerfile.envs
similarity index 73%
rename from eng/dockerfile-templates/reverse-proxy/Dockerfile.envs
rename to eng/dockerfile-templates/yarp/Dockerfile.envs
index 493604c5f6..d8143b25e5 100644
--- a/eng/dockerfile-templates/reverse-proxy/Dockerfile.envs
+++ b/eng/dockerfile-templates/yarp/Dockerfile.envs
@@ -1,5 +1,5 @@
 ENV \
     # Unset ASPNETCORE_HTTP_PORTS from base image
     ASPNETCORE_HTTP_PORTS= \
-    # reverse-proxy environment variables
+    # yarp environment variables
     ASPNETCORE_URLS=http://+:5000
\ No newline at end of file
diff --git a/eng/dockerfile-templates/reverse-proxy/Dockerfile.linux b/eng/dockerfile-templates/yarp/Dockerfile.linux
similarity index 74%
rename from eng/dockerfile-templates/reverse-proxy/Dockerfile.linux
rename to eng/dockerfile-templates/yarp/Dockerfile.linux
index bb62823532..2c3191beda 100644
--- a/eng/dockerfile-templates/reverse-proxy/Dockerfile.linux
+++ b/eng/dockerfile-templates/yarp/Dockerfile.linux
@@ -1,7 +1,7 @@
 {{
     set yarpMajor to split(PRODUCT_VERSION, ".")[0] ^
     set yarpMajorMinor to cat(yarpMajor, ".0") ^
-    set dotnetMajorMinor to VARIABLES[cat("reverse-proxy|", yarpMajorMinor, "|dotnet-version")] ^
+    set dotnetMajorMinor to VARIABLES[cat("yarp|", yarpMajorMinor, "|dotnet-version")] ^
     set aspnetBaseTag to
         cat("$REPO:", VARIABLES[cat("dotnet|9.0|fixed-tag")], "-", OS_VERSION, ARCH_TAG_SUFFIX) ^
     set installerImageTag to cat("mcr.microsoft.com/azurelinux", "/base/core:", OS_VERSION_NUMBER)
@@ -13,7 +13,7 @@ FROM {{installerImageTag}} AS installer
 {{InsertTemplate("../Dockerfile.linux.distroless-azurelinux-installer-prereqs", [ "is-zip": "true" ])}}
 
 # Retrieve YARP
-{{InsertTemplate("Dockerfile.linux.install-reverse-proxy")}}
+{{InsertTemplate("Dockerfile.linux.install-yarp")}}
 
 
 # YARP image
@@ -23,4 +23,4 @@ COPY --from=installer ["/app", "/app"]
 
 {{InsertTemplate("Dockerfile.envs")}}
 
-ENTRYPOINT [ "dotnet", "/app/yarp.dll", "/etc/reverse-proxy.config" ]
+ENTRYPOINT [ "dotnet", "/app/yarp.dll", "/etc/yarp.config" ]
diff --git a/eng/dockerfile-templates/reverse-proxy/Dockerfile.linux.install-reverse-proxy b/eng/dockerfile-templates/yarp/Dockerfile.linux.install-yarp
similarity index 60%
rename from eng/dockerfile-templates/reverse-proxy/Dockerfile.linux.install-reverse-proxy
rename to eng/dockerfile-templates/yarp/Dockerfile.linux.install-yarp
index db75d2186d..c476eff4d3 100644
--- a/eng/dockerfile-templates/reverse-proxy/Dockerfile.linux.install-reverse-proxy
+++ b/eng/dockerfile-templates/yarp/Dockerfile.linux.install-yarp
@@ -1,15 +1,15 @@
 {{
     set yarpMajorMinor to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^
-    set buildVersion to VARIABLES[cat("reverse-proxy|", yarpMajorMinor, "|build-version")] ^
+    set buildVersion to VARIABLES[cat("yarp|", yarpMajorMinor, "|build-version")] ^
     set yarpVersionVariable to when(find(buildVersion, '-rtm') >= 0 || find(buildVersion, '-servicing') >= 0, "product-version", "build-version") ^
-    set yarpVersion to VARIABLES[cat("reverse-proxy|", yarpMajorMinor, "|", yarpVersionVariable)] ^
+    set yarpVersion to VARIABLES[cat("yarp|", yarpMajorMinor, "|", yarpVersionVariable)] ^
     set versionFolder to when(buildVersion != yarpVersion, buildVersion, '$yarp_version') ^
-    set yarpBaseUrl to cat(VARIABLES[cat("reverse-proxy|", yarpMajorMinor, "|base-url|", VARIABLES["branch"])], "/reverse-proxy/", versionFolder, "/") ^
+    set yarpBaseUrl to cat(VARIABLES[cat("yarp|", yarpMajorMinor, "|base-url|", VARIABLES["branch"])], "/reverse-proxy/", versionFolder, "/") ^
     set files to [
         [
-            "filename": "reverse-proxy.zip",
+            "filename": "yarp.zip",
             "url": cat(yarpBaseUrl, "reverse-proxy-linux-", ARCH_SHORT, ".zip"),
-            "sha": VARIABLES[join(["reverse-proxy", yarpMajorMinor, "linux", ARCH_SHORT, "sha"], "|")],
+            "sha": VARIABLES[join(["yarp", yarpMajorMinor, "linux", ARCH_SHORT, "sha"], "|")],
             "sha-var-name": "yarp_sha512"
         ]
     ]
diff --git a/eng/mcr-tags-metadata-templates/reverse-proxy-tags.yml b/eng/mcr-tags-metadata-templates/yarp-tags.yml
similarity index 50%
rename from eng/mcr-tags-metadata-templates/reverse-proxy-tags.yml
rename to eng/mcr-tags-metadata-templates/yarp-tags.yml
index 0bfb29ac8e..96136f63a0 100644
--- a/eng/mcr-tags-metadata-templates/reverse-proxy-tags.yml
+++ b/eng/mcr-tags-metadata-templates/yarp-tags.yml
@@ -1,2 +1,2 @@
-$(McrTagsYmlRepo:reverse-proxy)
+$(McrTagsYmlRepo:yarp)
 $(McrTagsYmlTagGroup:2.3-preview)
\ No newline at end of file
diff --git a/eng/readme-templates/About.reverse-proxy.md b/eng/readme-templates/About.yarp.md
similarity index 100%
rename from eng/readme-templates/About.reverse-proxy.md
rename to eng/readme-templates/About.yarp.md
diff --git a/eng/readme-templates/DefaultLayout.md b/eng/readme-templates/DefaultLayout.md
index f3676c0659..0c40b0af17 100644
--- a/eng/readme-templates/DefaultLayout.md
+++ b/eng/readme-templates/DefaultLayout.md
@@ -18,7 +18,7 @@ if !IS_PRODUCT_FAMILY:{{InsertTemplate("FeaturedTags.md", commonArgs)}}
 }}
 {{InsertTemplate("About.md", commonArgs)}}
 
-{{InsertTemplate("Use.md", commonArgs)}}{{if (find(REPO, "monitor") < 0 && find(REPO, "aspire") < 0 && find(REPO, "reverse-proxy") < 0):
+{{InsertTemplate("Use.md", commonArgs)}}{{if (find(REPO, "monitor") < 0 && find(REPO, "aspire") < 0 && find(REPO, "yarp") < 0):
 
 {{InsertTemplate("About.variants.md", commonArgs)}}}}
 
diff --git a/eng/readme-templates/FeaturedTags.md b/eng/readme-templates/FeaturedTags.md
index cf12d9046a..53514d20ae 100644
--- a/eng/readme-templates/FeaturedTags.md
+++ b/eng/readme-templates/FeaturedTags.md
@@ -20,7 +20,7 @@ elif match(REPO, "monitor/base"):* `9` (Standard Support)
   * `docker pull {{FULL_REPO}}:8`^
 elif match(REPO, "aspire-dashboard"):* `9.0`
   * `docker pull {{FULL_REPO}}:9.0`^
-elif match(REPO, "reverse-proxy"):* `2.3-preview`
+elif match(REPO, "yarp"):* `2.3-preview`
   * `docker pull {{FULL_REPO}}:2.3-preview`^
 else:* `9.0` (Standard Support)
   * `docker pull {{FULL_REPO}}:9.0`
diff --git a/eng/readme-templates/Get-GeneratedReadmes.ps1 b/eng/readme-templates/Get-GeneratedReadmes.ps1
index 06c50a3df1..b0d3c53f70 100644
--- a/eng/readme-templates/Get-GeneratedReadmes.ps1
+++ b/eng/readme-templates/Get-GeneratedReadmes.ps1
@@ -27,7 +27,7 @@ $onDockerfilesGenerated = {
         CopyReadme $ContainerName "README.md"
         CopyReadme $ContainerName "README.monitor.md"
         CopyReadme $ContainerName "README.monitor-base.md"
-        CopyReadme $ContainerName "README.reverse-proxy.md"
+        CopyReadme $ContainerName "README.yarp.md"
         CopyReadme $ContainerName "README.runtime-deps.md"
         CopyReadme $ContainerName "README.runtime.md"
         CopyReadme $ContainerName "README.samples.md"
@@ -37,7 +37,7 @@ $onDockerfilesGenerated = {
         CopyReadme $ContainerName ".portal-docs/docker-hub/README.aspnet.md"
         CopyReadme $ContainerName ".portal-docs/docker-hub/README.monitor.md"
         CopyReadme $ContainerName ".portal-docs/docker-hub/README.monitor-base.md"
-        CopyReadme $ContainerName ".portal-docs/docker-hub/README.reverse-proxy.md"
+        CopyReadme $ContainerName ".portal-docs/docker-hub/README.yarp.md"
         CopyReadme $ContainerName ".portal-docs/docker-hub/README.runtime-deps.md"
         CopyReadme $ContainerName ".portal-docs/docker-hub/README.runtime.md"
         CopyReadme $ContainerName ".portal-docs/docker-hub/README.samples.md"
@@ -47,7 +47,7 @@ $onDockerfilesGenerated = {
         CopyReadme $ContainerName ".portal-docs/mar/README.aspnet.portal.md"
         CopyReadme $ContainerName ".portal-docs/mar/README.monitor.portal.md"
         CopyReadme $ContainerName ".portal-docs/mar/README.monitor-base.portal.md"
-        CopyReadme $ContainerName ".portal-docs/mar/README.reverse-proxy.portal.md"
+        CopyReadme $ContainerName ".portal-docs/mar/README.yarp.portal.md"
         CopyReadme $ContainerName ".portal-docs/mar/README.runtime-deps.portal.md"
         CopyReadme $ContainerName ".portal-docs/mar/README.runtime.portal.md"
         CopyReadme $ContainerName ".portal-docs/mar/README.samples.portal.md"
diff --git a/eng/readme-templates/README.mcr.md b/eng/readme-templates/README.mcr.md
index 58e00567a2..f3d8006bb5 100644
--- a/eng/readme-templates/README.mcr.md
+++ b/eng/readme-templates/README.mcr.md
@@ -6,7 +6,7 @@
 
 {{InsertTemplate("ReposProvider.md", union([ "template": "RelatedRepos.md" ], commonArgs))}}
 
-{{InsertTemplate("Use.md", commonArgs)}}{{if (find(REPO, "monitor") < 0 && find(REPO, "aspire") < 0 && find(REPO, "reverse-proxy") < 0):
+{{InsertTemplate("Use.md", commonArgs)}}{{if (find(REPO, "monitor") < 0 && find(REPO, "aspire") < 0 && find(REPO, "yarp") < 0):
 
 {{InsertTemplate("About.variants.md", commonArgs)}}}}
 
diff --git a/eng/readme-templates/ReposProvider.md b/eng/readme-templates/ReposProvider.md
index a83b7a61e8..aaf6147f38 100644
--- a/eng/readme-templates/ReposProvider.md
+++ b/eng/readme-templates/ReposProvider.md
@@ -17,7 +17,7 @@
         ["dotnet/aspire-dashboard", ".NET Aspire Dashboard"]
     ] ^
     set nightlyOnlyRepos to [
-        ["dotnet/reverse-proxy", ".NET Reverse Proxy (YARP)"]
+        ["dotnet/yarp", "YARP (Yet Another Reverse Proxy)"]
     ] ^
     set productFamilyRepos to [
         ["dotnet", ".NET", 1]
diff --git a/eng/readme-templates/Support.md b/eng/readme-templates/Support.md
index e248147345..5315bd4ef1 100644
--- a/eng/readme-templates/Support.md
+++ b/eng/readme-templates/Support.md
@@ -6,7 +6,7 @@
     set isSamples to match(SHORT_REPO, "samples") ^
     set isMonitor to match(SHORT_REPO, "monitor") || match(SHORT_REPO, "base") ^
     set isAspireDashboard to match(SHORT_REPO, "aspire-dashboard") ^
-    set isReverseProxy to match(SHORT_REPO, "reverse-proxy")
+    set isReverseProxy to match(SHORT_REPO, "yarp")
 
 }}{{ARGS["top-header"]}} Support
 
@@ -14,7 +14,7 @@
 
 }}{{ARGS["top-header"]}}# Lifecycle
 
-{{if isReverseProxy:* [Microsoft Support for YARP](https://github.com/microsoft/reverse-proxy/blob/main/docs/roadmap.md)
+{{if isReverseProxy:* [Microsoft Support for YARP](https://github.com/dotnet/yarp/blob/main/docs/roadmap.md)
 }}* [Microsoft Support for .NET](https://github.com/dotnet/core/blob/main/support.md)
 * [Supported Container Platforms Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-platforms.md)
 * [Supported Tags Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-tags.md)
diff --git a/eng/readme-templates/Use.reverse-proxy.md b/eng/readme-templates/Use.yarp.md
similarity index 67%
rename from eng/readme-templates/Use.reverse-proxy.md
rename to eng/readme-templates/Use.yarp.md
index 1c1323c621..de72f8ea77 100644
--- a/eng/readme-templates/Use.reverse-proxy.md
+++ b/eng/readme-templates/Use.yarp.md
@@ -4,7 +4,7 @@
       readme-host: Moniker of the site that will host the readme
 }}You can run this image to launch a YARP instance.
 
-YARP expects the config file to be in `/etc/reverse-proxy.config`, and listens by default on port 5000.
+YARP expects the config file to be in `/etc/yarp.config`, and listens by default on port 5000.
 
 Example of configuration:
 
@@ -47,11 +47,11 @@ It can then be used with the following command (where `my-config.config` is a fi
 
 ```bash
 docker run --rm --name myaspnetapp -d -t  mcr.microsoft.com/dotnet/samples:aspnetapp 
-docker run --rm -v $(pwd)/my-config.config:/etc/reverse-proxy.config -p 5000:5000 --link myaspnetapp:aspnetapp1 mcr.microsoft.com/dotnet/reverse-proxy:latest
+docker run --rm -v $(pwd)/my-config.config:/etc/yarp.config -p 5000:5000 --link myaspnetapp:aspnetapp1 mcr.microsoft.com/dotnet/yarp:latest
 ```
 
 This example will proxy every requests from `http://localhost:5000/aspnetapp` to the `mcr.microsoft.com/dotnet/samples:aspnetapp` container deployed.
 
-The [YARP GitHub repository](https://github.com/microsoft/reverse-proxy/tree/main/samples/) contains more configuration samples.
+The [YARP GitHub repository](https://github.com/dotnet/yarp/tree/main/samples/) contains more configuration samples.
 
-For more details, see the [documentation](https://microsoft.github.io/reverse-proxy/articles/index.html) for how to configure the image and documentation for the reverse proxy configuration.
\ No newline at end of file
+For more details, see the [documentation](https://aka.ms/YarpDocumentation) for how to configure the image and documentation for the reverse proxy configuration.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 48a8ad0147..8b6b093dc6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -10482,30 +10482,30 @@
       ]
     },
     {
-      "id": "reverse-proxy",
-      "name": "dotnet/nightly/reverse-proxy",
+      "id": "yarp",
+      "name": "dotnet/nightly/yarp",
       "readmes": [
         {
-          "path": "README.reverse-proxy.md",
+          "path": "README.yarp.md",
           "templatePath": "eng/readme-templates/README.github.md"
         },
         {
-          "path": ".portal-docs/docker-hub/README.reverse-proxy.md",
+          "path": ".portal-docs/docker-hub/README.yarp.md",
           "templatePath": "eng/readme-templates/README.dockerhub.md"
         },
         {
-          "path": ".portal-docs/mar/README.reverse-proxy.portal.md",
+          "path": ".portal-docs/mar/README.yarp.portal.md",
           "templatePath": "eng/readme-templates/README.mcr.md"
         }
       ],
-      "mcrTagsMetadataTemplate": "eng/mcr-tags-metadata-templates/reverse-proxy-tags.yml",
+      "mcrTagsMetadataTemplate": "eng/mcr-tags-metadata-templates/yarp-tags.yml",
       "images": [
         {
-          "productVersion": "$(reverse-proxy|2.3|product-version)",
+          "productVersion": "$(yarp|2.3|product-version)",
           "sharedTags": {
-            "$(reverse-proxy|2.3|fixed-tag)": {},
-            "$(reverse-proxy|2.3|minor-tag)": {},
-            "$(reverse-proxy|2|major-tag)": {},
+            "$(yarp|2.3|fixed-tag)": {},
+            "$(yarp|2.3|minor-tag)": {},
+            "$(yarp|2|major-tag)": {},
             "latest": {}
           },
           "platforms": [
@@ -10513,18 +10513,18 @@
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/reverse-proxy/2.3/azurelinux-distroless/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/reverse-proxy/Dockerfile.linux",
+              "dockerfile": "src/yarp/2.3/azurelinux-distroless/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/yarp/Dockerfile.linux",
               "os": "linux",
               "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(reverse-proxy|2.3|fixed-tag)-amd64": {
+                "$(yarp|2.3|fixed-tag)-amd64": {
                   "docType": "Undocumented"
                 },
-                "$(reverse-proxy|2.3|minor-tag)-amd64": {
+                "$(yarp|2.3|minor-tag)-amd64": {
                   "docType": "Undocumented"
                 },
-                "$(reverse-proxy|2|major-tag)-amd64": {
+                "$(yarp|2|major-tag)-amd64": {
                   "docType": "Undocumented"
                 }
               }
@@ -10534,18 +10534,18 @@
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/reverse-proxy/2.3/azurelinux-distroless/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/reverse-proxy/Dockerfile.linux",
+              "dockerfile": "src/yarp/2.3/azurelinux-distroless/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/yarp/Dockerfile.linux",
               "os": "linux",
               "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(reverse-proxy|2.3|fixed-tag)-arm64v8": {
+                "$(yarp|2.3|fixed-tag)-arm64v8": {
                   "docType": "Undocumented"
                 },
-                "$(reverse-proxy|2.3|minor-tag)-arm64v8": {
+                "$(yarp|2.3|minor-tag)-arm64v8": {
                   "docType": "Undocumented"
                 },
-                "$(reverse-proxy|2|major-tag)-arm64v8": {
+                "$(yarp|2|major-tag)-arm64v8": {
                   "docType": "Undocumented"
                 }
               },
diff --git a/manifest.versions.json b/manifest.versions.json
index a9e013e137..007d988fdf 100644
--- a/manifest.versions.json
+++ b/manifest.versions.json
@@ -199,16 +199,16 @@
     "powershell|10.0|Linux|x64|sha": "$(powershell|9.0|Linux|x64|sha)",
     "powershell|10.0|Windows|x64|sha": "$(powershell|9.0|Windows|x64|sha)",
 
-    "reverse-proxy|2.3|build-version": "2.3.0-preview.1.25060.1",
-    "reverse-proxy|2.3|product-version": "2.3.0-preview.1",
-    "reverse-proxy|2.3|fixed-tag": "$(reverse-proxy|2.3|product-version)",
-    "reverse-proxy|2.3|minor-tag": "2.3-preview",
-    "reverse-proxy|2|major-tag": "2-preview",
-    "reverse-proxy|2.3|linux|x64|sha": "24bc79fb64105f7a910e3deb176abdd55ffda05e4885d66309d62912159cd153c5d140b5bfb05d84141282fd13e7f6559402c8c3046b3c6c4f2039b52ee1aa7b",
-    "reverse-proxy|2.3|linux|arm64|sha": "5ade6d5e05328328f50137d5c796e45ff7018ec60b783ddf03ae5ff0fa7577bfd9458201ce22eb01709d2ff98e35bbf522e3075487e4ec859844ae10880079a2",
-    "reverse-proxy|2.3|base-url|main": "$(base-url|public|preview|nightly)",
-    "reverse-proxy|2.3|base-url|nightly": "$(base-url|public|preview|nightly)",
-    "reverse-proxy|2.3|dotnet-version": "9.0",
+    "yarp|2.3|build-version": "2.3.0-preview.1.25060.1",
+    "yarp|2.3|product-version": "2.3.0-preview.1",
+    "yarp|2.3|fixed-tag": "$(yarp|2.3|product-version)",
+    "yarp|2.3|minor-tag": "2.3-preview",
+    "yarp|2|major-tag": "2-preview",
+    "yarp|2.3|linux|x64|sha": "24bc79fb64105f7a910e3deb176abdd55ffda05e4885d66309d62912159cd153c5d140b5bfb05d84141282fd13e7f6559402c8c3046b3c6c4f2039b52ee1aa7b",
+    "yarp|2.3|linux|arm64|sha": "5ade6d5e05328328f50137d5c796e45ff7018ec60b783ddf03ae5ff0fa7577bfd9458201ce22eb01709d2ff98e35bbf522e3075487e4ec859844ae10880079a2",
+    "yarp|2.3|base-url|main": "$(base-url|public|preview|nightly)",
+    "yarp|2.3|base-url|nightly": "$(base-url|public|preview|nightly)",
+    "yarp|2.3|dotnet-version": "9.0",
 
     "rocks-toolbox|latest|url": "https://raw.githubusercontent.com/canonical/rocks-toolbox",
     "rocks-toolbox|8.0|url": "$(rocks-toolbox|latest|url)",
diff --git a/src/reverse-proxy/2.3/azurelinux-distroless/amd64/Dockerfile b/src/yarp/2.3/azurelinux-distroless/amd64/Dockerfile
similarity index 64%
rename from src/reverse-proxy/2.3/azurelinux-distroless/amd64/Dockerfile
rename to src/yarp/2.3/azurelinux-distroless/amd64/Dockerfile
index ffa3eeb576..f97356e84c 100644
--- a/src/reverse-proxy/2.3/azurelinux-distroless/amd64/Dockerfile
+++ b/src/yarp/2.3/azurelinux-distroless/amd64/Dockerfile
@@ -10,12 +10,12 @@ RUN tdnf install -y \
 
 # Retrieve YARP
 RUN yarp_version=2.3.0-preview.1.25060.1 \
-    && curl -fSL --output reverse-proxy.zip https://ci.dot.net/public/reverse-proxy/$yarp_version/reverse-proxy-linux-x64.zip \
+    && curl -fSL --output yarp.zip https://ci.dot.net/public/reverse-proxy/$yarp_version/reverse-proxy-linux-x64.zip \
     && yarp_sha512='24bc79fb64105f7a910e3deb176abdd55ffda05e4885d66309d62912159cd153c5d140b5bfb05d84141282fd13e7f6559402c8c3046b3c6c4f2039b52ee1aa7b' \
-    && echo "$yarp_sha512  reverse-proxy.zip" | sha512sum -c - \
+    && echo "$yarp_sha512  yarp.zip" | sha512sum -c - \
     && mkdir -p /app \
-    && unzip reverse-proxy.zip -d /app \
-    && rm reverse-proxy.zip
+    && unzip yarp.zip -d /app \
+    && rm yarp.zip
 
 
 # YARP image
@@ -26,7 +26,7 @@ COPY --from=installer ["/app", "/app"]
 ENV \
     # Unset ASPNETCORE_HTTP_PORTS from base image
     ASPNETCORE_HTTP_PORTS= \
-    # reverse-proxy environment variables
+    # yarp environment variables
     ASPNETCORE_URLS=http://+:5000
 
-ENTRYPOINT [ "dotnet", "/app/yarp.dll", "/etc/reverse-proxy.config" ]
+ENTRYPOINT [ "dotnet", "/app/yarp.dll", "/etc/yarp.config" ]
diff --git a/src/reverse-proxy/2.3/azurelinux-distroless/arm64v8/Dockerfile b/src/yarp/2.3/azurelinux-distroless/arm64v8/Dockerfile
similarity index 64%
rename from src/reverse-proxy/2.3/azurelinux-distroless/arm64v8/Dockerfile
rename to src/yarp/2.3/azurelinux-distroless/arm64v8/Dockerfile
index 0bb4c9a2e8..4a88d9b995 100644
--- a/src/reverse-proxy/2.3/azurelinux-distroless/arm64v8/Dockerfile
+++ b/src/yarp/2.3/azurelinux-distroless/arm64v8/Dockerfile
@@ -10,12 +10,12 @@ RUN tdnf install -y \
 
 # Retrieve YARP
 RUN yarp_version=2.3.0-preview.1.25060.1 \
-    && curl -fSL --output reverse-proxy.zip https://ci.dot.net/public/reverse-proxy/$yarp_version/reverse-proxy-linux-arm64.zip \
+    && curl -fSL --output yarp.zip https://ci.dot.net/public/reverse-proxy/$yarp_version/reverse-proxy-linux-arm64.zip \
     && yarp_sha512='5ade6d5e05328328f50137d5c796e45ff7018ec60b783ddf03ae5ff0fa7577bfd9458201ce22eb01709d2ff98e35bbf522e3075487e4ec859844ae10880079a2' \
-    && echo "$yarp_sha512  reverse-proxy.zip" | sha512sum -c - \
+    && echo "$yarp_sha512  yarp.zip" | sha512sum -c - \
     && mkdir -p /app \
-    && unzip reverse-proxy.zip -d /app \
-    && rm reverse-proxy.zip
+    && unzip yarp.zip -d /app \
+    && rm yarp.zip
 
 
 # YARP image
@@ -26,7 +26,7 @@ COPY --from=installer ["/app", "/app"]
 ENV \
     # Unset ASPNETCORE_HTTP_PORTS from base image
     ASPNETCORE_HTTP_PORTS= \
-    # reverse-proxy environment variables
+    # yarp environment variables
     ASPNETCORE_URLS=http://+:5000
 
-ENTRYPOINT [ "dotnet", "/app/yarp.dll", "/etc/reverse-proxy.config" ]
+ENTRYPOINT [ "dotnet", "/app/yarp.dll", "/etc/yarp.config" ]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/reverse-proxy-2.3-azurelinux-distroless-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/yarp-2.3-azurelinux-distroless-amd64-Dockerfile.approved.txt
similarity index 56%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/reverse-proxy-2.3-azurelinux-distroless-amd64-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/yarp-2.3-azurelinux-distroless-amd64-Dockerfile.approved.txt
index 823943c574..ce732b6cc6 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/reverse-proxy-2.3-azurelinux-distroless-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/yarp-2.3-azurelinux-distroless-amd64-Dockerfile.approved.txt
@@ -10,12 +10,12 @@ RUN tdnf install -y \
 
 # Retrieve YARP
 RUN yarp_version=0.0.0 \
-    && curl -u :$ACCESSTOKEN --basic -fSL --output reverse-proxy.zip "https://artifacts.visualstudio.com/reverse-proxy/$yarp_version/reverse-proxy-linux-x64.zip" \
+    && curl -u :$ACCESSTOKEN --basic -fSL --output yarp.zip "https://artifacts.visualstudio.com/reverse-proxy/$yarp_version/reverse-proxy-linux-x64.zip" \
     && yarp_sha512='{sha512_placeholder}' \
-    && echo "$yarp_sha512  reverse-proxy.zip" | sha512sum -c - \
+    && echo "$yarp_sha512  yarp.zip" | sha512sum -c - \
     && mkdir -p /app \
-    && unzip reverse-proxy.zip -d /app \
-    && rm reverse-proxy.zip
+    && unzip yarp.zip -d /app \
+    && rm yarp.zip
 
 
 # YARP image
@@ -26,7 +26,7 @@ COPY --from=installer ["/app", "/app"]
 ENV \
     # Unset ASPNETCORE_HTTP_PORTS from base image
     ASPNETCORE_HTTP_PORTS= \
-    # reverse-proxy environment variables
+    # yarp environment variables
     ASPNETCORE_URLS=http://+:5000
 
-ENTRYPOINT [ "dotnet", "/app/yarp.dll", "/etc/reverse-proxy.config" ]
+ENTRYPOINT [ "dotnet", "/app/yarp.dll", "/etc/yarp.config" ]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/reverse-proxy-2.3-azurelinux-distroless-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/yarp-2.3-azurelinux-distroless-arm64v8-Dockerfile.approved.txt
similarity index 56%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/reverse-proxy-2.3-azurelinux-distroless-arm64v8-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/yarp-2.3-azurelinux-distroless-arm64v8-Dockerfile.approved.txt
index 2e06ecb250..7a6b56cc00 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/reverse-proxy-2.3-azurelinux-distroless-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/yarp-2.3-azurelinux-distroless-arm64v8-Dockerfile.approved.txt
@@ -10,12 +10,12 @@ RUN tdnf install -y \
 
 # Retrieve YARP
 RUN yarp_version=0.0.0 \
-    && curl -u :$ACCESSTOKEN --basic -fSL --output reverse-proxy.zip "https://artifacts.visualstudio.com/reverse-proxy/$yarp_version/reverse-proxy-linux-arm64.zip" \
+    && curl -u :$ACCESSTOKEN --basic -fSL --output yarp.zip "https://artifacts.visualstudio.com/reverse-proxy/$yarp_version/reverse-proxy-linux-arm64.zip" \
     && yarp_sha512='{sha512_placeholder}' \
-    && echo "$yarp_sha512  reverse-proxy.zip" | sha512sum -c - \
+    && echo "$yarp_sha512  yarp.zip" | sha512sum -c - \
     && mkdir -p /app \
-    && unzip reverse-proxy.zip -d /app \
-    && rm reverse-proxy.zip
+    && unzip yarp.zip -d /app \
+    && rm yarp.zip
 
 
 # YARP image
@@ -26,7 +26,7 @@ COPY --from=installer ["/app", "/app"]
 ENV \
     # Unset ASPNETCORE_HTTP_PORTS from base image
     ASPNETCORE_HTTP_PORTS= \
-    # reverse-proxy environment variables
+    # yarp environment variables
     ASPNETCORE_URLS=http://+:5000
 
-ENTRYPOINT [ "dotnet", "/app/yarp.dll", "/etc/reverse-proxy.config" ]
+ENTRYPOINT [ "dotnet", "/app/yarp.dll", "/etc/yarp.config" ]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/DotNetImageRepo.cs b/tests/Microsoft.DotNet.Docker.Tests/DotNetImageRepo.cs
index c9f0607766..d2ebb6cce6 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/DotNetImageRepo.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/DotNetImageRepo.cs
@@ -15,5 +15,5 @@ public enum DotNetImageRepo
     Aspnet           = 1 << 3,
     Monitor          = 1 << 4,
     Aspire_Dashboard = 1 << 5,
-    Reverse_Proxy    = 1 << 6,
+    Yarp             = 1 << 6,
 }
diff --git a/tests/Microsoft.DotNet.Docker.Tests/ProductImageData.cs b/tests/Microsoft.DotNet.Docker.Tests/ProductImageData.cs
index 6dd1cc3a71..08dbb5cbe3 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/ProductImageData.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/ProductImageData.cs
@@ -189,7 +189,7 @@ private string GetTagName(DotNetImageRepo imageRepo)
                 case DotNetImageRepo.Runtime_Deps:
                 case DotNetImageRepo.Monitor:
                 case DotNetImageRepo.Aspire_Dashboard:
-                case DotNetImageRepo.Reverse_Proxy:
+                case DotNetImageRepo.Yarp:
                     imageVersion = Version;
                     os = OSTag;
                     break;
diff --git a/tests/Microsoft.DotNet.Docker.Tests/ReverseProxyImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/ReverseProxyImageTests.cs
index 5fb24b5f0c..14fdd5d655 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/ReverseProxyImageTests.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/ReverseProxyImageTests.cs
@@ -11,25 +11,25 @@
 
 namespace Microsoft.DotNet.Docker.Tests;
 
-[Trait("Category", "reverse-proxy")]
-public class ReverseProxyImageTests(ITestOutputHelper outputHelper) : CommonRuntimeImageTests(outputHelper)
+[Trait("Category", "yarp")]
+public class YarpImageTests(ITestOutputHelper outputHelper) : CommonRuntimeImageTests(outputHelper)
 {
     private const string AppPath = "/app";
 
     private const int YarpWebPort = 5000;
 
 
-    protected override DotNetImageRepo ImageRepo => DotNetImageRepo.Reverse_Proxy;
+    protected override DotNetImageRepo ImageRepo => DotNetImageRepo.Yarp;
 
     public static IEnumerable<object[]> GetImageData() =>
-        TestData.GetReverseProxyImageData()
+        TestData.GetYarpImageData()
             .Select(imageData => new object[] { imageData });
 
     [DotNetTheory]
     [MemberData(nameof(GetImageData))]
     public async Task VerifyBasicScenario(ProductImageData imageData)
     {
-        ReverseProxyBasicScenario testScenario = new(YarpWebPort, imageData, DockerHelper, OutputHelper);
+        YarpBasicScenario testScenario = new(YarpWebPort, imageData, DockerHelper, OutputHelper);
         await testScenario.ExecuteAsync();
     }
 
diff --git a/tests/Microsoft.DotNet.Docker.Tests/StaticTagTests.cs b/tests/Microsoft.DotNet.Docker.Tests/StaticTagTests.cs
index 896d26286f..f07c5c29c2 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/StaticTagTests.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/StaticTagTests.cs
@@ -36,7 +36,7 @@ public enum VersionType
             "monitor",
             "monitor-base",
             "aspire-dashboard",
-            "reverse-proxy"
+            "yarp"
         ];
 
         private enum TestType
diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs
index 4cea022f9a..65e85197d9 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs
@@ -424,7 +424,7 @@ public static class TestData
             },
         };
 
-        private static readonly ProductImageData[] s_ReverseProxyTestData =
+        private static readonly ProductImageData[] s_YarpTestData =
         [
             new() {
                 Version = new ImageVersion(new Version(2,3), isPreview: true),
@@ -433,7 +433,7 @@ public static class TestData
                 OSTag = "",
                 OSDir = OS.AzureLinux30Distroless,
                 Arch = Arch.Amd64,
-                SupportedImageRepos = DotNetImageRepo.Reverse_Proxy,
+                SupportedImageRepos = DotNetImageRepo.Yarp,
             },
             new() {
                 Version = new ImageVersion(new Version(2,3), isPreview: true),
@@ -442,7 +442,7 @@ public static class TestData
                 OSTag = "",
                 OSDir = OS.AzureLinux30Distroless,
                 Arch = Arch.Arm64,
-                SupportedImageRepos = DotNetImageRepo.Reverse_Proxy
+                SupportedImageRepos = DotNetImageRepo.Yarp
             },
         ];
 
@@ -453,7 +453,7 @@ public static class TestData
             ..s_AspireDashboardTestData,
             ..s_linuxMonitorTestData,
             ..s_windowsMonitorTestData,
-            ..s_ReverseProxyTestData,
+            ..s_YarpTestData,
         ];
 
         public static IEnumerable<ProductImageData> GetImageData(
@@ -503,15 +503,15 @@ public static IEnumerable<ProductImageData> GetMonitorImageData()
                 .Cast<ProductImageData>();
         }
 
-        public static IEnumerable<ProductImageData> GetReverseProxyImageData()
+        public static IEnumerable<ProductImageData> GetYarpImageData()
         {
             if (!DockerHelper.IsLinuxContainerModeEnabled)
             {
                 return [];
             }
 
-            return s_ReverseProxyTestData
-                .FilterImagesByPath(DotNetImageRepo.Reverse_Proxy)
+            return s_YarpTestData
+                .FilterImagesByPath(DotNetImageRepo.Yarp)
                 .FilterImagesByArch()
                 .FilterImagesByOs()
                 .Cast<ProductImageData>();
diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/ReverseProxyBasicScenario.cs b/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/ReverseProxyBasicScenario.cs
index cc42aec522..8ca0e24f20 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/ReverseProxyBasicScenario.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/ReverseProxyBasicScenario.cs
@@ -9,7 +9,7 @@
 
 namespace Microsoft.DotNet.Docker.Tests;
 
-public class ReverseProxyBasicScenario : ITestScenario
+public class YarpBasicScenario : ITestScenario
 {
     private readonly DockerHelper _dockerHelper;
 
@@ -21,7 +21,7 @@ public class ReverseProxyBasicScenario : ITestScenario
 
     private readonly int _webPort;
 
-    public ReverseProxyBasicScenario(
+    public YarpBasicScenario(
         int webPort,
         ProductImageData imageData,
         DockerHelper dockerHelper,
@@ -32,12 +32,12 @@ public ReverseProxyBasicScenario(
         _outputHelper = outputHelper;
         _webPort = webPort;
 
-        _imageTag = _imageData.GetImage(DotNetImageRepo.Reverse_Proxy, _dockerHelper);
+        _imageTag = _imageData.GetImage(DotNetImageRepo.Yarp, _dockerHelper);
     }
 
     public async Task ExecuteAsync()
     {
-        string containerName = _imageData.GetIdentifier(nameof(ReverseProxyBasicScenario));
+        string containerName = _imageData.GetIdentifier(nameof(YarpBasicScenario));
         using TempFileContext configFile = FileHelper.UseTempFile();
         string sampleContainer = $"{containerName}_aspnetapp";
 
@@ -57,7 +57,7 @@ public async Task ExecuteAsync()
                 image: _imageTag,
                 name: containerName,
                 detach: true,
-                optionalRunArgs: $"-p {_webPort} -v {configFile.Path}:/etc/reverse-proxy.config --link {sampleContainer}:aspnetapp1",
+                optionalRunArgs: $"-p {_webPort} -v {configFile.Path}:/etc/yarp.config --link {sampleContainer}:aspnetapp1",
                 skipAutoCleanup: true);
 
             // base uri should return 404
@@ -92,7 +92,7 @@ public async Task ExecuteAsync()
       "Logging": {
         "LogLevel": {
           "Default": "Information",
-          "Microsoft": "Warning",
+          "Microsoft": "Information",
           "Microsoft.Hosting.Lifetime": "Information"
         }
       },
diff --git a/tests/performance/ImageSize.nightly.linux.json b/tests/performance/ImageSize.nightly.linux.json
index 88345d78bc..e0d140b8c5 100644
--- a/tests/performance/ImageSize.nightly.linux.json
+++ b/tests/performance/ImageSize.nightly.linux.json
@@ -435,8 +435,8 @@
     "src/aspire-dashboard/9.0/cbl-mariner-distroless/amd64": 142036038,
     "src/aspire-dashboard/9.0/cbl-mariner-distroless/arm64v8": 148315271
   },
-  "dotnet/nightly/reverse-proxy": {
-    "src/reverse-proxy/2.3/azurelinux-distroless/amd64": 141557760,
-    "src/reverse-proxy/2.3/azurelinux-distroless/arm64v8": 147836993
+  "dotnet/nightly/yarp": {
+    "src/yarp/2.3/azurelinux-distroless/amd64": 141557760,
+    "src/yarp/2.3/azurelinux-distroless/arm64v8": 147836993
   },
 }