From 2e4291d75065e3b91dacac7bdc993dec1a29262c Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Tue, 12 Nov 2024 12:03:21 -0800
Subject: [PATCH] Update monitor urls

---
 manifest.versions.json                                      | 6 +++---
 .../8.0/cbl-mariner-distroless/amd64/Dockerfile             | 2 +-
 .../8.0/cbl-mariner-distroless/arm64v8/Dockerfile           | 2 +-
 src/monitor-base/8.0/ubuntu-chiseled/amd64/Dockerfile       | 2 +-
 src/monitor-base/8.0/ubuntu-chiseled/arm64v8/Dockerfile     | 2 +-
 src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile | 2 +-
 .../9.0/azurelinux-distroless/arm64v8/Dockerfile            | 2 +-
 src/monitor/6.3/alpine/amd64/Dockerfile                     | 2 +-
 src/monitor/6.3/alpine/arm64v8/Dockerfile                   | 2 +-
 src/monitor/6.3/cbl-mariner-distroless/amd64/Dockerfile     | 2 +-
 src/monitor/6.3/cbl-mariner-distroless/arm64v8/Dockerfile   | 2 +-
 src/monitor/6.3/cbl-mariner/amd64/Dockerfile                | 2 +-
 src/monitor/6.3/cbl-mariner/arm64v8/Dockerfile              | 2 +-
 src/monitor/6.3/ubuntu-chiseled/amd64/Dockerfile            | 2 +-
 src/monitor/6.3/ubuntu-chiseled/arm64v8/Dockerfile          | 2 +-
 src/monitor/8.0/cbl-mariner-distroless/amd64/Dockerfile     | 4 ++--
 src/monitor/8.0/cbl-mariner-distroless/arm64v8/Dockerfile   | 4 ++--
 src/monitor/8.0/ubuntu-chiseled/amd64/Dockerfile            | 4 ++--
 src/monitor/8.0/ubuntu-chiseled/arm64v8/Dockerfile          | 4 ++--
 src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile      | 4 ++--
 src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile    | 4 ++--
 21 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/manifest.versions.json b/manifest.versions.json
index b9705ae9e3..a8dc89e9b5 100644
--- a/manifest.versions.json
+++ b/manifest.versions.json
@@ -135,7 +135,7 @@
     "monitor|6.3|linux|x64|sha": "2a559ef8aa6c020f954640bf5ce5e62ffcc5f89978c4959f7e870c145001cac8c15558031b2b005c3696cfe5fc4c4ee88452b058242dfeacebe0bd551dd24d03",
     "monitor|6.3|linux|arm64|sha": "d631036980e191d1036fd0d7dda91dfb1cfeb33506aa822d2939b2f11a3fa1d97f17f562bef335f7f34c3bb41c787371dc81995eb08712ea23a43909c0979b64",
     "monitor|6.3|base-url|main": "$(base-url|public|maintenance|main)",
-    "monitor|6.3|base-url|nightly": "$(base-url|public|preview|nightly)",
+    "monitor|6.3|base-url|nightly": "$(base-url|public|maintenance|nightly)",
 
     "monitor|8.0|build-version": "8.0.6",
     "monitor|8.0|product-version": "8.0.6",
@@ -143,7 +143,7 @@
     "monitor|8.0|minor-tag": "8.0",
     "monitor|8|major-tag": "8",
     "monitor|8.0|base-url|main": "$(base-url|public|maintenance|main)",
-    "monitor|8.0|base-url|nightly": "$(base-url|public|preview|nightly)",
+    "monitor|8.0|base-url|nightly": "$(base-url|public|maintenance|nightly)",
     "monitor-base|8.0|linux|x64|sha": "ca711e794823b1552f4acaaf42a0a2ace6dee59ed113305eaf556c6865a93025fb40bc85fc91e2c0480ec42989a7119a11c46d4dcafda32ee9bb3c3fe31ac5cd",
     "monitor-base|8.0|linux|arm64|sha": "af993ac36e59affcee54c5c8c45fbe26d6989690a2d746d46bfec5919e53a603ea281aa58d0bcfc2f18abf331389f9501f2936ae18f1f8fc2c56fbfac48d2a8e",
     "monitor-ext-azureblobstorage|8.0|linux|x64|sha": "b09e1d17551d72cf2a79e673c5623a043950d578401d5a2a01c4174ea053d14d463d219715653575040802ee281ac9570ecc746da69f838009b4328285840a3e",
