diff --git a/plugins/amazonq/build.gradle.kts b/plugins/amazonq/build.gradle.kts
index 67c5f08033e..9c7c85c7b4c 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://d3akiidp1wvqyg.cloudfront.net/qAgenticChatServer/0/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..c21bcd76db5 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://d3akiidp1wvqyg.cloudfront.net/qAgenticChatServer/0/manifest.json" }
         }
 
         private val DEFAULT_MANIFEST_PATH: Path = getToolkitsCommonCacheRoot()
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/ExtendedClientMetadata.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/ExtendedClientMetadata.kt
index 8168645d829..195b7a14a49 100644
--- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/ExtendedClientMetadata.kt
+++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/ExtendedClientMetadata.kt
@@ -26,6 +26,7 @@ data class DeveloperProfiles(
     val mcp: Boolean,
     val pinnedContextEnabled: Boolean,
     val imageContextEnabled: Boolean,
+    val compaction: Boolean,
     val reroute: Boolean,
     val workspaceFilePath: String?,
 )
@@ -69,6 +70,7 @@ fun createExtendedClientMetadata(project: Project): ExtendedClientMetadata {
                     mcp = true,
                     pinnedContextEnabled = true,
                     imageContextEnabled = true,
+                    compaction = true,
                     reroute = true,
                     workspaceFilePath = project.workspaceFile?.path,
                 ),