diff --git a/generator/ServiceClientGeneratorLib/Generators/AuthResolvers/ModeledResolver.cs b/generator/ServiceClientGeneratorLib/Generators/AuthResolvers/ModeledResolver.cs
index bf2badba8d2a..c4d952ad1f6b 100644
--- a/generator/ServiceClientGeneratorLib/Generators/AuthResolvers/ModeledResolver.cs
+++ b/generator/ServiceClientGeneratorLib/Generators/AuthResolvers/ModeledResolver.cs
@@ -79,53 +79,37 @@ public override string TransformText()
             
             #line default
             #line hidden
-            this.Write("AuthSchemeHandler : BaseAuthResolverHandler\r\n    {\r\n        /// <summary>\r\n      " +
-                    "  /// Construct an instance of Amazon");
+            this.Write("AuthSchemeHandler : BaseAuthResolverHandler\r\n    {\r\n");
             
-            #line 40 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ClassName));
-            
-            #line default
-            #line hidden
-            this.Write("AuthSchemeHandler\r\n        /// </summary>\r\n        public Amazon");
-            
-            #line 42 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ClassName));
-            
-            #line default
-            #line hidden
-            this.Write("AuthSchemeHandler(AWSCredentials credentials)\r\n            : base(credentials)\r\n " +
-                    "       { }\r\n\r\n");
-            
-            #line 46 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 39 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
  if (IsServiceAllowListedForRulesBasedResolver()) { 
             
             #line default
             #line hidden
             this.Write("        private readonly Amazon");
             
-            #line 47 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 40 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ClassName));
             
             #line default
             #line hidden
             this.Write("EndpointResolver _endpointResolver = new();\r\n\r\n");
             
-            #line 49 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 42 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
  } 
             
             #line default
             #line hidden
             this.Write("        /// <summary>\r\n        /// Modeled auth scheme resolver for ");
             
-            #line 51 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 44 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ClassName));
             
             #line default
             #line hidden
             this.Write(".\r\n        /// </summary>\r\n        public Amazon");
             
-            #line 53 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 46 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ClassName));
             
             #line default
@@ -134,14 +118,14 @@ public override string TransformText()
                     "c/>\r\n        protected override List<IAuthSchemeOption> ResolveAuthOptions(IExec" +
                     "utionContext executionContext)\r\n        {\r\n");
             
-            #line 58 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 51 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
  if (IsServiceAllowListedForRulesBasedResolver()) { 
             
             #line default
             #line hidden
             this.Write("            // Since ");
             
-            #line 59 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 52 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ClassName));
             
             #line default
@@ -160,7 +144,7 @@ public override string TransformText()
 
 ");
             
-            #line 71 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 64 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
  } 
             
             #line default
@@ -168,7 +152,7 @@ public override string TransformText()
             this.Write("            var requestContext = executionContext.RequestContext;\r\n            va" +
                     "r mappedParameters = new Amazon");
             
-            #line 73 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 66 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ClassName));
             
             #line default
@@ -176,7 +160,7 @@ public override string TransformText()
             this.Write("AuthSchemeParameters\r\n            {\r\n                Operation = requestContext.R" +
                     "equest.RequestName,\r\n");
             
-            #line 76 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 69 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
  if (IsSigV4Supported()) { 
             
             #line default
@@ -184,7 +168,7 @@ public override string TransformText()
             this.Write("                Region = requestContext.ClientConfig.RegionEndpoint?.SystemName,\r" +
                     "\n");
             
-            #line 78 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 71 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
  } 
             
             #line default
@@ -192,7 +176,7 @@ public override string TransformText()
             this.Write("            };\r\n\r\n            return AuthSchemeResolver.ResolveAuthScheme(mappedP" +
                     "arameters);\r\n        }\r\n");
             
