diff --git a/clients/client-timestream-query/endpoints.ts b/clients/client-timestream-query/endpoints.ts
index d984f8258aee8..a1b0649182dd0 100644
--- a/clients/client-timestream-query/endpoints.ts
+++ b/clients/client-timestream-query/endpoints.ts
@@ -1,11 +1,11 @@
 import { RegionInfo, RegionInfoProvider } from "@aws-sdk/types";
 
 // Partition default templates
-const AWS_TEMPLATE = "timestream.{region}.amazonaws.com";
-const AWS_CN_TEMPLATE = "timestream.{region}.amazonaws.com.cn";
-const AWS_ISO_TEMPLATE = "timestream.{region}.c2s.ic.gov";
-const AWS_ISO_B_TEMPLATE = "timestream.{region}.sc2s.sgov.gov";
-const AWS_US_GOV_TEMPLATE = "timestream.{region}.amazonaws.com";
+const AWS_TEMPLATE = "query.timestream.{region}.amazonaws.com";
+const AWS_CN_TEMPLATE = "query.timestream.{region}.amazonaws.com.cn";
+const AWS_ISO_TEMPLATE = "query.timestream.{region}.c2s.ic.gov";
+const AWS_ISO_B_TEMPLATE = "query.timestream.{region}.sc2s.sgov.gov";
+const AWS_US_GOV_TEMPLATE = "query.timestream.{region}.amazonaws.com";
 
 // Partition regions
 const AWS_REGIONS = new Set([
diff --git a/clients/client-timestream-write/endpoints.ts b/clients/client-timestream-write/endpoints.ts
index d984f8258aee8..5ed8f09148b55 100644
--- a/clients/client-timestream-write/endpoints.ts
+++ b/clients/client-timestream-write/endpoints.ts
@@ -1,11 +1,11 @@
 import { RegionInfo, RegionInfoProvider } from "@aws-sdk/types";
 
 // Partition default templates
-const AWS_TEMPLATE = "timestream.{region}.amazonaws.com";
-const AWS_CN_TEMPLATE = "timestream.{region}.amazonaws.com.cn";
-const AWS_ISO_TEMPLATE = "timestream.{region}.c2s.ic.gov";
-const AWS_ISO_B_TEMPLATE = "timestream.{region}.sc2s.sgov.gov";
-const AWS_US_GOV_TEMPLATE = "timestream.{region}.amazonaws.com";
+const AWS_TEMPLATE = "ingest.timestream.{region}.amazonaws.com";
+const AWS_CN_TEMPLATE = "ingest.timestream.{region}.amazonaws.com.cn";
+const AWS_ISO_TEMPLATE = "ingest.timestream.{region}.c2s.ic.gov";
+const AWS_ISO_B_TEMPLATE = "ingest.timestream.{region}.sc2s.sgov.gov";
+const AWS_US_GOV_TEMPLATE = "ingest.timestream.{region}.amazonaws.com";
 
 // Partition regions
 const AWS_REGIONS = new Set([
diff --git a/codegen/smithy-aws-typescript-codegen/src/main/resources/software/amazon/smithy/aws/typescript/codegen/endpoint-prefix.json b/codegen/smithy-aws-typescript-codegen/src/main/resources/software/amazon/smithy/aws/typescript/codegen/endpoint-prefix.json
index 1385cced45e85..838b9ac2576ae 100644
--- a/codegen/smithy-aws-typescript-codegen/src/main/resources/software/amazon/smithy/aws/typescript/codegen/endpoint-prefix.json
+++ b/codegen/smithy-aws-typescript-codegen/src/main/resources/software/amazon/smithy/aws/typescript/codegen/endpoint-prefix.json
@@ -206,6 +206,8 @@
   "Support": "support",
   "SWF": "swf",
   "Textract": "textract",
+  "Timestream Query": "query.timestream",
+  "Timestream Write": "ingest.timestream",
   "Transcribe": "transcribe",
   "Transcribe Streaming": "transcribestreaming",
   "Transfer": "transfer",