diff --git a/clients/client-app-mesh/src/endpoints.ts b/clients/client-app-mesh/src/endpoints.ts
index d121124d86df..eba3aaaf3c76 100644
--- a/clients/client-app-mesh/src/endpoints.ts
+++ b/clients/client-app-mesh/src/endpoints.ts
@@ -77,6 +77,14 @@ const regionHash: RegionHash = {
   },
   "ca-central-1": {
     variants: [
+      {
+        hostname: "appmesh-fips.ca-central-1.amazonaws.com",
+        tags: ["fips"],
+      },
+      {
+        hostname: "appmesh-fips.ca-central-1.api.aws",
+        tags: ["dualstack", "fips"],
+      },
       {
         hostname: "appmesh.ca-central-1.api.aws",
         tags: ["dualstack"],
@@ -165,6 +173,14 @@ const regionHash: RegionHash = {
   },
   "us-east-1": {
     variants: [
+      {
+        hostname: "appmesh-fips.us-east-1.amazonaws.com",
+        tags: ["fips"],
+      },
+      {
+        hostname: "appmesh-fips.us-east-1.api.aws",
+        tags: ["dualstack", "fips"],
+      },
       {
         hostname: "appmesh.us-east-1.api.aws",
         tags: ["dualstack"],
@@ -173,6 +189,14 @@ const regionHash: RegionHash = {
   },
   "us-east-2": {
     variants: [
+      {
+        hostname: "appmesh-fips.us-east-2.amazonaws.com",
+        tags: ["fips"],
+      },
+      {
+        hostname: "appmesh-fips.us-east-2.api.aws",
+        tags: ["dualstack", "fips"],
+      },
       {
         hostname: "appmesh.us-east-2.api.aws",
         tags: ["dualstack"],
@@ -181,6 +205,14 @@ const regionHash: RegionHash = {
   },
   "us-west-1": {
     variants: [
+      {
+        hostname: "appmesh-fips.us-west-1.amazonaws.com",
+        tags: ["fips"],
+      },
+      {
+        hostname: "appmesh-fips.us-west-1.api.aws",
+        tags: ["dualstack", "fips"],
+      },
       {
         hostname: "appmesh.us-west-1.api.aws",
         tags: ["dualstack"],
@@ -189,6 +221,14 @@ const regionHash: RegionHash = {
   },
   "us-west-2": {
     variants: [
+      {
+        hostname: "appmesh-fips.us-west-2.amazonaws.com",
+        tags: ["fips"],
+      },
+      {
+        hostname: "appmesh-fips.us-west-2.api.aws",
+        tags: ["dualstack", "fips"],
+      },
       {
         hostname: "appmesh.us-west-2.api.aws",
         tags: ["dualstack"],
@@ -210,6 +250,7 @@ const partitionHash: PartitionHash = {
       "ap-southeast-2",
       "ap-southeast-3",
       "ca-central-1",
+      "ca-central-1-fips",
       "eu-central-1",
       "eu-north-1",
       "eu-south-1",
@@ -220,9 +261,13 @@ const partitionHash: PartitionHash = {
       "me-south-1",
       "sa-east-1",
       "us-east-1",
+      "us-east-1-fips",
       "us-east-2",
+      "us-east-2-fips",
       "us-west-1",
+      "us-west-1-fips",
       "us-west-2",
+      "us-west-2-fips",
     ],
     regionRegex: "^(us|eu|ap|sa|ca|me|af)\\-\\w+\\-\\d+$",
     variants: [
diff --git a/clients/client-emr-serverless/src/endpoints.ts b/clients/client-emr-serverless/src/endpoints.ts
index 4d7fe7a63907..6bda3bf52bcd 100644
--- a/clients/client-emr-serverless/src/endpoints.ts
+++ b/clients/client-emr-serverless/src/endpoints.ts
@@ -3,6 +3,14 @@ import { getRegionInfo, PartitionHash, RegionHash } from "@aws-sdk/config-resolv
 import { RegionInfoProvider, RegionInfoProviderOptions } from "@aws-sdk/types";
 
 const regionHash: RegionHash = {
+  "ca-central-1": {
+    variants: [
+      {
+        hostname: "emr-serverless-fips.ca-central-1.amazonaws.com",
+        tags: ["fips"],
+      },
+    ],
+  },
   "us-east-1": {
     variants: [
       {
@@ -19,6 +27,14 @@ const regionHash: RegionHash = {
       },
     ],
   },
+  "us-west-1": {
+    variants: [
+      {
+        hostname: "emr-serverless-fips.us-west-1.amazonaws.com",
+        tags: ["fips"],
+      },
+    ],
+  },
   "us-west-2": {
     variants: [
       {
@@ -48,8 +64,10 @@ const partitionHash: PartitionHash = {
       "eu-west-1",
       "eu-west-2",
       "eu-west-3",
+      "fips-ca-central-1",
       "fips-us-east-1",
       "fips-us-east-2",
+      "fips-us-west-1",
       "fips-us-west-2",
       "me-central-1",
       "me-south-1",
diff --git a/codegen/smithy-aws-typescript-codegen/src/main/resources/software/amazon/smithy/aws/typescript/codegen/endpoints.json b/codegen/smithy-aws-typescript-codegen/src/main/resources/software/amazon/smithy/aws/typescript/codegen/endpoints.json
index 2436b046986d..e14ed35ab9c3 100644
--- a/codegen/smithy-aws-typescript-codegen/src/main/resources/software/amazon/smithy/aws/typescript/codegen/endpoints.json
+++ b/codegen/smithy-aws-typescript-codegen/src/main/resources/software/amazon/smithy/aws/typescript/codegen/endpoints.json
@@ -1537,12 +1537,27 @@
             },
             "ca-central-1": {
               "variants": [
+                {
+                  "hostname": "appmesh-fips.ca-central-1.amazonaws.com",
+                  "tags": ["fips"]
+                },
+                {
+                  "hostname": "appmesh-fips.ca-central-1.api.aws",
+                  "tags": ["dualstack", "fips"]
+                },
                 {
                   "hostname": "appmesh.ca-central-1.api.aws",
                   "tags": ["dualstack"]
                 }
               ]
             },
+            "ca-central-1-fips": {
+              "credentialScope": {
+                "region": "ca-central-1"
+              },
+              "deprecated": true,
+              "hostname": "appmesh-fips.ca-central-1.amazonaws.com"
+            },
             "eu-central-1": {
               "variants": [
                 {
@@ -1609,35 +1624,95 @@
             },
             "us-east-1": {
               "variants": [
+                {
+                  "hostname": "appmesh-fips.us-east-1.amazonaws.com",
+                  "tags": ["fips"]
+                },
+                {
+                  "hostname": "appmesh-fips.us-east-1.api.aws",
+                  "tags": ["dualstack", "fips"]
+                },
                 {
                   "hostname": "appmesh.us-east-1.api.aws",
                   "tags": ["dualstack"]
                 }
               ]
             },
+            "us-east-1-fips": {
+              "credentialScope": {
+                "region": "us-east-1"
+              },
+              "deprecated": true,
+              "hostname": "appmesh-fips.us-east-1.amazonaws.com"
+            },
             "us-east-2": {
               "variants": [
+                {
+                  "hostname": "appmesh-fips.us-east-2.amazonaws.com",
+                  "tags": ["fips"]
+                },
+                {
+                  "hostname": "appmesh-fips.us-east-2.api.aws",
+                  "tags": ["dualstack", "fips"]
+                },
                 {
                   "hostname": "appmesh.us-east-2.api.aws",
                   "tags": ["dualstack"]
                 }
               ]
             },
+            "us-east-2-fips": {
+              "credentialScope": {
+                "region": "us-east-2"
+              },
+              "deprecated": true,
+              "hostname": "appmesh-fips.us-east-2.amazonaws.com"
+            },
             "us-west-1": {
               "variants": [
+                {
+                  "hostname": "appmesh-fips.us-west-1.amazonaws.com",
+                  "tags": ["fips"]
+                },
+                {
+                  "hostname": "appmesh-fips.us-west-1.api.aws",
+                  "tags": ["dualstack", "fips"]
+                },
                 {
                   "hostname": "appmesh.us-west-1.api.aws",
                   "tags": ["dualstack"]
                 }
               ]
             },
+            "us-west-1-fips": {
+              "credentialScope": {
+                "region": "us-west-1"
+              },
+              "deprecated": true,
+              "hostname": "appmesh-fips.us-west-1.amazonaws.com"
+            },
             "us-west-2": {
               "variants": [
+                {
+                  "hostname": "appmesh-fips.us-west-2.amazonaws.com",
+                  "tags": ["fips"]
+                },
+                {
+                  "hostname": "appmesh-fips.us-west-2.api.aws",
+                  "tags": ["dualstack", "fips"]
+                },
                 {
                   "hostname": "appmesh.us-west-2.api.aws",
                   "tags": ["dualstack"]
                 }
               ]
+            },
+            "us-west-2-fips": {
+              "credentialScope": {
+                "region": "us-west-2"
+              },
+              "deprecated": true,
+              "hostname": "appmesh-fips.us-west-2.amazonaws.com"
             }
           }
         },
@@ -6020,8 +6095,27 @@
             "ap-northeast-2": {},
             "ap-south-1": {},
             "ap-southeast-1": {},
+            "ap-southeast-2": {},
+            "ca-central-1": {
+              "variants": [
+                {
+                  "hostname": "emr-serverless-fips.ca-central-1.amazonaws.com",
+                  "tags": ["fips"]
+                }
+              ]
+            },
             "eu-central-1": {},
+            "eu-north-1": {},
             "eu-west-1": {},
+            "eu-west-2": {},
+            "eu-west-3": {},
+            "fips-ca-central-1": {
+              "credentialScope": {
+                "region": "ca-central-1"
+              },
+              "deprecated": true,
+              "hostname": "emr-serverless-fips.ca-central-1.amazonaws.com"
+            },
             "fips-us-east-1": {
               "credentialScope": {
                 "region": "us-east-1"
@@ -6036,6 +6130,13 @@
               "deprecated": true,
               "hostname": "emr-serverless-fips.us-east-2.amazonaws.com"
             },
+            "fips-us-west-1": {
+              "credentialScope": {
+                "region": "us-west-1"
+              },
+              "deprecated": true,
+              "hostname": "emr-serverless-fips.us-west-1.amazonaws.com"
+            },
             "fips-us-west-2": {
               "credentialScope": {
                 "region": "us-west-2"
@@ -6060,6 +6161,14 @@
                 }
               ]
             },
+            "us-west-1": {
+              "variants": [
+                {
+                  "hostname": "emr-serverless-fips.us-west-1.amazonaws.com",
+                  "tags": ["fips"]
+                }
+              ]
+            },
             "us-west-2": {
               "variants": [
                 {