-            #line 83 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 76 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
  if (GeneratorHelpers.DetermineSignerOverride(this.Config.ServiceModel.SignatureVersion) != null) { 
             
             #line default
@@ -200,14 +184,14 @@ public override string TransformText()
             this.Write("\r\n        /// <inheritdoc/>\r\n        protected override AbstractAWSSigner GetSign" +
                     "er(IAuthScheme<BaseIdentity> scheme)\r\n        {\r\n            return new ");
             
-            #line 88 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 81 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(GeneratorHelpers.DetermineSignerOverride(this.Config.ServiceModel.SignatureVersion)));
             
             #line default
             #line hidden
             this.Write("();\r\n        }\r\n");
             
-            #line 90 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 83 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
  } 
             
             #line default
@@ -215,14 +199,14 @@ public override string TransformText()
             this.Write("    }\r\n\r\n    /// <inheritdoc cref=\"IAuthSchemeResolver{T}\" />\r\n    public class A" +
                     "mazon");
             
-            #line 94 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 87 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ClassName));
             
             #line default
             #line hidden
             this.Write("AuthSchemeResolver : IAuthSchemeResolver<Amazon");
             
-            #line 94 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 87 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ClassName));
             
             #line default
@@ -230,7 +214,7 @@ public override string TransformText()
             this.Write("AuthSchemeParameters>\r\n    {\r\n        /// <inheritdoc />\r\n        public List<IAu" +
                     "thSchemeOption> ResolveAuthScheme(Amazon");
             
-            #line 97 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 90 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ClassName));
             
             #line default
@@ -238,63 +222,63 @@ public override string TransformText()
             this.Write("AuthSchemeParameters authParameters)\r\n        {\r\n            switch (authParamete" +
                     "rs.Operation)\r\n            {\r\n");
             
-            #line 101 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 94 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
  foreach (var operation in GetOperationsWithAuthSchemes()) { 
             
             #line default
             #line hidden
             this.Write("\t\t\t\tcase \"");
             
-            #line 102 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 95 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(operation.Name));
             
             #line default
             #line hidden
             this.Write("Request\":\r\n");
             
-            #line 103 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 96 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
  if (IsKnownSchemeList(operation.AuthSchemes, out string operationSchemesContent)) { 
             
             #line default
             #line hidden
             this.Write("                    return ");
             
-            #line 104 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 97 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(operationSchemesContent));
             
             #line default
             #line hidden
             this.Write(";\r\n");
             
-            #line 105 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 98 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
  } else { 
             
             #line default
             #line hidden
             this.Write("                    return new List<IAuthSchemeOption> \r\n                    {\r\n");
             
-            #line 108 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 101 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
  foreach (var operationScheme in operation.AuthSchemes) { 
             
             #line default
             #line hidden
             this.Write("                        new AuthSchemeOption { SchemeId = \"");
             
-            #line 109 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 102 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(operationScheme));
             
             #line default
             #line hidden
             this.Write("\" },\r\n");
             
-            #line 110 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 103 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
  } 
             
             #line default
             #line hidden
             this.Write("                    };\r\n");
             
-            #line 112 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 105 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
  }} 
             
             #line default
@@ -302,49 +286,49 @@ public override string TransformText()
             this.Write("                default:\r\n                    // Default for the service, applies" +
                     " to all remaining operations.\r\n");
             
-            #line 115 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 108 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
  if (IsKnownSchemeList(GetServiceAuthSchemes(), out string serviceSchemesContent)) { 
             
             #line default
             #line hidden
             this.Write("                    return ");
             
-            #line 116 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 109 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(serviceSchemesContent));
             
             #line default
             #line hidden
             this.Write(";\r\n");
             
-            #line 117 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 110 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
  } else { 
             
             #line default
             #line hidden
             this.Write("                    return new List<IAuthSchemeOption> \r\n                    {\r\n");
             
-            #line 120 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 113 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
  foreach (var serviceScheme in GetServiceAuthSchemes()) { 
             
             #line default
             #line hidden
             this.Write("    \t\t            new AuthSchemeOption { SchemeId = \"");
             
-            #line 121 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 114 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(serviceScheme));
             
             #line default
             #line hidden
             this.Write("\" },\r\n");
             
-            #line 122 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 115 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
  } 
             
             #line default
             #line hidden
             this.Write("                    };\r\n");
             
-            #line 124 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
+            #line 117 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\AuthResolvers\ModeledResolver.tt"
  } 
             
             #line default