@@ -170,7 +170,7 @@
     "monitor|9.0|minor-tag": "9.0",
     "monitor|9|major-tag": "9",
     "monitor|9.0|base-url|main": "$(base-url|public|preview|main)",
-    "monitor|9.0|base-url|nightly": "$(base-url|public|preview|nightly)",
+    "monitor|9.0|base-url|nightly": "$(base-url|public|maintenance|nightly)",
     "monitor-base|9.0|linux|x64|sha": "a47decf8bc8a0ba6794e6b9a4a8914a906c9bab2134a2aaad2950c5b1a2f159e16a2f43788357b4708b18e61920ca5ed379ae90111eca5b29087d9cfa777836f",
     "monitor-base|9.0|linux|arm64|sha": "9b774cfc88b9698d2e9bb40baca152e042818171596682fca4769a074e020dabdc29fd450ad00f0ee5d44126e087db7b36b177b33b44b1aea9b30d08484962bc",
     "monitor-ext-azureblobstorage|9.0|linux|x64|sha": "69f03e44eecab0d3b8360592f6b07cc6c1d5994fea93758f1a78b4490212076a5a2953762b38e7c35f1073e5a172d4db82906edaa4cdbd2f8221e6dd78bcb3f6",
diff --git a/src/monitor-base/8.0/cbl-mariner-distroless/amd64/Dockerfile b/src/monitor-base/8.0/cbl-mariner-distroless/amd64/Dockerfile
index 3c61bd0da6..5ed9cff435 100644
--- a/src/monitor-base/8.0/cbl-mariner-distroless/amd64/Dockerfile
+++ b/src/monitor-base/8.0/cbl-mariner-distroless/amd64/Dockerfile
@@ -11,7 +11,7 @@ RUN tdnf install -y \
 
 # Retrieve .NET Monitor Base
 RUN dotnet_monitor_version=8.0.6 \
-    && curl -fSL --output dotnet-monitor-base.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz \
+    && curl -fSL --output dotnet-monitor-base.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz \
     && dotnet_monitor_base_sha512='ca711e794823b1552f4acaaf42a0a2ace6dee59ed113305eaf556c6865a93025fb40bc85fc91e2c0480ec42989a7119a11c46d4dcafda32ee9bb3c3fe31ac5cd' \
     && echo "$dotnet_monitor_base_sha512  dotnet-monitor-base.tar.gz" | sha512sum -c - \
     && mkdir -p /app \
diff --git a/src/monitor-base/8.0/cbl-mariner-distroless/arm64v8/Dockerfile b/src/monitor-base/8.0/cbl-mariner-distroless/arm64v8/Dockerfile
index e7bbc77909..34957d469b 100644
--- a/src/monitor-base/8.0/cbl-mariner-distroless/arm64v8/Dockerfile
+++ b/src/monitor-base/8.0/cbl-mariner-distroless/arm64v8/Dockerfile
@@ -11,7 +11,7 @@ RUN tdnf install -y \
 
 # Retrieve .NET Monitor Base
 RUN dotnet_monitor_version=8.0.6 \
-    && curl -fSL --output dotnet-monitor-base.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz \
+    && curl -fSL --output dotnet-monitor-base.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz \
     && dotnet_monitor_base_sha512='af993ac36e59affcee54c5c8c45fbe26d6989690a2d746d46bfec5919e53a603ea281aa58d0bcfc2f18abf331389f9501f2936ae18f1f8fc2c56fbfac48d2a8e' \
     && echo "$dotnet_monitor_base_sha512  dotnet-monitor-base.tar.gz" | sha512sum -c - \
     && mkdir -p /app \
diff --git a/src/monitor-base/8.0/ubuntu-chiseled/amd64/Dockerfile b/src/monitor-base/8.0/ubuntu-chiseled/amd64/Dockerfile
index 50e24693c0..7767647d9e 100644
--- a/src/monitor-base/8.0/ubuntu-chiseled/amd64/Dockerfile
+++ b/src/monitor-base/8.0/ubuntu-chiseled/amd64/Dockerfile
@@ -5,7 +5,7 @@ FROM amd64/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Monitor Base
 RUN dotnet_monitor_version=8.0.6 \
