diff --git a/plugins/amazonq/build.gradle.kts b/plugins/amazonq/build.gradle.kts
index c312b50dcdc..3ea789603ff 100644
--- a/plugins/amazonq/build.gradle.kts
+++ b/plugins/amazonq/build.gradle.kts
@@ -60,7 +60,7 @@ tasks.check {
 }
 
 val downloadFlareManifest by tasks.registering(Download::class) {
-    src("https://aws-toolkit-language-servers.amazonaws.com/qAgenticChatServer/0/manifest.json")
+    src("https://github.com/aws/language-servers/releases/download/agentic-pre-historyV2/manifest.json")
     dest(layout.buildDirectory.file("flare/manifest.json"))
     onlyIfModified(true)
     useETag(true)
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ManifestFetcher.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ManifestFetcher.kt
index b6c3a6cf62c..4f7892687a9 100644
--- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ManifestFetcher.kt
+++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ManifestFetcher.kt
@@ -28,7 +28,7 @@ class ManifestFetcher {
 
         private fun getManifestEndpoint(): String {
             val endpoint = Registry.get("amazon.q.flare.endpoint").asString()
-            return endpoint.ifBlank { "https://aws-toolkit-language-servers.amazonaws.com/qAgenticChatServer/0/manifest.json" }
+            return endpoint.ifBlank { "https://github.com/aws/language-servers/releases/download/agentic-pre-historyV2/manifest.json" }
         }
 
         private val DEFAULT_MANIFEST_PATH: Path = getToolkitsCommonCacheRoot()