diff --git a/.changelog/3BE795A2-340F-4D5A-B237-8CE604BCB8E9.json b/.changelog/3BE795A2-340F-4D5A-B237-8CE604BCB8E9.json
deleted file mode 100644
index 6b6dbc5e7d2..00000000000
--- a/.changelog/3BE795A2-340F-4D5A-B237-8CE604BCB8E9.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "id": "3BE795A2-340F-4D5A-B237-8CE604BCB8E9",
-    "type": "bugfix",
-    "description": "typo in connect.go error message",
-    "collapse": false,
-    "modules": [
-        "feature/rds/auth"
-    ]
-}
diff --git a/.changelog/470a22d1d8304095b12f990c45e9f951.json b/.changelog/470a22d1d8304095b12f990c45e9f951.json
new file mode 100644
index 00000000000..a84c5cd6464
--- /dev/null
+++ b/.changelog/470a22d1d8304095b12f990c45e9f951.json
@@ -0,0 +1,8 @@
+{
+    "id": "470a22d1-d830-4095-b12f-990c45e9f951",
+    "type": "bugfix",
+    "description": "Add missing AccountIDEndpointMode binding to endpoint resolution.",
+    "modules": [
+        "service/dynamodb"
+    ]
+}
\ No newline at end of file
diff --git a/.changelog/adfe779a-b5b4-44bd-8e23-5cdb4db5aef8.json b/.changelog/adfe779a-b5b4-44bd-8e23-5cdb4db5aef8.json
deleted file mode 100644
index b054e9401c4..00000000000
--- a/.changelog/adfe779a-b5b4-44bd-8e23-5cdb4db5aef8.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "id": "adfe779a-b5b4-44bd-8e23-5cdb4db5aef8",
-  "type": "bugfix",
-  "collapse": false,
-  "description": "DynamoDB AttributeValue's MarshallMap() Does Not Support time.Time Correctly #2383",
-  "modules": [
-    "feature/dynamodb",
-    "feature/dynamodbstreams"
-  ]
-}
\ No newline at end of file
diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/AwsEndpointBuiltins.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/AwsEndpointBuiltins.java
index d75a91496f6..c3412a9d317 100644
--- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/AwsEndpointBuiltins.java
+++ b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/AwsEndpointBuiltins.java
@@ -41,6 +41,8 @@ public class AwsEndpointBuiltins implements GoIntegration {
             goTemplate("$T(options.DisableMultiRegionAccessPoints)", SdkGoTypes.Aws.Bool);
     private static final GoWriter.Writable BindAccountID =
             goTemplate("resolveAccountID(getIdentity(ctx), options.AccountIDEndpointMode)");
+    private static final GoWriter.Writable BindAccountIDEndpointMode =
+            goTemplate("$T(string(options.AccountIDEndpointMode))", SdkGoTypes.Aws.String);
 
     @Override
     public List<RuntimeClientPlugin> getClientPlugins() {
@@ -55,6 +57,7 @@ public List<RuntimeClientPlugin> getClientPlugins() {
                 .addEndpointBuiltinBinding("AWS::S3::DisableMultiRegionAccessPoints", BindAwsS3DisableMultiRegionAccessPoints)
                 .addEndpointBuiltinBinding("AWS::S3Control::UseArnRegion", BindAwsS3UseArnRegion)
                 .addEndpointBuiltinBinding("AWS::Auth::AccountId", BindAccountID)
+                .addEndpointBuiltinBinding("AWS::Auth::AccountIdEndpointMode", BindAccountIDEndpointMode)
                 .build());
     }
 
diff --git a/service/dynamodb/endpoints.go b/service/dynamodb/endpoints.go
index 8c915933b8a..7fd759a863f 100644
--- a/service/dynamodb/endpoints.go
+++ b/service/dynamodb/endpoints.go
@@ -712,6 +712,7 @@ func bindEndpointParams(ctx context.Context, input interface{}, options Options)
 	params.UseFIPS = aws.Bool(options.EndpointOptions.UseFIPSEndpoint == aws.FIPSEndpointStateEnabled)
 	params.Endpoint = options.BaseEndpoint
 	params.AccountId = resolveAccountID(getIdentity(ctx), options.AccountIDEndpointMode)
+	params.AccountIdEndpointMode = aws.String(string(options.AccountIDEndpointMode))
 
 	if b, ok := input.(endpointParamsBinder); ok {
 		b.bindEndpointParams(params)