-    && curl -fSL --output dotnet-monitor-base.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz \
+    && curl -fSL --output dotnet-monitor-base.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz \
     && dotnet_monitor_base_sha512='ca711e794823b1552f4acaaf42a0a2ace6dee59ed113305eaf556c6865a93025fb40bc85fc91e2c0480ec42989a7119a11c46d4dcafda32ee9bb3c3fe31ac5cd' \
     && echo "$dotnet_monitor_base_sha512  dotnet-monitor-base.tar.gz" | sha512sum -c - \
     && mkdir -p /app \
diff --git a/src/monitor-base/8.0/ubuntu-chiseled/arm64v8/Dockerfile b/src/monitor-base/8.0/ubuntu-chiseled/arm64v8/Dockerfile
index 1c09dfd45f..b8e56fb0b6 100644
--- a/src/monitor-base/8.0/ubuntu-chiseled/arm64v8/Dockerfile
+++ b/src/monitor-base/8.0/ubuntu-chiseled/arm64v8/Dockerfile
@@ -5,7 +5,7 @@ FROM arm64v8/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Monitor Base
 RUN dotnet_monitor_version=8.0.6 \
-    && curl -fSL --output dotnet-monitor-base.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz \
+    && curl -fSL --output dotnet-monitor-base.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz \
     && dotnet_monitor_base_sha512='af993ac36e59affcee54c5c8c45fbe26d6989690a2d746d46bfec5919e53a603ea281aa58d0bcfc2f18abf331389f9501f2936ae18f1f8fc2c56fbfac48d2a8e' \
     && echo "$dotnet_monitor_base_sha512  dotnet-monitor-base.tar.gz" | sha512sum -c - \
     && mkdir -p /app \
diff --git a/src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile b/src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile
index 4d82af3af7..789c8c3670 100644
--- a/src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile
+++ b/src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile
@@ -11,7 +11,7 @@ RUN tdnf install -y \
 
 # Retrieve .NET Monitor Base
 RUN dotnet_monitor_version=9.0.0 \
-    && curl -fSL --output dotnet-monitor-base.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz \
+    && curl -fSL --output dotnet-monitor-base.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz \
     && dotnet_monitor_base_sha512='a47decf8bc8a0ba6794e6b9a4a8914a906c9bab2134a2aaad2950c5b1a2f159e16a2f43788357b4708b18e61920ca5ed379ae90111eca5b29087d9cfa777836f' \
     && echo "$dotnet_monitor_base_sha512  dotnet-monitor-base.tar.gz" | sha512sum -c - \
     && mkdir -p /app \
diff --git a/src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile b/src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile
index a60760ce92..e39f8891c8 100644
--- a/src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile
+++ b/src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile
@@ -11,7 +11,7 @@ RUN tdnf install -y \
 
 # Retrieve .NET Monitor Base
 RUN dotnet_monitor_version=9.0.0 \
-    && curl -fSL --output dotnet-monitor-base.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz \
+    && curl -fSL --output dotnet-monitor-base.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz \
     && dotnet_monitor_base_sha512='9b774cfc88b9698d2e9bb40baca152e042818171596682fca4769a074e020dabdc29fd450ad00f0ee5d44126e087db7b36b177b33b44b1aea9b30d08484962bc' \
     && echo "$dotnet_monitor_base_sha512  dotnet-monitor-base.tar.gz" | sha512sum -c - \
     && mkdir -p /app \
diff --git a/src/monitor/6.3/alpine/amd64/Dockerfile b/src/monitor/6.3/alpine/amd64/Dockerfile
index ab34db544f..aec4094a52 100644
--- a/src/monitor/6.3/alpine/amd64/Dockerfile
+++ b/src/monitor/6.3/alpine/amd64/Dockerfile
@@ -24,7 +24,7 @@ ENV \
 
 # Install .NET Monitor
 RUN dotnet_monitor_version=6.3.10 \