diff --git a/generator/ServiceClientGeneratorLib/Generators/AuthResolvers/ModeledResolver.tt b/generator/ServiceClientGeneratorLib/Generators/AuthResolvers/ModeledResolver.tt
index eafeb3983ed3..66ad9ee572f8 100644
--- a/generator/ServiceClientGeneratorLib/Generators/AuthResolvers/ModeledResolver.tt
+++ b/generator/ServiceClientGeneratorLib/Generators/AuthResolvers/ModeledResolver.tt
@@ -36,13 +36,6 @@ namespace <#=this.Config.Namespace#>.Internal
     /// </summary>
     public class Amazon<#=this.Config.ClassName#>AuthSchemeHandler : BaseAuthResolverHandler
     {
-        /// <summary>
-        /// Construct an instance of Amazon<#=this.Config.ClassName#>AuthSchemeHandler
-        /// </summary>
-        public Amazon<#=this.Config.ClassName#>AuthSchemeHandler(AWSCredentials credentials)
-            : base(credentials)
-        { }
-
 <# if (IsServiceAllowListedForRulesBasedResolver()) { #>
         private readonly Amazon<#=this.Config.ClassName#>EndpointResolver _endpointResolver = new();
 
diff --git a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/ServiceClientsNetFramework.cs b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/ServiceClientsNetFramework.cs
index f167387f2210..3d08dd2a201e 100644
--- a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/ServiceClientsNetFramework.cs
+++ b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/ServiceClientsNetFramework.cs
@@ -574,7 +574,7 @@ protected override void CustomizeRuntimePipeline(RuntimePipeline pipeline)
             
             #line default
             #line hidden
-            this.Write("AuthSchemeHandler(this.Config.DefaultAWSCredentials));\r\n");
+            this.Write("AuthSchemeHandler());\r\n");
             
             #line 236 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClientsNetFramework.tt"
 
diff --git a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/ServiceClientsNetFramework.tt b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/ServiceClientsNetFramework.tt
index bac5302b1d90..cabc1f31d266 100644
--- a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/ServiceClientsNetFramework.tt
+++ b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/ServiceClientsNetFramework.tt
@@ -232,7 +232,7 @@ namespace <#=this.Config.Namespace#>
         /// <param name="pipeline"></param>
         protected override void CustomizeRuntimePipeline(RuntimePipeline pipeline)
         {
-            pipeline.AddHandlerBefore<Amazon.Runtime.Internal.CredentialsRetriever>(new Amazon<#=this.Config.ClassName#>AuthSchemeHandler(this.Config.DefaultAWSCredentials));
+            pipeline.AddHandlerBefore<Amazon.Runtime.Internal.CredentialsRetriever>(new Amazon<#=this.Config.ClassName#>AuthSchemeHandler());
 <#
     var pipelineOverrides = this.Config.ServiceModel.Customizations.PipelineOverride;
     if (pipelineOverrides != null)
diff --git a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/ServiceClientsNetStandard.cs b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/ServiceClientsNetStandard.cs
index 1676e78e67c7..dcab501c285e 100644
--- a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/ServiceClientsNetStandard.cs
+++ b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/ServiceClientsNetStandard.cs
@@ -574,7 +574,7 @@ protected override void CustomizeRuntimePipeline(RuntimePipeline pipeline)
             
             #line default
             #line hidden
-            this.Write("AuthSchemeHandler(this.Config.DefaultAWSCredentials));\r\n");
+            this.Write("AuthSchemeHandler());\r\n");
             
             #line 240 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClientsNetStandard.tt"
 
diff --git a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/ServiceClientsNetStandard.tt b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/ServiceClientsNetStandard.tt
index aad0b3080e9a..35752ab338aa 100644
--- a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/ServiceClientsNetStandard.tt
+++ b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/ServiceClientsNetStandard.tt
@@ -236,7 +236,7 @@ namespace <#=this.Config.Namespace#>
         /// <param name="pipeline">Runtime pipeline for the current client.</param>
         protected override void CustomizeRuntimePipeline(RuntimePipeline pipeline)
         {
-            pipeline.AddHandlerBefore<Amazon.Runtime.Internal.CredentialsRetriever>(new Amazon<#=this.Config.ClassName#>AuthSchemeHandler(this.Config.DefaultAWSCredentials));
+            pipeline.AddHandlerBefore<Amazon.Runtime.Internal.CredentialsRetriever>(new Amazon<#=this.Config.ClassName#>AuthSchemeHandler());
 <#
     var pipelineOverrides = this.Config.ServiceModel.Customizations.PipelineOverride;
     if (pipelineOverrides != null)
diff --git a/sdk/src/Core/Amazon.Runtime/Pipeline/Handlers/BaseAuthResolverHandler.cs b/sdk/src/Core/Amazon.Runtime/Pipeline/Handlers/BaseAuthResolverHandler.cs
index 7314af88e94a..dfec51e70b65 100644
--- a/sdk/src/Core/Amazon.Runtime/Pipeline/Handlers/BaseAuthResolverHandler.cs
+++ b/sdk/src/Core/Amazon.Runtime/Pipeline/Handlers/BaseAuthResolverHandler.cs
@@ -33,18 +33,6 @@ public abstract class BaseAuthResolverHandler : PipelineHandler
             new AwsV4AuthScheme()
         };
 
-        public BaseAuthResolverHandler(AWSCredentials credentials)
-        {
-            this.DefaultAWSCredentials = credentials;
-        }
-
-        protected AWSCredentials DefaultAWSCredentials
-        {
-            get;
-            private set;
-        }
-
-
         public override void InvokeSync(IExecutionContext executionContext)
         {
             PreInvoke(executionContext);
@@ -79,7 +67,7 @@ protected void PreInvoke(IExecutionContext executionContext)
                 if (scheme is AwsV4aAuthScheme || scheme is AwsV4AuthScheme)
                 {
                     // We can use DefaultAWSCredentials if it was set by the user for these schemes.
-                    executionContext.RequestContext.Identity = this.DefaultAWSCredentials;
+                    executionContext.RequestContext.Identity = executionContext.RequestContext.ClientConfig.DefaultAWSCredentials;
                 }
 
                 if (executionContext.RequestContext.Identity == null)
diff --git a/sdk/src/Services/AutoScaling/Generated/Internal/AmazonAutoScalingAuthResolver.cs b/sdk/src/Services/AutoScaling/Generated/Internal/AmazonAutoScalingAuthResolver.cs
index 5ae03b97c9aa..1e72e1364208 100644
--- a/sdk/src/Services/AutoScaling/Generated/Internal/AmazonAutoScalingAuthResolver.cs
+++ b/sdk/src/Services/AutoScaling/Generated/Internal/AmazonAutoScalingAuthResolver.cs
@@ -43,13 +43,6 @@ public class AmazonAutoScalingAuthSchemeParameters : IAuthSchemeParameters
     /// </summary>
     public class AmazonAutoScalingAuthSchemeHandler : BaseAuthResolverHandler
     {
-        /// <summary>
-        /// Construct an instance of AmazonAutoScalingAuthSchemeHandler
-        /// </summary>
-        public AmazonAutoScalingAuthSchemeHandler(AWSCredentials credentials)
-            : base(credentials)
-        { }
-
         /// <summary>
         /// Modeled auth scheme resolver for AutoScaling.
         /// </summary>
diff --git a/sdk/src/Services/AutoScaling/Generated/_bcl/AmazonAutoScalingClient.cs b/sdk/src/Services/AutoScaling/Generated/_bcl/AmazonAutoScalingClient.cs
index 96ddb21710b9..1cd8f5027728 100644
--- a/sdk/src/Services/AutoScaling/Generated/_bcl/AmazonAutoScalingClient.cs
+++ b/sdk/src/Services/AutoScaling/Generated/_bcl/AmazonAutoScalingClient.cs
@@ -238,7 +238,7 @@ public AmazonAutoScalingClient(string awsAccessKeyId, string awsSecretAccessKey,
         /// <param name="pipeline"></param>
         protected override void CustomizeRuntimePipeline(RuntimePipeline pipeline)
         {
-            pipeline.AddHandlerBefore<Amazon.Runtime.Internal.CredentialsRetriever>(new AmazonAutoScalingAuthSchemeHandler(this.Config.DefaultAWSCredentials));
+            pipeline.AddHandlerBefore<Amazon.Runtime.Internal.CredentialsRetriever>(new AmazonAutoScalingAuthSchemeHandler());
             pipeline.RemoveHandler<Amazon.Runtime.Internal.EndpointResolver>();
             pipeline.AddHandlerAfter<Amazon.Runtime.Internal.Marshaller>(new AmazonAutoScalingEndpointResolver());
         }
diff --git a/sdk/src/Services/AutoScaling/Generated/_netstandard/AmazonAutoScalingClient.cs b/sdk/src/Services/AutoScaling/Generated/_netstandard/AmazonAutoScalingClient.cs
index 63f12793319a..1cd96cea02b6 100644
--- a/sdk/src/Services/AutoScaling/Generated/_netstandard/AmazonAutoScalingClient.cs
+++ b/sdk/src/Services/AutoScaling/Generated/_netstandard/AmazonAutoScalingClient.cs
@@ -242,7 +242,7 @@ public IAutoScalingPaginatorFactory Paginators
         /// <param name="pipeline">Runtime pipeline for the current client.</param>
         protected override void CustomizeRuntimePipeline(RuntimePipeline pipeline)
         {
-            pipeline.AddHandlerBefore<Amazon.Runtime.Internal.CredentialsRetriever>(new AmazonAutoScalingAuthSchemeHandler(this.Config.DefaultAWSCredentials));
+            pipeline.AddHandlerBefore<Amazon.Runtime.Internal.CredentialsRetriever>(new AmazonAutoScalingAuthSchemeHandler());
             pipeline.RemoveHandler<Amazon.Runtime.Internal.EndpointResolver>();
             pipeline.AddHandlerAfter<Amazon.Runtime.Internal.Marshaller>(new AmazonAutoScalingEndpointResolver());
         }
diff --git a/sdk/src/Services/S3/Generated/Internal/AmazonS3AuthResolver.cs b/sdk/src/Services/S3/Generated/Internal/AmazonS3AuthResolver.cs
index 805d16c2b4f7..4eef37dbd45d 100644
--- a/sdk/src/Services/S3/Generated/Internal/AmazonS3AuthResolver.cs
+++ b/sdk/src/Services/S3/Generated/Internal/AmazonS3AuthResolver.cs
@@ -43,13 +43,6 @@ public class AmazonS3AuthSchemeParameters : IAuthSchemeParameters
     /// </summary>
     public class AmazonS3AuthSchemeHandler : BaseAuthResolverHandler
     {
-        /// <summary>
-        /// Construct an instance of AmazonS3AuthSchemeHandler
-        /// </summary>
-        public AmazonS3AuthSchemeHandler(AWSCredentials credentials)
-            : base(credentials)
-        { }
-
         private readonly AmazonS3EndpointResolver _endpointResolver = new();
 
         /// <summary>
diff --git a/sdk/src/Services/S3/Generated/_bcl/AmazonS3Client.cs b/sdk/src/Services/S3/Generated/_bcl/AmazonS3Client.cs
index 3c27c56f2228..6f2b3f83468f 100644
--- a/sdk/src/Services/S3/Generated/_bcl/AmazonS3Client.cs
+++ b/sdk/src/Services/S3/Generated/_bcl/AmazonS3Client.cs
@@ -228,7 +228,7 @@ public AmazonS3Client(string awsAccessKeyId, string awsSecretAccessKey, string a
         /// <param name="pipeline"></param>
         protected override void CustomizeRuntimePipeline(RuntimePipeline pipeline)
         {
-            pipeline.AddHandlerBefore<Amazon.Runtime.Internal.CredentialsRetriever>(new AmazonS3AuthSchemeHandler(this.Config.DefaultAWSCredentials));
+            pipeline.AddHandlerBefore<Amazon.Runtime.Internal.CredentialsRetriever>(new AmazonS3AuthSchemeHandler());
             pipeline.AddHandlerBefore<Amazon.Runtime.Internal.Marshaller>(new Amazon.S3.Internal.AmazonS3PreMarshallHandler());
             pipeline.AddHandlerAfter<Amazon.Runtime.Internal.EndpointResolver>(new Amazon.S3.Internal.AmazonS3KmsHandler());
             pipeline.AddHandlerBefore<Amazon.Runtime.Internal.Unmarshaller>(new Amazon.S3.Internal.AmazonS3ResponseHandler());
diff --git a/sdk/src/Services/S3/Generated/_netstandard/AmazonS3Client.cs b/sdk/src/Services/S3/Generated/_netstandard/AmazonS3Client.cs
index 217f21aea4ce..80d7089e3c6e 100644
--- a/sdk/src/Services/S3/Generated/_netstandard/AmazonS3Client.cs
+++ b/sdk/src/Services/S3/Generated/_netstandard/AmazonS3Client.cs
@@ -232,7 +232,7 @@ public IS3PaginatorFactory Paginators
         /// <param name="pipeline">Runtime pipeline for the current client.</param>
         protected override void CustomizeRuntimePipeline(RuntimePipeline pipeline)
         {
-            pipeline.AddHandlerBefore<Amazon.Runtime.Internal.CredentialsRetriever>(new AmazonS3AuthSchemeHandler(this.Config.DefaultAWSCredentials));
+            pipeline.AddHandlerBefore<Amazon.Runtime.Internal.CredentialsRetriever>(new AmazonS3AuthSchemeHandler());
             pipeline.AddHandlerBefore<Amazon.Runtime.Internal.Marshaller>(new Amazon.S3.Internal.AmazonS3PreMarshallHandler());
             pipeline.AddHandlerAfter<Amazon.Runtime.Internal.EndpointResolver>(new Amazon.S3.Internal.AmazonS3KmsHandler());
             pipeline.AddHandlerBefore<Amazon.Runtime.Internal.Unmarshaller>(new Amazon.S3.Internal.AmazonS3ResponseHandler());
diff --git a/sdk/test/UnitTests/Custom/Runtime/AmazonServiceClientTests.cs b/sdk/test/UnitTests/Custom/Runtime/AmazonServiceClientTests.cs
index 88bf3dc63c72..a573e04b8867 100644
--- a/sdk/test/UnitTests/Custom/Runtime/AmazonServiceClientTests.cs
+++ b/sdk/test/UnitTests/Custom/Runtime/AmazonServiceClientTests.cs
@@ -78,7 +78,7 @@ protected override void CustomizeRuntimePipeline(RuntimePipeline pipeline)
             var httpHandler = new HttpHandler<Stream>(_requestFactory, this);
 
             pipeline.ReplaceHandler<HttpHandler<Stream>>(httpHandler);
-            pipeline.AddHandlerBefore<CredentialsRetriever>(new AmazonElasticTranscoderAuthSchemeHandler(this.Config.DefaultAWSCredentials));
+            pipeline.AddHandlerBefore<CredentialsRetriever>(new AmazonElasticTranscoderAuthSchemeHandler());
         }
     }
 }