diff --git a/src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngine.Update.cs b/src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngine.Update.cs
index c7fc3187b3e74..30a498d1aee5b 100644
--- a/src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngine.Update.cs
+++ b/src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngine.Update.cs
@@ -233,7 +233,7 @@ private async Task<TimeSpan> DownloadFullDatabaseAsync(FileInfo databaseFileInfo
 
         private async Task<(bool succeeded, TimeSpan delay)> DownloadFullDatabaseWorkerAsync(FileInfo databaseFileInfo, CancellationToken cancellationToken)
         {
-            // Will hit https://az700632.vo.msecnd.net/pub/RoslynNuGetSearch/Elfie_V1/Latest.xml. Providing this
+            // Will hit https://aka.ms/vssettings/pub/RoslynNuGetSearch/Elfie_V1/Latest.xml. Providing this
             // link in the source to make it easy for maintainers to hit the endpoint to see if it succeeds and that
             // the data and http headers are what are expected.
             var serverPath = Invariant($"Elfie_V{AddReferenceDatabaseTextFileFormatVersion}/Latest.xml");
@@ -373,7 +373,7 @@ private async Task<TimeSpan> PatchLocalDatabaseAsync(FileInfo databaseFileInfo,
 
             // Now attempt to download and apply patch file.
             //
-            // Will hit https://az700632.vo.msecnd.net/pub/RoslynNuGetSearch/Elfie_V1/{db_version}_Patch.xml.
+            // Will hit https://aka.ms/vssettings/pub/RoslynNuGetSearch/Elfie_V1/{db_version}_Patch.xml.
             // Providing this link in the source to make it easy for maintainers to hit the endpoint to see if it
             // succeeds and that the data and http headers are what are expected.
             var serverPath = Invariant($"Elfie_V{AddReferenceDatabaseTextFileFormatVersion}/{database.DatabaseVersion}_Patch.xml");
diff --git a/src/VisualStudio/Core/Def/Storage/FileDownloader.cs b/src/VisualStudio/Core/Def/Storage/FileDownloader.cs
index df617134e9442..5688f09332169 100644
--- a/src/VisualStudio/Core/Def/Storage/FileDownloader.cs
+++ b/src/VisualStudio/Core/Def/Storage/FileDownloader.cs
@@ -19,7 +19,7 @@ public IFileDownloader CreateClient(string hostId, string serverPath, int pollin
         {
             // BaseUrl provided by the VS RemoteControl client team.  This is URL we are supposed
             // to use to publish and access data from.
-            const string BaseUrl = "https://az700632.vo.msecnd.net/pub";
+            const string BaseUrl = "https://aka.ms/vssettings/pub";
 
             return new FileDownloader(new RemoteControlClient(hostId, BaseUrl, serverPath, pollingMinutes));
         }