-    && wget -O dotnet-monitor.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-$dotnet_monitor_version-linux-musl-x64.tar.gz \
+    && wget -O dotnet-monitor.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-$dotnet_monitor_version-linux-musl-x64.tar.gz \
     && dotnet_monitor_sha512='c120036fb667b3992921078d9ed6189aee448a56a4aacd093ad744da48f449b6f44f974bb1e5e35dd15427d4332792e22f9954897cb58c0ccee483d3507d9b36' \
     && echo "$dotnet_monitor_sha512  dotnet-monitor.tar.gz" | sha512sum -c - \
     && mkdir -p /app \
diff --git a/src/monitor/6.3/alpine/arm64v8/Dockerfile b/src/monitor/6.3/alpine/arm64v8/Dockerfile
index 214eddd6d4..4d0cd5b87b 100644
--- a/src/monitor/6.3/alpine/arm64v8/Dockerfile
+++ b/src/monitor/6.3/alpine/arm64v8/Dockerfile
@@ -24,7 +24,7 @@ ENV \
 
 # Install .NET Monitor
 RUN dotnet_monitor_version=6.3.10 \
-    && wget -O dotnet-monitor.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-$dotnet_monitor_version-linux-musl-arm64.tar.gz \
+    && wget -O dotnet-monitor.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-$dotnet_monitor_version-linux-musl-arm64.tar.gz \
     && dotnet_monitor_sha512='3ad767b600499241b168dff73e7083d1dc480665df85f872907224116dc261a32da18fdfd6d125e6b0ddc086ed6929f00acf3ea81ecaf8dc72e7161863031867' \
     && echo "$dotnet_monitor_sha512  dotnet-monitor.tar.gz" | sha512sum -c - \
     && mkdir -p /app \
diff --git a/src/monitor/6.3/cbl-mariner-distroless/amd64/Dockerfile b/src/monitor/6.3/cbl-mariner-distroless/amd64/Dockerfile
index 51e6b9ef5f..ec58f3f983 100644
--- a/src/monitor/6.3/cbl-mariner-distroless/amd64/Dockerfile
+++ b/src/monitor/6.3/cbl-mariner-distroless/amd64/Dockerfile
@@ -11,7 +11,7 @@ RUN tdnf install -y \
 
 # Retrieve .NET Monitor
 RUN dotnet_monitor_version=6.3.10 \
-    && curl -fSL --output dotnet-monitor.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-$dotnet_monitor_version-linux-x64.tar.gz \
+    && curl -fSL --output dotnet-monitor.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-$dotnet_monitor_version-linux-x64.tar.gz \
     && dotnet_monitor_sha512='2a559ef8aa6c020f954640bf5ce5e62ffcc5f89978c4959f7e870c145001cac8c15558031b2b005c3696cfe5fc4c4ee88452b058242dfeacebe0bd551dd24d03' \
     && echo "$dotnet_monitor_sha512  dotnet-monitor.tar.gz" | sha512sum -c - \
     && mkdir -p /app \
diff --git a/src/monitor/6.3/cbl-mariner-distroless/arm64v8/Dockerfile b/src/monitor/6.3/cbl-mariner-distroless/arm64v8/Dockerfile
index c491a00c96..5b1d539e4f 100644
--- a/src/monitor/6.3/cbl-mariner-distroless/arm64v8/Dockerfile
+++ b/src/monitor/6.3/cbl-mariner-distroless/arm64v8/Dockerfile
@@ -11,7 +11,7 @@ RUN tdnf install -y \
 
 # Retrieve .NET Monitor
 RUN dotnet_monitor_version=6.3.10 \
-    && curl -fSL --output dotnet-monitor.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-$dotnet_monitor_version-linux-arm64.tar.gz \
+    && curl -fSL --output dotnet-monitor.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-$dotnet_monitor_version-linux-arm64.tar.gz \
     && dotnet_monitor_sha512='d631036980e191d1036fd0d7dda91dfb1cfeb33506aa822d2939b2f11a3fa1d97f17f562bef335f7f34c3bb41c787371dc81995eb08712ea23a43909c0979b64' \
     && echo "$dotnet_monitor_sha512  dotnet-monitor.tar.gz" | sha512sum -c - \
     && mkdir -p /app \
