diff --git a/codegen/smithy-aws-go-codegen/src/main/resources/software/amazon/smithy/aws/go/codegen/endpoints.json b/codegen/smithy-aws-go-codegen/src/main/resources/software/amazon/smithy/aws/go/codegen/endpoints.json
index c0262dc035f..bee25d8da05 100644
--- a/codegen/smithy-aws-go-codegen/src/main/resources/software/amazon/smithy/aws/go/codegen/endpoints.json
+++ b/codegen/smithy-aws-go-codegen/src/main/resources/software/amazon/smithy/aws/go/codegen/endpoints.json
@@ -1716,22 +1716,102 @@
       },
       "athena" : {
         "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ap-southeast-3" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
+          "af-south-1" : {
+            "variants" : [ {
+              "hostname" : "athena.af-south-1.api.aws",
+              "tags" : [ "dualstack" ]
+            } ]
+          },
+          "ap-east-1" : {
+            "variants" : [ {
+              "hostname" : "athena.ap-east-1.api.aws",
+              "tags" : [ "dualstack" ]
+            } ]
+          },
+          "ap-northeast-1" : {
+            "variants" : [ {
+              "hostname" : "athena.ap-northeast-1.api.aws",
+              "tags" : [ "dualstack" ]
+            } ]
+          },
+          "ap-northeast-2" : {
+            "variants" : [ {
+              "hostname" : "athena.ap-northeast-2.api.aws",
+              "tags" : [ "dualstack" ]
+            } ]
+          },
+          "ap-northeast-3" : {
+            "variants" : [ {
+              "hostname" : "athena.ap-northeast-3.api.aws",
+              "tags" : [ "dualstack" ]
+            } ]
+          },
+          "ap-south-1" : {
+            "variants" : [ {
+              "hostname" : "athena.ap-south-1.api.aws",
+              "tags" : [ "dualstack" ]
+            } ]
+          },
+          "ap-southeast-1" : {
+            "variants" : [ {
+              "hostname" : "athena.ap-southeast-1.api.aws",
+              "tags" : [ "dualstack" ]
+            } ]
+          },
+          "ap-southeast-2" : {
+            "variants" : [ {
+              "hostname" : "athena.ap-southeast-2.api.aws",
+              "tags" : [ "dualstack" ]
+            } ]
+          },
+          "ap-southeast-3" : {
+            "variants" : [ {
+              "hostname" : "athena.ap-southeast-3.api.aws",
+              "tags" : [ "dualstack" ]
+            } ]
+          },
+          "ca-central-1" : {
+            "variants" : [ {
+              "hostname" : "athena.ca-central-1.api.aws",
+              "tags" : [ "dualstack" ]
+            } ]
+          },
+          "eu-central-1" : {
+            "variants" : [ {
+              "hostname" : "athena.eu-central-1.api.aws",
+              "tags" : [ "dualstack" ]
+            } ]
+          },
+          "eu-north-1" : {
+            "variants" : [ {
+              "hostname" : "athena.eu-north-1.api.aws",
+              "tags" : [ "dualstack" ]
+            } ]
+          },
+          "eu-south-1" : {
+            "variants" : [ {
+              "hostname" : "athena.eu-south-1.api.aws",
+              "tags" : [ "dualstack" ]
+            } ]
+          },
+          "eu-west-1" : {
+            "variants" : [ {
+              "hostname" : "athena.eu-west-1.api.aws",
+              "tags" : [ "dualstack" ]
+            } ]
+          },
+          "eu-west-2" : {
+            "variants" : [ {
+              "hostname" : "athena.eu-west-2.api.aws",
+              "tags" : [ "dualstack" ]
+            } ]
+          },
+          "eu-west-3" : {
+            "variants" : [ {
+              "hostname" : "athena.eu-west-3.api.aws",
+              "tags" : [ "dualstack" ]
+            } ]
+          },
           "fips-us-east-1" : {
             "credentialScope" : {
               "region" : "us-east-1"
@@ -1760,30 +1840,52 @@
             "deprecated" : true,
             "hostname" : "athena-fips.us-west-2.amazonaws.com"
           },
-          "me-south-1" : { },
-          "sa-east-1" : { },
+          "me-south-1" : {
+            "variants" : [ {
+              "hostname" : "athena.me-south-1.api.aws",
+              "tags" : [ "dualstack" ]
+            } ]
+          },
+          "sa-east-1" : {
+            "variants" : [ {
+              "hostname" : "athena.sa-east-1.api.aws",
+              "tags" : [ "dualstack" ]
+            } ]
+          },
           "us-east-1" : {
             "variants" : [ {
               "hostname" : "athena-fips.us-east-1.amazonaws.com",
               "tags" : [ "fips" ]
+            }, {
+              "hostname" : "athena.us-east-1.api.aws",
+              "tags" : [ "dualstack" ]
             } ]
           },
           "us-east-2" : {
             "variants" : [ {
               "hostname" : "athena-fips.us-east-2.amazonaws.com",
               "tags" : [ "fips" ]
+            }, {
+              "hostname" : "athena.us-east-2.api.aws",
+              "tags" : [ "dualstack" ]
             } ]
           },
           "us-west-1" : {
             "variants" : [ {
               "hostname" : "athena-fips.us-west-1.amazonaws.com",
               "tags" : [ "fips" ]
+            }, {
+              "hostname" : "athena.us-west-1.api.aws",
+              "tags" : [ "dualstack" ]
             } ]
           },
           "us-west-2" : {
             "variants" : [ {
               "hostname" : "athena-fips.us-west-2.amazonaws.com",
               "tags" : [ "fips" ]
+            }, {
+              "hostname" : "athena.us-west-2.api.aws",
+              "tags" : [ "dualstack" ]
             } ]
           }
         }
@@ -11244,6 +11346,74 @@
           "us-west-2" : { }
         }
       },
