diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ArtifactManager.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ArtifactManager.kt
index 7d41bfaddb5..901f52722ce 100644
--- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ArtifactManager.kt
+++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ArtifactManager.kt
@@ -32,8 +32,8 @@ class ArtifactManager(
 
     companion object {
         private val DEFAULT_VERSION_RANGE = SupportedManifestVersionRange(
-            startVersion = SemVer("3.0.0", 3, 0, 0),
-            endVersion = SemVer("4.0.0", 4, 0, 0)
+            startVersion = SemVer("0.1.0", 0, 1, 0),
+            endVersion = SemVer("0.2.0", 0, 2, 0)
         )
         private val logger = getLogger<ArtifactManager>()
     }
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 4ccfbeca491..ca15dd07eb0 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
@@ -25,7 +25,7 @@ class ManifestFetcher(
         private val logger = getLogger<ManifestFetcher>()
 
         private const val DEFAULT_MANIFEST_URL =
-            "https://aws-toolkit-language-servers.amazonaws.com/codewhisperer/0/manifest.json"
+            "https://aws-language-servers-gamma.amazonaws.com/remoteWorkspaceContext/0/manifest.json"
 
         private val DEFAULT_MANIFEST_PATH: Path = getToolkitsCommonCacheRoot()
             .resolve("aws")
diff --git a/plugins/amazonq/src/main/resources/META-INF/plugin.xml b/plugins/amazonq/src/main/resources/META-INF/plugin.xml
index 3d8f95579e5..4a7905aeb94 100644
--- a/plugins/amazonq/src/main/resources/META-INF/plugin.xml
+++ b/plugins/amazonq/src/main/resources/META-INF/plugin.xml
@@ -85,7 +85,7 @@
 
     <extensions defaultExtensionNs="com.intellij">
         <registryKey key="amazon.q.endpoint" description="Endpoint to use for Amazon Q"
-                     defaultValue="" restartRequired="true"/>
+                     defaultValue="https://rts.gamma-us-west-2.codewhisperer.ai.aws.dev/" restartRequired="true"/>
         <registryKey key="amazon.q.endpoints.json" description="List of region-endpoint pairs in JSON array form"
                      defaultValue="[{&quot;region&quot;:&quot;us-east-1&quot;,&quot;endpoint&quot;:&quot;https://q.us-east-1.amazonaws.com/&quot;},
                    {&quot;region&quot;:&quot;eu-central-1&quot;,&quot;endpoint&quot;:&quot;https://q.eu-central-1.amazonaws.com/&quot;}]"
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sono/SonoConstants.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sono/SonoConstants.kt
index 2c9bd5941c1..052f3a32755 100644
--- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sono/SonoConstants.kt
+++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sono/SonoConstants.kt
@@ -13,16 +13,16 @@ const val IDENTITY_CENTER_ROLE_ACCESS_SCOPE = "sso:account:access"
 
 @Deprecated("pending removal, merge into Q_SCOPES")
 val CODEWHISPERER_SCOPES = listOf(
-    "codewhisperer:completions",
-    "codewhisperer:analysis",
+    "codewhisperer_internal:completions",
+    "codewhisperer_internal:analysis",
 )
 
 val Q_SCOPES = listOf(
-    "codewhisperer:conversations",
-    "codewhisperer:transformations",
-    "codewhisperer:taskassist",
-    "codewhisperer:completions",
-    "codewhisperer:analysis",
+    "codewhisperer_internal:conversations",
+    "codewhisperer_internal:transformations",
+    "codewhisperer_internal:taskassist",
+    "codewhisperer_internal:completions",
+    "codewhisperer_internal:analysis",
 )
 
 val CODECATALYST_SCOPES = listOf(