diff --git a/src/monitor/6.3/cbl-mariner/amd64/Dockerfile b/src/monitor/6.3/cbl-mariner/amd64/Dockerfile
index 4d03ec4960..9708a50bf9 100644
--- a/src/monitor/6.3/cbl-mariner/amd64/Dockerfile
+++ b/src/monitor/6.3/cbl-mariner/amd64/Dockerfile
@@ -11,7 +11,7 @@ RUN tdnf install -y \
 
 # Retrieve .NET Monitor
 RUN dotnet_monitor_version=6.3.10 \
-    && curl -fSL --output dotnet-monitor.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-$dotnet_monitor_version-linux-x64.tar.gz \
+    && curl -fSL --output dotnet-monitor.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-$dotnet_monitor_version-linux-x64.tar.gz \
     && dotnet_monitor_sha512='2a559ef8aa6c020f954640bf5ce5e62ffcc5f89978c4959f7e870c145001cac8c15558031b2b005c3696cfe5fc4c4ee88452b058242dfeacebe0bd551dd24d03' \
     && echo "$dotnet_monitor_sha512  dotnet-monitor.tar.gz" | sha512sum -c - \
     && mkdir -p /app \
diff --git a/src/monitor/6.3/cbl-mariner/arm64v8/Dockerfile b/src/monitor/6.3/cbl-mariner/arm64v8/Dockerfile
index 0f6b133ede..263652bd7b 100644
--- a/src/monitor/6.3/cbl-mariner/arm64v8/Dockerfile
+++ b/src/monitor/6.3/cbl-mariner/arm64v8/Dockerfile
@@ -11,7 +11,7 @@ RUN tdnf install -y \
 
 # Retrieve .NET Monitor
 RUN dotnet_monitor_version=6.3.10 \
-    && curl -fSL --output dotnet-monitor.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-$dotnet_monitor_version-linux-arm64.tar.gz \
+    && curl -fSL --output dotnet-monitor.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-$dotnet_monitor_version-linux-arm64.tar.gz \
     && dotnet_monitor_sha512='d631036980e191d1036fd0d7dda91dfb1cfeb33506aa822d2939b2f11a3fa1d97f17f562bef335f7f34c3bb41c787371dc81995eb08712ea23a43909c0979b64' \
     && echo "$dotnet_monitor_sha512  dotnet-monitor.tar.gz" | sha512sum -c - \
     && mkdir -p /app \
diff --git a/src/monitor/6.3/ubuntu-chiseled/amd64/Dockerfile b/src/monitor/6.3/ubuntu-chiseled/amd64/Dockerfile
index e2e3c7aa94..72e2d6d3f1 100644
--- a/src/monitor/6.3/ubuntu-chiseled/amd64/Dockerfile
+++ b/src/monitor/6.3/ubuntu-chiseled/amd64/Dockerfile
@@ -5,7 +5,7 @@ FROM amd64/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Monitor
 RUN dotnet_monitor_version=6.3.10 \
-    && curl -fSL --output dotnet-monitor.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-$dotnet_monitor_version-linux-x64.tar.gz \
+    && curl -fSL --output dotnet-monitor.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-$dotnet_monitor_version-linux-x64.tar.gz \
     && dotnet_monitor_sha512='2a559ef8aa6c020f954640bf5ce5e62ffcc5f89978c4959f7e870c145001cac8c15558031b2b005c3696cfe5fc4c4ee88452b058242dfeacebe0bd551dd24d03' \
     && echo "$dotnet_monitor_sha512  dotnet-monitor.tar.gz" | sha512sum -c - \
     && mkdir -p /app \
diff --git a/src/monitor/6.3/ubuntu-chiseled/arm64v8/Dockerfile b/src/monitor/6.3/ubuntu-chiseled/arm64v8/Dockerfile
index 8eaf33de47..6bd5ec1488 100644
--- a/src/monitor/6.3/ubuntu-chiseled/arm64v8/Dockerfile
+++ b/src/monitor/6.3/ubuntu-chiseled/arm64v8/Dockerfile
@@ -5,7 +5,7 @@ FROM arm64v8/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Monitor
 RUN dotnet_monitor_version=6.3.10 \