+      "resource-explorer-2" : {
+        "defaults" : {
+          "variants" : [ {
+            "dnsSuffix" : "api.aws",
+            "hostname" : "{service}-fips.{region}.{dnsSuffix}",
+            "tags" : [ "fips" ]
+          } ]
+        },
+        "endpoints" : {
+          "af-south-1" : {
+            "hostname" : "resource-explorer-2.af-south-1.api.aws"
+          },
+          "ap-east-1" : {
+            "hostname" : "resource-explorer-2.ap-east-1.api.aws"
+          },
+          "ap-northeast-1" : {
+            "hostname" : "resource-explorer-2.ap-northeast-1.api.aws"
+          },
+          "ap-northeast-2" : {
+            "hostname" : "resource-explorer-2.ap-northeast-2.api.aws"
+          },
+          "ap-northeast-3" : {
+            "hostname" : "resource-explorer-2.ap-northeast-3.api.aws"
+          },
+          "ap-south-1" : {
+            "hostname" : "resource-explorer-2.ap-south-1.api.aws"
+          },
+          "ap-southeast-1" : {
+            "hostname" : "resource-explorer-2.ap-southeast-1.api.aws"
+          },
+          "ap-southeast-2" : {
+            "hostname" : "resource-explorer-2.ap-southeast-2.api.aws"
+          },
+          "ca-central-1" : {
+            "hostname" : "resource-explorer-2.ca-central-1.api.aws"
+          },
+          "eu-central-1" : {
+            "hostname" : "resource-explorer-2.eu-central-1.api.aws"
+          },
+          "eu-north-1" : {
+            "hostname" : "resource-explorer-2.eu-north-1.api.aws"
+          },
+          "eu-west-1" : {
+            "hostname" : "resource-explorer-2.eu-west-1.api.aws"
+          },
+          "eu-west-2" : {
+            "hostname" : "resource-explorer-2.eu-west-2.api.aws"
+          },
+          "eu-west-3" : {
+            "hostname" : "resource-explorer-2.eu-west-3.api.aws"
+          },
+          "sa-east-1" : {
+            "hostname" : "resource-explorer-2.sa-east-1.api.aws"
+          },
+          "us-east-1" : {
+            "hostname" : "resource-explorer-2.us-east-1.api.aws"
+          },
+          "us-east-2" : {
+            "hostname" : "resource-explorer-2.us-east-2.api.aws"
+          },
+          "us-west-1" : {
+            "hostname" : "resource-explorer-2.us-west-1.api.aws"
+          },
+          "us-west-2" : {
+            "hostname" : "resource-explorer-2.us-west-2.api.aws"
+          }
+        }
+      },
       "resource-groups" : {
         "endpoints" : {
           "af-south-1" : { },
@@ -14143,6 +14313,7 @@
           "ap-south-1" : { },
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
+          "ap-southeast-3" : { },
           "ca-central-1" : {
             "variants" : [ {
               "hostname" : "transfer-fips.ca-central-1.amazonaws.com",
@@ -16108,6 +16279,23 @@
           "cn-northwest-1" : { }
         }
       },
+      "resource-explorer-2" : {
+        "defaults" : {
+          "variants" : [ {
+            "dnsSuffix" : "api.amazonwebservices.com.cn",
+            "hostname" : "{service}-fips.{region}.{dnsSuffix}",
+            "tags" : [ "fips" ]
+          } ]
+        },
+        "endpoints" : {
+          "cn-north-1" : {
+            "hostname" : "resource-explorer-2.cn-north-1.api.amazonwebservices.com.cn"
+          },
+          "cn-northwest-1" : {
+            "hostname" : "resource-explorer-2.cn-northwest-1.api.amazonwebservices.com.cn"
+          }
+        }
+      },
       "resource-groups" : {
         "endpoints" : {
           "cn-north-1" : { },
@@ -19154,6 +19342,23 @@
           }
         }
       },
+      "resource-explorer-2" : {
+        "defaults" : {
+          "variants" : [ {
+            "dnsSuffix" : "api.aws",
+            "hostname" : "{service}-fips.{region}.{dnsSuffix}",
+            "tags" : [ "fips" ]
+          } ]
+        },
+        "endpoints" : {
+          "us-gov-east-1" : {
+            "hostname" : "resource-explorer-2.us-gov-east-1.api.aws"
+          },
+          "us-gov-west-1" : {
+            "hostname" : "resource-explorer-2.us-gov-west-1.api.aws"
+          }
+        }
+      },
       "resource-groups" : {
         "defaults" : {
           "variants" : [ {