-    && curl -fSL --output dotnet-monitor.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-$dotnet_monitor_version-linux-arm64.tar.gz \
+    && curl -fSL --output dotnet-monitor.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-$dotnet_monitor_version-linux-arm64.tar.gz \
     && dotnet_monitor_sha512='d631036980e191d1036fd0d7dda91dfb1cfeb33506aa822d2939b2f11a3fa1d97f17f562bef335f7f34c3bb41c787371dc81995eb08712ea23a43909c0979b64' \
     && echo "$dotnet_monitor_sha512  dotnet-monitor.tar.gz" | sha512sum -c - \
     && mkdir -p /app \
diff --git a/src/monitor/8.0/cbl-mariner-distroless/amd64/Dockerfile b/src/monitor/8.0/cbl-mariner-distroless/amd64/Dockerfile
index d584bcd3a4..1b396d07cd 100644
--- a/src/monitor/8.0/cbl-mariner-distroless/amd64/Dockerfile
+++ b/src/monitor/8.0/cbl-mariner-distroless/amd64/Dockerfile
@@ -11,11 +11,11 @@ RUN tdnf install -y \
 
 # Retrieve .NET Monitor extensions
 RUN dotnet_monitor_extension_version=8.0.6 \
-    && curl -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-x64.tar.gz \
+    && curl -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-x64.tar.gz \
     && dotnet_monitor_extension_sha512='b09e1d17551d72cf2a79e673c5623a043950d578401d5a2a01c4174ea053d14d463d219715653575040802ee281ac9570ecc746da69f838009b4328285840a3e' \
     && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \
     \
-    && curl -fSL --output dotnet-monitor-egress-s3storage.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-x64.tar.gz \
+    && curl -fSL --output dotnet-monitor-egress-s3storage.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-x64.tar.gz \
     && dotnet_monitor_extension_sha512='6b1da4cb485c9ae70e165784175a82c25ecf3e5721d369bb2120dcf6c15566e52f4068a2af511a9d87ec8beb179e9ca90bc3729311fd4c7a112aeb8f83287df7' \
     && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \
     \
diff --git a/src/monitor/8.0/cbl-mariner-distroless/arm64v8/Dockerfile b/src/monitor/8.0/cbl-mariner-distroless/arm64v8/Dockerfile
index bcdeefc988..70cfbd54e2 100644
--- a/src/monitor/8.0/cbl-mariner-distroless/arm64v8/Dockerfile
+++ b/src/monitor/8.0/cbl-mariner-distroless/arm64v8/Dockerfile
@@ -11,11 +11,11 @@ RUN tdnf install -y \
 
 # Retrieve .NET Monitor extensions
 RUN dotnet_monitor_extension_version=8.0.6 \
-    && curl -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \
+    && curl -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \
     && dotnet_monitor_extension_sha512='6dd99144a8e8ecf2865b2b854163fc4fb779c7b877cc57696facbbd96498a121f4bc9b95e31c7694e10956320428893529e149c1fabfc405ed65d5290acb1b7f' \
     && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \
     \
-    && curl -fSL --output dotnet-monitor-egress-s3storage.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \
+    && curl -fSL --output dotnet-monitor-egress-s3storage.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \
     && dotnet_monitor_extension_sha512='cf4eda380ea7734f10f59c76c0424db84d149e904e42a1608817767e725260084cdc21ffcc4be82489343028b669408e2ed04833ce89f100b59e31fa82171e0d' \
     && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \
     \
diff --git a/src/monitor/8.0/ubuntu-chiseled/amd64/Dockerfile b/src/monitor/8.0/ubuntu-chiseled/amd64/Dockerfile
index 8149c5ad7c..18ce100351 100644
--- a/src/monitor/8.0/ubuntu-chiseled/amd64/Dockerfile
+++ b/src/monitor/8.0/ubuntu-chiseled/amd64/Dockerfile
@@ -5,11 +5,11 @@ FROM amd64/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Monitor extensions
 RUN dotnet_monitor_extension_version=8.0.6 \
-    && curl -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-x64.tar.gz \
+    && curl -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-x64.tar.gz \
     && dotnet_monitor_extension_sha512='b09e1d17551d72cf2a79e673c5623a043950d578401d5a2a01c4174ea053d14d463d219715653575040802ee281ac9570ecc746da69f838009b4328285840a3e' \
     && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \
     \
-    && curl -fSL --output dotnet-monitor-egress-s3storage.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-x64.tar.gz \
+    && curl -fSL --output dotnet-monitor-egress-s3storage.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-x64.tar.gz \
     && dotnet_monitor_extension_sha512='6b1da4cb485c9ae70e165784175a82c25ecf3e5721d369bb2120dcf6c15566e52f4068a2af511a9d87ec8beb179e9ca90bc3729311fd4c7a112aeb8f83287df7' \
     && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \
     \
diff --git a/src/monitor/8.0/ubuntu-chiseled/arm64v8/Dockerfile b/src/monitor/8.0/ubuntu-chiseled/arm64v8/Dockerfile
index 0a9e0b170f..e33d480fee 100644
--- a/src/monitor/8.0/ubuntu-chiseled/arm64v8/Dockerfile
+++ b/src/monitor/8.0/ubuntu-chiseled/arm64v8/Dockerfile
@@ -5,11 +5,11 @@ FROM arm64v8/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Monitor extensions
 RUN dotnet_monitor_extension_version=8.0.6 \
-    && curl -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \
+    && curl -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \
     && dotnet_monitor_extension_sha512='6dd99144a8e8ecf2865b2b854163fc4fb779c7b877cc57696facbbd96498a121f4bc9b95e31c7694e10956320428893529e149c1fabfc405ed65d5290acb1b7f' \
     && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \
     \
-    && curl -fSL --output dotnet-monitor-egress-s3storage.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \
+    && curl -fSL --output dotnet-monitor-egress-s3storage.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \
     && dotnet_monitor_extension_sha512='cf4eda380ea7734f10f59c76c0424db84d149e904e42a1608817767e725260084cdc21ffcc4be82489343028b669408e2ed04833ce89f100b59e31fa82171e0d' \
     && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \
     \
diff --git a/src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile b/src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile
index cf61e44e03..3494682205 100644
--- a/src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile
+++ b/src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile
@@ -11,11 +11,11 @@ RUN tdnf install -y \
 
 # Retrieve .NET Monitor extensions
 RUN dotnet_monitor_extension_version=9.0.0 \
-    && curl -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-x64.tar.gz \
+    && curl -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-x64.tar.gz \
     && dotnet_monitor_extension_sha512='69f03e44eecab0d3b8360592f6b07cc6c1d5994fea93758f1a78b4490212076a5a2953762b38e7c35f1073e5a172d4db82906edaa4cdbd2f8221e6dd78bcb3f6' \
     && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \
     \
-    && curl -fSL --output dotnet-monitor-egress-s3storage.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-x64.tar.gz \
+    && curl -fSL --output dotnet-monitor-egress-s3storage.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-x64.tar.gz \
     && dotnet_monitor_extension_sha512='8c0c99e9067ce9dfb56e20d9f37030e33f65b9cd844be548efe52a2ced70924eb2672594c8ba605c473eb1859aa21cfcd96bbdc68e995bd1480fb09a6475c8c4' \
     && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \
     \
diff --git a/src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile b/src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile
index ebdaf56599..549a5a699e 100644
--- a/src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile
+++ b/src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile
@@ -11,11 +11,11 @@ RUN tdnf install -y \
 
 # Retrieve .NET Monitor extensions
 RUN dotnet_monitor_extension_version=9.0.0 \
-    && curl -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \
+    && curl -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \
     && dotnet_monitor_extension_sha512='f147492ca7b1f90b1799d9323d9d9085047da7ab45741bb17e99ee24f875fce896d1df27d0cf59bcb7663f7700b9aef483d32d05b612c310bf12c2142679518d' \
     && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \
     \
-    && curl -fSL --output dotnet-monitor-egress-s3storage.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \
+    && curl -fSL --output dotnet-monitor-egress-s3storage.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \
     && dotnet_monitor_extension_sha512='ea53b341105111705264c00929a0fd53fdb81b35ef83495eb4c07cde85d95351e92bae3d3baf1113b48a21b0d3fa6cdd8bf6554a7e47185415453f70b71427eb' \
     && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \
     \