diff --git a/src/aws-cpp-sdk-core/include/aws/core/AmazonWebServiceRequest.h b/src/aws-cpp-sdk-core/include/aws/core/AmazonWebServiceRequest.h
index a16c939a31c..77b8e9d72aa 100644
--- a/src/aws-cpp-sdk-core/include/aws/core/AmazonWebServiceRequest.h
+++ b/src/aws-cpp-sdk-core/include/aws/core/AmazonWebServiceRequest.h
@@ -19,6 +19,7 @@
 #include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/core/utils/stream/ResponseStream.h>
 #include <aws/core/endpoint/internal/AWSEndpointAttribute.h>
+#include <smithy/identity/auth/AuthSchemeOption.h>
 
 namespace Aws
 {
@@ -231,6 +232,8 @@ namespace Aws
         RetryContext GetRetryContext() const { return m_retryContext; }
 
         void SetRetryContext(const RetryContext& context) const { m_retryContext = context; }
+
+        virtual Aws::Vector<smithy::AuthSchemeOption> GetRequestSpecificSupportedAuth() const { return {}; }
     protected:
         /**
          * Default does nothing. Override this to convert what would otherwise be the payload of the
diff --git a/src/aws-cpp-sdk-core/include/aws/core/auth/AWSAuthSigner.h b/src/aws-cpp-sdk-core/include/aws/core/auth/AWSAuthSigner.h
index 0c4a26dbd32..6abfc5c3ddd 100644
--- a/src/aws-cpp-sdk-core/include/aws/core/auth/AWSAuthSigner.h
+++ b/src/aws-cpp-sdk-core/include/aws/core/auth/AWSAuthSigner.h
@@ -11,5 +11,4 @@
 #include <aws/core/auth/signer/AWSAuthV4Signer.h>
 #include <aws/core/auth/signer/AWSAuthEventStreamV4Signer.h>
 #include <aws/core/auth/signer/AWSNullSigner.h>
-
 // This is a header that represents old legacy all-in-one header to maintain backward compatibility
diff --git a/src/aws-cpp-sdk-core/include/smithy/client/AwsSmithyClient.h b/src/aws-cpp-sdk-core/include/smithy/client/AwsSmithyClient.h
index b5eeb8f7d12..b6e22084fc1 100644
--- a/src/aws-cpp-sdk-core/include/smithy/client/AwsSmithyClient.h
+++ b/src/aws-cpp-sdk-core/include/smithy/client/AwsSmithyClient.h
@@ -188,7 +188,7 @@ namespace client
                 }
             }
 
-            Aws::Vector<AuthSchemeOption> authSchemeOptions = m_authSchemeResolver->resolveAuthScheme(identityParams);
+            Aws::Vector<AuthSchemeOption> authSchemeOptions = ctx.m_authResolver == nullptr ? m_authSchemeResolver->resolveAuthScheme(identityParams) : ctx.m_authResolver->resolveAuthScheme(identityParams);
 
             auto authSchemeOptionIt = std::find_if(authSchemeOptions.begin(), authSchemeOptions.end(),
                                                    [this](const AuthSchemeOption& opt)
diff --git a/src/aws-cpp-sdk-core/include/smithy/client/AwsSmithyClientAsyncRequestContext.h b/src/aws-cpp-sdk-core/include/smithy/client/AwsSmithyClientAsyncRequestContext.h
index 3f7ad64f122..cf12dc8088d 100644
--- a/src/aws-cpp-sdk-core/include/smithy/client/AwsSmithyClientAsyncRequestContext.h
+++ b/src/aws-cpp-sdk-core/include/smithy/client/AwsSmithyClientAsyncRequestContext.h
@@ -12,6 +12,7 @@
 #include <smithy/Smithy_EXPORTS.h>
 #include <smithy/identity/auth/AuthSchemeOption.h>
 #include <smithy/interceptor/InterceptorContext.h>
+#include <smithy/identity/auth/AuthSchemeResolverBase.h>
 
 namespace smithy
 {
@@ -71,18 +72,21 @@ namespace smithy
             std::shared_ptr<Aws::Utils::Threading::Executor> m_pExecutor;
             std::shared_ptr<interceptor::InterceptorContext> m_interceptorContext;
             std::shared_ptr<smithy::AwsIdentity> m_awsIdentity;
+            std::shared_ptr<smithy::AuthSchemeResolverBase<>> m_authResolver;
 
             AwsSmithyClientAsyncRequestContext() = default;
 
             AwsSmithyClientAsyncRequestContext(
                 Aws::AmazonWebServiceRequest const * const request,
                 const char* requestName,
-                std::shared_ptr<Aws::Utils::Threading::Executor> pExecutor):
+                std::shared_ptr<Aws::Utils::Threading::Executor> pExecutor,
+                std::shared_ptr<smithy::AuthSchemeResolverBase<>> authResolver):
                 m_invocationId{Aws::Utils::UUID::PseudoRandomUUID()},
                 m_pRequest{request},
                 m_requestName{requestName ? requestName : m_pRequest ?  m_pRequest->GetServiceRequestName() : ""},
                 m_retryCount{0},
-                m_pExecutor{pExecutor}
+                m_pExecutor{pExecutor},
+                m_authResolver{authResolver}
             {
 
             }
diff --git a/src/aws-cpp-sdk-core/include/smithy/identity/auth/built-in/NoAuthScheme.h b/src/aws-cpp-sdk-core/include/smithy/identity/auth/built-in/NoAuthScheme.h
new file mode 100644
index 00000000000..18d6f38389a
--- /dev/null
+++ b/src/aws-cpp-sdk-core/include/smithy/identity/auth/built-in/NoAuthScheme.h
@@ -0,0 +1,85 @@
+/**
+* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+#pragma once
+
+#include <smithy/identity/auth/AuthScheme.h>
+#include <smithy/identity/auth/built-in/NoAuthSchemeOption.h>
+
+#include <smithy/identity/identity/AwsCredentialIdentityBase.h>
+#include <smithy/identity/signer/built-in/NoAuthSigner.h>
+#include <smithy/identity/resolver/built-in/NoAuthIdentityResolver.h>
+
+namespace smithy {
+    constexpr char NOAUTH[] = "smithy.api#noAuth";
+
+    class NoAuthScheme : public AuthScheme<AwsCredentialIdentityBase>
+    {
+    public:
+        using AwsCredentialIdentityResolverT = IdentityResolverBase<IdentityT>;
+        using AwsCredentialSignerT = AwsSignerBase<IdentityT>;
+
+        explicit NoAuthScheme()
+            : AuthScheme(NOAUTH),
+            m_signer{Aws::MakeShared<AwsNoAuthSigner>("NoAuthScheme")},
+            m_identityResolver{Aws::MakeShared<NoAuthIdentityResolver>("NoAuthScheme")}
+        {
+            assert(m_signer);
+            assert(m_identityResolver);
+        }
+
+        explicit NoAuthScheme(std::shared_ptr<AwsCredentialIdentityResolverT> identityResolver,
+                                    const Aws::String& serviceName,
+                                    const Aws::String& region)
+              : AuthScheme(NOAUTH),
+              m_signer{Aws::MakeShared<AwsNoAuthSigner>("NoAuthScheme")},
+              m_identityResolver{Aws::MakeShared<NoAuthIdentityResolver>("NoAuthScheme")}
+          {
+            AWS_UNREFERENCED_PARAM(identityResolver);
+            AWS_UNREFERENCED_PARAM(serviceName);
+            AWS_UNREFERENCED_PARAM(region);
+            assert(m_signer);
+            assert(m_identityResolver);
+          }
+
+        explicit NoAuthScheme(const Aws::String& serviceName,
+                                  const Aws::String& region)
+            : NoAuthScheme(nullptr, serviceName, region)
+        {
+          assert(m_signer);
+          assert(m_identityResolver);
+        }
+
+        //legacy constructors
+        explicit NoAuthScheme(std::shared_ptr<AwsCredentialIdentityResolverT> identityResolver, const Aws::String& serviceName, const Aws::String& region, Aws::Client::AWSAuthV4Signer::PayloadSigningPolicy policy, bool urlEscape)
+            :  AuthScheme(NOAUTH),
+            m_signer{Aws::MakeShared<AwsNoAuthSigner>("NoAuthScheme")},
+            m_identityResolver{Aws::MakeShared<NoAuthIdentityResolver>("NoAuthScheme")}
+        {
+          AWS_UNREFERENCED_PARAM(identityResolver);
+          AWS_UNREFERENCED_PARAM(serviceName);
+          AWS_UNREFERENCED_PARAM(region);
+          AWS_UNREFERENCED_PARAM(policy);
+          AWS_UNREFERENCED_PARAM(urlEscape);
+          assert(m_signer);
+          assert(m_identityResolver);
+        }
+
+        virtual ~NoAuthScheme() = default;
+
+        std::shared_ptr<AwsCredentialIdentityResolverT> identityResolver() override
+        {
+            return m_identityResolver;
+        }
+
+        std::shared_ptr<AwsCredentialSignerT> signer() override
+        {
+            return m_signer;
+        }
+
+    protected:
+        std::shared_ptr<AwsCredentialSignerT> m_signer;
+        std::shared_ptr<AwsCredentialIdentityResolverT> m_identityResolver;
+    };
+}
\ No newline at end of file
diff --git a/src/aws-cpp-sdk-core/include/smithy/identity/auth/built-in/NoAuthSchemeOption.h b/src/aws-cpp-sdk-core/include/smithy/identity/auth/built-in/NoAuthSchemeOption.h
new file mode 100644
index 00000000000..463a1395755
--- /dev/null
+++ b/src/aws-cpp-sdk-core/include/smithy/identity/auth/built-in/NoAuthSchemeOption.h
@@ -0,0 +1,15 @@
+/**
+* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+#pragma once
+
+#include <smithy/Smithy_EXPORTS.h>
+#include <smithy/identity/auth/AuthSchemeOption.h>
+
+namespace smithy {
+    struct NoAuthSchemeOption
+    {
+        static SMITHY_API AuthSchemeOption noAuthSchemeOption;
+    };
+}
\ No newline at end of file
diff --git a/src/aws-cpp-sdk-core/include/smithy/identity/identity/impl/AwsBearerTokenIdentityImpl.h b/src/aws-cpp-sdk-core/include/smithy/identity/identity/impl/AwsBearerTokenIdentityImpl.h
index b9ca17748f2..926766df73e 100644
--- a/src/aws-cpp-sdk-core/include/smithy/identity/identity/impl/AwsBearerTokenIdentityImpl.h
+++ b/src/aws-cpp-sdk-core/include/smithy/identity/identity/impl/AwsBearerTokenIdentityImpl.h
@@ -8,9 +8,9 @@
 #include <smithy/identity/identity/AwsBearerTokenIdentity.h>
 
 namespace smithy {
-const Aws::String &AwsBearerTokenIdentity::token() const { return m_token; }
+inline const Aws::String &AwsBearerTokenIdentity::token() const { return m_token; }
 
-Aws::Crt::Optional<AwsIdentity::DateTime>
+inline Aws::Crt::Optional<AwsIdentity::DateTime>
 AwsBearerTokenIdentity::expiration() const
 {
     return m_expiration;
diff --git a/src/aws-cpp-sdk-core/include/smithy/identity/resolver/built-in/NoAuthIdentityResolver.h b/src/aws-cpp-sdk-core/include/smithy/identity/resolver/built-in/NoAuthIdentityResolver.h
new file mode 100644
index 00000000000..f64ad3b8ac2
--- /dev/null
+++ b/src/aws-cpp-sdk-core/include/smithy/identity/resolver/built-in/NoAuthIdentityResolver.h
@@ -0,0 +1,30 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+#pragma once
+
+#include <smithy/identity/resolver/AwsCredentialIdentityResolver.h>
+
+#include <aws/core/auth/AWSCredentials.h>
+
+namespace smithy {
+    /**
+     * A no-auth identity resolver that returns empty credentials for unauthenticated requests
+     */
+    class NoAuthIdentityResolver : public AwsCredentialIdentityResolver {
+    public:
+        NoAuthIdentityResolver() = default;
+        virtual ~NoAuthIdentityResolver() = default;
+
+        ResolveIdentityFutureOutcome getIdentity(const IdentityProperties& identityProperties, const AdditionalParameters& additionalParameters) override
+        {
+            AWS_UNREFERENCED_PARAM(identityProperties);
+            AWS_UNREFERENCED_PARAM(additionalParameters);
+
+            auto smithyCreds = Aws::MakeUnique<AwsCredentialIdentity>("NoAuthIdentityResolver");
+            // Return empty identity for no-auth scenarios
+            return {std::move(smithyCreds)};
+        }
+    };
+}
\ No newline at end of file
diff --git a/src/aws-cpp-sdk-core/include/smithy/identity/signer/built-in/NoAuthSigner.h b/src/aws-cpp-sdk-core/include/smithy/identity/signer/built-in/NoAuthSigner.h
new file mode 100644
index 00000000000..63418efba88
--- /dev/null
+++ b/src/aws-cpp-sdk-core/include/smithy/identity/signer/built-in/NoAuthSigner.h
@@ -0,0 +1,51 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+#pragma once
+
+#include <smithy/identity/signer/AwsSignerBase.h>
+#include <smithy/identity/identity/AwsCredentialIdentityBase.h>
+#include <aws/core/auth/signer/AWSNullSigner.h>
+
+namespace smithy {
+    /**
+     * A smithy NoAuth signer wrapper on top of legacy SDK null signer
+     */
+    class AwsNoAuthSigner : public AwsSignerBase<AwsCredentialIdentityBase> {
+    public:
+        explicit AwsNoAuthSigner()
+            : legacySigner()
+        {
+        }
+
+        SigningFutureOutcome sign(std::shared_ptr<HttpRequest> httpRequest, const AwsCredentialIdentityBase& identity, SigningProperties properties) override
+        {
+            AWS_UNREFERENCED_PARAM(identity);
+            AWS_UNREFERENCED_PARAM(properties);
+            assert(httpRequest);
+            bool success = legacySigner.SignRequest(*httpRequest);
+            if (success)
+            {
+                return SigningFutureOutcome(std::move(httpRequest));
+            }
+            return SigningError(Aws::Client::CoreErrors::MEMORY_ALLOCATION, "", "Failed to sign the request with noauth", false);
+        }
+
+        SigningFutureOutcome presign(std::shared_ptr<HttpRequest> httpRequest, const AwsCredentialIdentityBase& identity, SigningProperties properties, const Aws::String& region, const Aws::String& serviceName, long long expirationTimeInSeconds) override
+        {
+            AWS_UNREFERENCED_PARAM(httpRequest);
+            AWS_UNREFERENCED_PARAM(identity);
+            AWS_UNREFERENCED_PARAM(properties);
+            AWS_UNREFERENCED_PARAM(region);
+            AWS_UNREFERENCED_PARAM(serviceName);
+            AWS_UNREFERENCED_PARAM(expirationTimeInSeconds);
+            return SigningFutureOutcome(std::move(httpRequest));
+        }
+
+        virtual ~AwsNoAuthSigner() = default;
+
+    protected:
+        Aws::Client::AWSNullSigner legacySigner;
+    };
+}
\ No newline at end of file
diff --git a/src/aws-cpp-sdk-core/source/config/AWSConfigFileProfileConfigLoader.cpp b/src/aws-cpp-sdk-core/source/config/AWSConfigFileProfileConfigLoader.cpp
index 083f92d80c4..5e286926bd6 100644
--- a/src/aws-cpp-sdk-core/source/config/AWSConfigFileProfileConfigLoader.cpp
+++ b/src/aws-cpp-sdk-core/source/config/AWSConfigFileProfileConfigLoader.cpp
@@ -42,7 +42,6 @@ namespace Aws
         static const char SSO_SESSION_SECTION[]              = "sso-session";
         static const char SERVICES_SECTION[]                 = "services";
         static const char ENDPOINT_URL_KEY[]                 = "endpoint_url";
-        static const char IGNORE_CONFIGURED_ENDPOINT_URLS_KEY[] = "ignore_configured_endpoint_urls";
         static const char DEFAULTS_MODE_KEY[]                = "defaults_mode";
         static const char EQ                                 = '=';
         static const char LEFT_BRACKET                       = '[';
diff --git a/src/aws-cpp-sdk-core/source/smithy/client/AwsSmithyClientBase.cpp b/src/aws-cpp-sdk-core/source/smithy/client/AwsSmithyClientBase.cpp
index 1bc123eb8d9..e799ab5a5a1 100644
--- a/src/aws-cpp-sdk-core/source/smithy/client/AwsSmithyClientBase.cpp
+++ b/src/aws-cpp-sdk-core/source/smithy/client/AwsSmithyClientBase.cpp
@@ -22,7 +22,7 @@
 #include <aws/core/utils/threading/Executor.h>
 #include <aws/core/utils/threading/SameThreadExecutor.h>
 #include <aws/crt/Variant.h>
-
+#include <smithy/identity/auth/built-in/GenericAuthSchemeResolver.h>
 
 using namespace smithy::client;
 using namespace smithy::interceptor;
@@ -201,9 +201,10 @@ bool AwsSmithyClientBase::ResolveIdentityAuth(
       responseHandler(std::move(identityOutcome));
       return false;
     }
-    
     pRequestCtx->m_awsIdentity = std::move(identityOutcome.GetResultWithOwnership());
 
+
+
     // get endpoint params from operation context
     const auto contextEndpointParameters = this->GetContextEndpointParameters(*pRequestCtx);
 
@@ -254,9 +255,9 @@ void AwsSmithyClientBase::MakeRequestAsync(Aws::AmazonWebServiceRequest const* c
         AWS_LOGSTREAM_FATAL(AWS_SMITHY_CLIENT_LOG, "Unable to continue AWSClient request: response handler is missing!");
         return;
     }
-
+    auto authResolver = request->GetRequestSpecificSupportedAuth().empty() ? nullptr : Aws::MakeShared<GenericAuthSchemeResolver<>>(AWS_SMITHY_CLIENT_LOG, request->GetRequestSpecificSupportedAuth());
     std::shared_ptr<AwsSmithyClientAsyncRequestContext> pRequestCtx =
-        Aws::MakeShared<AwsSmithyClientAsyncRequestContext>(AWS_SMITHY_CLIENT_LOG, request, requestName, pExecutor );
+        Aws::MakeShared<AwsSmithyClientAsyncRequestContext>(AWS_SMITHY_CLIENT_LOG, request, requestName, pExecutor, authResolver);
     if (!pRequestCtx)
     {
         AWS_LOGSTREAM_ERROR(AWS_SMITHY_CLIENT_LOG, "Failed to allocate an AwsSmithyClientAsyncRequestContext under a shared ptr");
@@ -702,8 +703,9 @@ AwsSmithyClientBase::ResolveEndpointOutcome AwsSmithyClientBase::ResolveEndpoint
     {
         outcome = std::move(asyncOutcome);
     };
-   
-    std::shared_ptr<AwsSmithyClientAsyncRequestContext> pRequestCtx = Aws::MakeShared<AwsSmithyClientAsyncRequestContext>(AWS_SMITHY_CLIENT_LOG, request, requestName, nullptr);
+
+    auto authResolver = request->GetRequestSpecificSupportedAuth().empty() ? nullptr : Aws::MakeShared<GenericAuthSchemeResolver<>>(AWS_SMITHY_CLIENT_LOG, request->GetRequestSpecificSupportedAuth());
+    std::shared_ptr<AwsSmithyClientAsyncRequestContext> pRequestCtx = Aws::MakeShared<AwsSmithyClientAsyncRequestContext>(AWS_SMITHY_CLIENT_LOG, request, requestName, nullptr, authResolver);
     if (!pRequestCtx)
     {
         AWS_LOGSTREAM_ERROR(AWS_SMITHY_CLIENT_LOG, "Failed to allocate an AwsSmithyClientAsyncRequestContext under a shared ptr");
diff --git a/src/aws-cpp-sdk-core/source/smithy/identity/AuthSchemeOption.cpp b/src/aws-cpp-sdk-core/source/smithy/identity/AuthSchemeOption.cpp
index db145fc1931..35c31a46de6 100644
--- a/src/aws-cpp-sdk-core/source/smithy/identity/AuthSchemeOption.cpp
+++ b/src/aws-cpp-sdk-core/source/smithy/identity/AuthSchemeOption.cpp
@@ -4,7 +4,9 @@
   */
 #include <smithy/identity/auth/built-in/SigV4AuthSchemeOption.h>
 #include <smithy/identity/auth/built-in/SigV4aAuthSchemeOption.h>
+#include <smithy/identity/auth/built-in/NoAuthSchemeOption.h>
 using namespace smithy;
 
 AuthSchemeOption SigV4AuthSchemeOption::sigV4AuthSchemeOption = AuthSchemeOption("aws.auth#sigv4");
 AuthSchemeOption SigV4aAuthSchemeOption::sigV4aAuthSchemeOption = AuthSchemeOption("aws.auth#sigv4a");
+AuthSchemeOption NoAuthSchemeOption::noAuthSchemeOption = AuthSchemeOption("smithy.api#noAuth");
diff --git a/tests/aws-cpp-sdk-core-tests/smithy/client/SmithyClientTest.cpp b/tests/aws-cpp-sdk-core-tests/smithy/client/SmithyClientTest.cpp
index 4b14cfd5418..c2b138dd1f9 100644
--- a/tests/aws-cpp-sdk-core-tests/smithy/client/SmithyClientTest.cpp
+++ b/tests/aws-cpp-sdk-core-tests/smithy/client/SmithyClientTest.cpp
@@ -550,6 +550,135 @@ TEST_F(SmithyClientTest, testBearerPreference) {
               "Bearer testBearerToken");
 }
 
+TEST_F(SmithyClientTest, testOperationOnlySupportsSigV4aPreferenceBearer) {
+
+    std::shared_ptr<MyServiceAuthSchemeResolver> authSchemeResolver = Aws::MakeShared<smithy::GenericAuthSchemeResolver<> >(ALLOCATION_TAG, Aws::Vector<smithy::AuthSchemeOption>({smithy::SigV4aAuthSchemeOption::sigV4aAuthSchemeOption, smithy::SigV4AuthSchemeOption::sigV4AuthSchemeOption, smithy::BearerTokenAuthSchemeOption::bearerTokenAuthSchemeOption}));
+
+    Aws::UnorderedMap<Aws::String, SigVariant> authSchemesMap;
+
+    //add mock credentials provider for the test to the credentials provider chain
+    AddCredentialsProvider(Aws::MakeShared<TestCredentialsProvider>("TestCredentialsProviderChain"));
+
+    //create resolver with the credentials provider chain
+    auto credentialsResolver = Aws::MakeShared<smithy::DefaultAwsCredentialIdentityResolver>(ALLOCATION_TAG, credsProviderChain);
+
+    Aws::String key{smithy::SigV4aAuthSchemeOption::sigV4aAuthSchemeOption.schemeId};
+    SigVariant val{smithy::SigV4aAuthScheme( credentialsResolver, "MyService", "us-west-2")};
+
+    authSchemesMap.emplace(key, val);
+
+    Aws::String key2{smithy::SigV4AuthSchemeOption::sigV4AuthSchemeOption.schemeId};
+    SigVariant val2{smithy::SigV4AuthScheme( credentialsResolver, "MyService", "us-west-2")};
+
+    authSchemesMap.emplace(key2, val2);
+
+    Aws::String key3{smithy::BearerTokenAuthSchemeOption::bearerTokenAuthSchemeOption.schemeId};
+    SigVariant val3{smithy::BearerTokenAuthScheme( Aws::MakeShared<TestAwsBearerTokenIdentityResolver>(ALLOCATION_TAG), "MyService", "us-west-2")};
+
+    authSchemesMap.emplace(key3, val3);
+
+    clientConfig.authPreferences = {smithy::BEARER_PREFERENCE};
+    std::shared_ptr<TestClient> ptr = Aws::MakeShared<TestClient>(
+        ALLOCATION_TAG,
+        clientConfig,
+        "MyService",
+        httpClient,
+        errorMarshaller,
+        endPointProvider,
+        authSchemeResolver,
+        authSchemesMap);
+    smithy::client::AwsSmithyClientAsyncRequestContext ctx;
+    ctx.m_pRequest = nullptr;
+
+    //Operation/Request only supports sigv4a while client supports all 3
+    std::shared_ptr<MyServiceAuthSchemeResolver> requestAuthSchemeResolver = Aws::MakeShared<smithy::GenericAuthSchemeResolver<> >(ALLOCATION_TAG, Aws::Vector<smithy::AuthSchemeOption>({smithy::SigV4aAuthSchemeOption::sigV4aAuthSchemeOption }));
+    ctx.m_authResolver = requestAuthSchemeResolver;
+
+    auto res = ptr->SelectAuthSchemeOption(ctx);
+    EXPECT_EQ(res.IsSuccess(), true);
+    EXPECT_EQ(res.GetResult().schemeId, key);
+    ctx.m_authSchemeOption = res.GetResultWithOwnership();
+    ctx.m_awsIdentity = ptr->ResolveIdentity(ctx).GetResultWithOwnership();
+
+    Aws::String uri{"https://treasureisland-cb93079d-24a0-4862-8es2-88456ead.xyz.amazonaws.com"};
+
+    std::shared_ptr<Aws::Http::HttpRequest> httpRequest(Aws::Http::CreateHttpRequest(uri, Aws::Http::HttpMethod::HTTP_GET, Aws::Utils::Stream::DefaultResponseStreamFactoryMethod));
+
+    auto res2 = ptr->SignRequest(httpRequest, ctx);
+
+    EXPECT_EQ(res2.IsSuccess(), true);
+    EXPECT_TRUE(!res2.GetResult()->GetSigningAccessKey().empty());
+    EXPECT_FALSE(res2.GetResult()->GetUri().GetURIString(true).empty());
+}
+
+TEST_F(SmithyClientTest, testOperationOnlySupportsBearerPreferenceSigV4a) {
+
+    std::shared_ptr<MyServiceAuthSchemeResolver> authSchemeResolver = Aws::MakeShared<smithy::GenericAuthSchemeResolver<> >(ALLOCATION_TAG, Aws::Vector<smithy::AuthSchemeOption>({smithy::SigV4aAuthSchemeOption::sigV4aAuthSchemeOption, smithy::SigV4AuthSchemeOption::sigV4AuthSchemeOption, smithy::BearerTokenAuthSchemeOption::bearerTokenAuthSchemeOption}));
+
+    Aws::UnorderedMap<Aws::String, SigVariant> authSchemesMap;
+
+    //add mock credentials provider for the test to the credentials provider chain
+    AddCredentialsProvider(Aws::MakeShared<TestCredentialsProvider>("TestCredentialsProviderChain"));
+
+    //create resolver with the credentials provider chain
+    auto credentialsResolver = Aws::MakeShared<smithy::DefaultAwsCredentialIdentityResolver>(ALLOCATION_TAG, credsProviderChain);
+
+    Aws::String key{smithy::BearerTokenAuthSchemeOption::bearerTokenAuthSchemeOption.schemeId};
+    SigVariant val{smithy::BearerTokenAuthScheme( Aws::MakeShared<TestAwsBearerTokenIdentityResolver>(ALLOCATION_TAG), "MyService", "us-west-2")};
+
+    authSchemesMap.emplace(key, val);
+
+    Aws::String key2{smithy::SigV4aAuthSchemeOption::sigV4aAuthSchemeOption.schemeId};
+    SigVariant val2{smithy::SigV4aAuthScheme( credentialsResolver, "MyService", "us-west-2")};
+
+    authSchemesMap.emplace(key2, val2);
+
+    Aws::String key3{smithy::SigV4AuthSchemeOption::sigV4AuthSchemeOption.schemeId};
+    SigVariant val3{smithy::SigV4AuthScheme( credentialsResolver, "MyService", "us-west-2")};
+
+    authSchemesMap.emplace(key3, val3);
+
+    clientConfig.authPreferences = {smithy::SIGV4A_PREFERENCE};
+    std::shared_ptr<TestClient> ptr = Aws::MakeShared<TestClient>(
+        ALLOCATION_TAG,
+        clientConfig,
+        "MyService",
+        httpClient,
+        errorMarshaller,
+        endPointProvider,
+        authSchemeResolver,
+        authSchemesMap);
+    smithy::client::AwsSmithyClientAsyncRequestContext ctx;
+    ctx.m_pRequest = nullptr;
+
+    //Operation/Request only supports sigv4a while client supports all 3
+    std::shared_ptr<MyServiceAuthSchemeResolver> requestAuthSchemeResolver = Aws::MakeShared<smithy::GenericAuthSchemeResolver<> >(ALLOCATION_TAG, Aws::Vector<smithy::AuthSchemeOption>({smithy::BearerTokenAuthSchemeOption::bearerTokenAuthSchemeOption }));
+    ctx.m_authResolver = requestAuthSchemeResolver;
+
+    auto res = ptr->SelectAuthSchemeOption(ctx);
+    EXPECT_EQ(res.IsSuccess(), true);
+    EXPECT_EQ(res.GetResult().schemeId, key);
+    ctx.m_authSchemeOption = res.GetResultWithOwnership();
+    ctx.m_awsIdentity = ptr->ResolveIdentity(ctx).GetResultWithOwnership();
+
+    Aws::String uri{
+      "https://"
+      "treasureisland-cb93079d-24a0-4862-8es2-88456ead.xyz.amazonaws.com"};
+
+    std::shared_ptr<Aws::Http::HttpRequest> httpRequest(
+        Aws::Http::CreateHttpRequest(
+            uri, Aws::Http::HttpMethod::HTTP_GET,
+            Aws::Utils::Stream::DefaultResponseStreamFactoryMethod));
+
+    auto res2 = ptr->SignRequest(httpRequest, ctx);
+
+    EXPECT_EQ(res2.IsSuccess(), true);
+
+    EXPECT_TRUE(!res2.GetResult()->GetHeaderValue("authorization").empty());
+    EXPECT_EQ(res2.GetResult()->GetHeaderValue("authorization"),
+              "Bearer testBearerToken");
+}
+
 struct SampleConfiguration: public Aws::Client::ClientConfiguration {
   Aws::String localToService{"whatever"};
 };
diff --git a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/c2j/C2jOperation.java b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/c2j/C2jOperation.java
index 88babf19075..b7b96b3262d 100644
--- a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/c2j/C2jOperation.java
+++ b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/c2j/C2jOperation.java
@@ -18,6 +18,7 @@ public class C2jOperation {
     private String authtype;
     private String authorizer;
     private C2jHttp http;
+    List<String> auth;
     private C2jShapeMember input;
     private C2jShapeMember output;
     private List<C2jError> errors;
diff --git a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/codegeneration/Operation.java b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/codegeneration/Operation.java
index c2276386c11..1623c099b11 100644
--- a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/codegeneration/Operation.java
+++ b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/codegeneration/Operation.java
@@ -95,4 +95,18 @@ public boolean hasRequest() {
     public void addRequest(final ShapeMember request) {
         this.request = request;
     }
+
+    public boolean hasSigV4Auth() { return auth != null && auth.contains("aws.auth#sigv4"); }
+
+    public boolean hasSigV4aAuth() {
+        return auth != null && auth.contains("aws.auth#sigv4a");
+    }
+
+    public boolean hasNoAuth() {
+        return auth != null && auth.contains("smithy.api#noAuth");
+    }
+
+    public boolean hasBearerAuth() {
+        return auth != null && auth.contains("smithy.api#httpBearerAuth");
+    }
 }
diff --git a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/codegeneration/ServiceModel.java b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/codegeneration/ServiceModel.java
index 0a0e00580b4..ec8beba134b 100644
--- a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/codegeneration/ServiceModel.java
+++ b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/codegeneration/ServiceModel.java
@@ -51,25 +51,29 @@ public boolean hasSigV4Auth() {
         if(metadata.getSignatureVersion().equals("v4") || metadata.getSignatureVersion().equals("s3v4")) {
             return true;
         }
-        return operations.values().parallelStream().anyMatch(operation -> operation.getSignerName().equals("Aws::Auth::SIGV4_SIGNER"));
+        return authSchemes.contains("aws.auth#sigv4") || operations.values().parallelStream().anyMatch(operation -> operation.getSignerName().equals("Aws::Auth::SIGV4_SIGNER") || operation.hasSigV4Auth());
     }
 
     public boolean hasSigV4aAuth() {
-        return operations.values().parallelStream().anyMatch(operation -> operation.getSignerName().equals("Aws::Auth::ASYMMETRIC_SIGV4_SIGNER"));
+        return authSchemes.contains("aws.auth#sigv4a") || operations.values().parallelStream().anyMatch(operation -> operation.getSignerName().equals("Aws::Auth::SIGV4A_SIGNER") || operation.hasSigV4aAuth());
+    }
+
+    public boolean hasNoAuth() {
+        return authSchemes.contains("smithy.api#noAuth") || operations.values().parallelStream().anyMatch(operation -> operation.getSignerName().equals("Aws::Auth::NULL_SIGNER") || operation.hasNoAuth());
     }
 
     public boolean hasBearerAuth() {
         if(metadata.getSignatureVersion().equals("bearer")) {
             return true;
         }
-        return operations.values().parallelStream().anyMatch(operation -> operation.getSignerName().equals("Aws::Auth::BEARER_SIGNER"));
+        return authSchemes.contains("smithy.api#httpBearerAuth") || operations.values().parallelStream().anyMatch(operation -> operation.getSignerName().equals("Aws::Auth::BEARER_SIGNER") || operation.hasBearerAuth());
     }
 
     public boolean hasOnlyBearerAuth() {
         if(!metadata.getSignatureVersion().equals("bearer")) {
             return false;
         }
-        return operations.values().parallelStream().allMatch(operation -> operation.getSignerName().equals("Aws::Auth::BEARER_SIGNER"));
+        return authSchemes.size() == 1 && operations.values().parallelStream().allMatch(operation -> operation.getSignerName().equals("Aws::Auth::BEARER_SIGNER"));
     }
 
     public boolean hasServiceSpecificClientConfig() {
diff --git a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/codegeneration/cpp/CppViewHelper.java b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/codegeneration/cpp/CppViewHelper.java
index d919b074ab9..1782394e500 100644
--- a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/codegeneration/cpp/CppViewHelper.java
+++ b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/codegeneration/cpp/CppViewHelper.java
@@ -5,9 +5,8 @@
 
 package com.amazonaws.util.awsclientgenerator.domainmodels.codegeneration.cpp;
 
-import com.amazonaws.util.awsclientgenerator.domainmodels.codegeneration.Metadata;
-import com.amazonaws.util.awsclientgenerator.domainmodels.codegeneration.Shape;
-import com.amazonaws.util.awsclientgenerator.domainmodels.codegeneration.ShapeMember;
+import com.amazonaws.util.awsclientgenerator.domainmodels.codegeneration.*;
+import com.amazonaws.util.awsclientgenerator.generators.cpp.CppClientGenerator;
 import com.amazonaws.util.awsclientgenerator.transform.CoreErrors;
 import com.google.common.base.CaseFormat;
 import com.google.common.collect.ImmutableMap;
@@ -33,6 +32,7 @@ public class CppViewHelper {
     private static final Map<String, String> CORAL_PROTOCOL_TO_CONTENT_TYPE_MAPPING = new HashMap<>();
     private static final Map<String, String> CORAL_PROTOCOL_TO_PAYLOAD_TYPE_MAPPING = new HashMap<>();
     private static final Map<String, String> C2J_TIMESTAMP_FORMAT_TO_CPP_DATE_TIME_FORMAT = new HashMap<>();
+    private static final Map<String, String> CORAL_AUTH_TO_SCHEME_MAPPING = new HashMap<>();
 
     private static final Set<String> FORBIDDEN_FUNCTION_NAMES =
             ImmutableSet.<String>builder()
@@ -122,6 +122,15 @@ public class CppViewHelper {
 
         C2J_TIMESTAMP_FORMAT_TO_CPP_DATE_TIME_FORMAT.put("rfc822", "RFC822");
         C2J_TIMESTAMP_FORMAT_TO_CPP_DATE_TIME_FORMAT.put("iso8601", "ISO_8601");
+
+        CORAL_AUTH_TO_SCHEME_MAPPING.put("aws.auth#sigv4", "smithy::SigV4AuthSchemeOption::sigV4AuthSchemeOption");
+        CORAL_AUTH_TO_SCHEME_MAPPING.put("aws.auth#sigv4a", "smithy::SigV4aAuthSchemeOption::sigV4aAuthSchemeOption");
+        CORAL_AUTH_TO_SCHEME_MAPPING.put("smithy.api#httpBearerAuth", "smithy::BearerTokenAuthSchemeOption::bearerTokenAuthSchemeOption");
+        CORAL_AUTH_TO_SCHEME_MAPPING.put("bearer", "smithy::BearerTokenAuthSchemeOption::bearerTokenAuthSchemeOption");
+        CORAL_AUTH_TO_SCHEME_MAPPING.put("v4", "smithy::SigV4AuthSchemeOption::sigV4AuthSchemeOption");
+        CORAL_AUTH_TO_SCHEME_MAPPING.put("v2", "smithy::SigV4AuthSchemeOption::sigV4AuthSchemeOption");
+        CORAL_AUTH_TO_SCHEME_MAPPING.put("sigv4-s3express", "S3ExpressSigV4AuthSchemeOption::s3ExpressSigV4AuthSchemeOption");
+        CORAL_AUTH_TO_SCHEME_MAPPING.put("smithy.api#noAuth", "smithy::NoAuthSchemeOption::noAuthSchemeOption");
     }
 
     private static final ImmutableMap<String, String> EVENT_STREAM_HEADER_ACCESSORS = ImmutableMap.of(
@@ -609,4 +618,19 @@ public static String getEventStreamHeaderValue(final String variableName, final
         }
         return value;
     }
+
+    public static String computeAuthSchemes(final Operation op) {
+        if(op.getAuth() == null || op.getAuth().isEmpty()) {
+            return "";
+        }
+        return op.getAuth().stream()
+                .map(key -> {
+                    if (CORAL_AUTH_TO_SCHEME_MAPPING.containsKey(key)) {
+                        return CORAL_AUTH_TO_SCHEME_MAPPING.get(key);
+                    }
+                    else {
+                        throw new RuntimeException(String.format("Unknown auth scheme (%s) for operation: %s", op.getName(), key));
+                    }
+                }).collect(Collectors.joining(","));
+    }
 }
diff --git a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/CborCppClientGenerator.java b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/CborCppClientGenerator.java
index 737c3c989ad..30a999a3c03 100644
--- a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/CborCppClientGenerator.java
+++ b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/CborCppClientGenerator.java
@@ -117,6 +117,8 @@ protected SdkFileEntry generateModelSourceFile(ServiceModel serviceModel, Map.En
             Template template;
             VelocityContext context = createContext(serviceModel);
 
+            context.put("operation", serviceModel.getOperationForRequestShapeName(shape.getName()));
+
             if (shape.isRequest() && (shape.hasStreamMembers() || shape.hasEventStreamMembers())) {
                 if (shape.hasEventStreamMembers()) {
                     HashMap<String, String> headersMap = new HashMap<>(10);
@@ -146,7 +148,6 @@ else if (shape.isResult()) {
                 template = velocityEngine.getTemplate("/com/amazonaws/util/awsclientgenerator/velocity/cpp/cbor/CborSubObjectSource.vm", StandardCharsets.UTF_8.name());
             }
 
-            context.put("operation", serviceModel.getOperationForRequestShapeName(shape.getName()));
             context.put("shape", shape);
             context.put("typeInfo", new CppShapeInformation(shape, serviceModel));
             context.put("CppViewHelper", CppCborViewHelper.class);
diff --git a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/CppClientGenerator.java b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/CppClientGenerator.java
index 3e0fb7803a7..edefbb2045a 100644
--- a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/CppClientGenerator.java
+++ b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/CppClientGenerator.java
@@ -728,6 +728,9 @@ protected SdkFileEntry generateClientSmithyHeaderFile(final ServiceModel service
         context.put("CppViewHelper", CppViewHelper.class);
         context.put("RequestlessOperations", requestlessOperations);
         selectAuthschemeResolver(serviceModel, context);
+        List<String> allAuthSchemes =  getUpdatedAuthSchemesFromOperations(serviceModel);
+        context.put("AuthSchemeVariants", allAuthSchemes.stream().map(this::mapAuthSchemes).filter(scheme -> !scheme.isEmpty()).collect(Collectors.joining(",")));
+
         String fileName = String.format("include/aws/%s/%sClient.h", serviceModel.getMetadata().getProjectName(),
                 serviceModel.getMetadata().getClassNamePrefix());
 
@@ -746,8 +749,6 @@ private void selectAuthschemeResolver(final ServiceModel serviceModel, VelocityC
         {
             throw new RuntimeException(String.format("authSchemes '%s'",serviceModel.getAuthSchemes().stream().collect(Collectors.toList())));
         }
-        context.put("AuthSchemeVariants", serviceModel.getAuthSchemes().stream().map(this::mapAuthSchemes).collect(Collectors.joining(",")));
-        context.put("AuthSchemeOptions", serviceModel.getAuthSchemes().stream().map(this::mapAuthSchemeOptions).collect(Collectors.joining(",")));
     }
 
     protected SdkFileEntry GenerateSmithyClientSourceFile(final ServiceModel serviceModel, int i, Optional<String> templateFile) {
@@ -758,7 +759,12 @@ protected SdkFileEntry GenerateSmithyClientSourceFile(final ServiceModel service
         VelocityContext context = createContext(serviceModel);
         context.put("CppViewHelper", CppViewHelper.class);
         selectAuthschemeResolver(serviceModel, context);
-        context.put("AuthSchemeMapEntries", createAuthSchemeMapEntries(serviceModel));
+        context.put("AuthSchemeOptions", serviceModel.getAuthSchemes().stream().map(this::mapAuthSchemeOptions).filter(scheme -> !scheme.isEmpty()).collect(Collectors.joining(",")));
+
+        //We want to make sure the authSchemeMapEntries includes all possible auths, even the ones supported in specific operations
+        List<String> allAuthSchemes =  getUpdatedAuthSchemesFromOperations(serviceModel);
+        context.put("AuthSchemeVariants", allAuthSchemes.stream().map(this::mapAuthSchemes).filter(scheme -> !scheme.isEmpty()).collect(Collectors.joining(",")));
+        context.put("AuthSchemeMapEntries", createAuthSchemeMapEntries(allAuthSchemes));
         context.put("AuthSchemes", getSupportedAuthSchemes(serviceModel));
 
         final String fileName;
@@ -793,6 +799,8 @@ protected SdkFileEntry GenerateLegacyClientSourceFile(final ServiceModel service
     private static final Map<String, String> AuthSchemeMapping = ImmutableMap.of(
             "aws.auth#sigv4", "smithy::SigV4AuthScheme",
             "aws.auth#sigv4a", "smithy::SigV4aAuthScheme",
+            "smithy.api#httpBearerAuth", "smithy::BearerTokenAuthScheme",
+            "smithy.api#noAuth", "smithy::NoAuthScheme",
             "bearer", "smithy::BearerTokenAuthScheme",
             "v4","smithy::SigV4AuthScheme",
             "sigv4-s3express","S3ExpressSigV4AuthScheme",
@@ -817,6 +825,8 @@ protected String mapAuthSchemeOptions(final String authSchemeName) {
     private static final Map<String, String> SchemeIdMapping = ImmutableMap.of(
             "aws.auth#sigv4", "smithy::SigV4AuthSchemeOption::sigV4AuthSchemeOption",
             "aws.auth#sigv4a", "smithy::SigV4aAuthSchemeOption::sigV4aAuthSchemeOption",
+            "smithy.api#httpBearerAuth", "smithy::BearerTokenAuthSchemeOption::bearerTokenAuthSchemeOption",
+            "smithy.api#noAuth", "smithy::NoAuthSchemeOption::noAuthSchemeOption",
             "bearer", "smithy::BearerTokenAuthSchemeOption::bearerTokenAuthSchemeOption",
             "v4", "smithy::SigV4AuthSchemeOption::sigV4AuthSchemeOption",
             "sigv4-s3express", "S3ExpressSigV4AuthSchemeOption::s3ExpressSigV4AuthSchemeOption",
@@ -826,6 +836,7 @@ protected String mapAuthSchemeOptions(final String authSchemeName) {
     protected static final Map<String, String> ResolverMapping = ImmutableMap.of(
             "aws.auth#sigv4", "GenericAuthSchemeResolver",
             "aws.auth#sigv4a", "GenericAuthSchemeResolver",
+            "smithy.api#httpBearerAuth", "GenericAuthSchemeResolver",
             "bearer", "GenericAuthSchemeResolver",
             "v4", "GenericAuthSchemeResolver",
             "v2", "GenericAuthSchemeResolver"
@@ -835,6 +846,14 @@ protected String mapAuthSchemeOptions(final String authSchemeName) {
     private static final String SchemeMapFormat = "%s.schemeId, %s";
     protected List<String> createAuthSchemeMapEntries(final ServiceModel serviceModel) {
         return  getSupportedAuthSchemes(serviceModel).stream()
+                .filter(authScheme -> !SchemeIdMapping.get(authScheme).isEmpty())
+                .map(authScheme -> String.format(SchemeMapFormat, SchemeIdMapping.get(authScheme), AuthSchemeMapping.get(authScheme)))
+                .collect(Collectors.toList());
+    }
+
+    protected List<String> createAuthSchemeMapEntries(final List<String> authSchemes) {
+        return  authSchemes.stream()
+                .filter(authScheme -> !SchemeIdMapping.get(authScheme).isEmpty())
                 .map(authScheme -> String.format(SchemeMapFormat, SchemeIdMapping.get(authScheme), AuthSchemeMapping.get(authScheme)))
                 .collect(Collectors.toList());
     }
@@ -938,10 +957,9 @@ protected void updateAuthSchemesFromEndpointRules(ServiceModel serviceModel, Str
     }
 
 
-    protected void updateAuthSchemesFromOperations(ServiceModel serviceModel)
+    protected List<String> getUpdatedAuthSchemesFromOperations(ServiceModel serviceModel)
     {
-        List<String> authschemes =  new ArrayList<>(serviceModel.getAuthSchemes());
-        Set<String> authSchemeSet = new HashSet<>(authschemes);
+        Set<String> authSchemeSet = new HashSet<>(serviceModel.getAuthSchemes());
 
         serviceModel.getOperations().values().forEach(operation -> {
             if (operation.getAuth() == null) {
@@ -953,12 +971,11 @@ protected void updateAuthSchemesFromOperations(ServiceModel serviceModel)
                 }
                 // only add if it's not already present in the authSchemeSet
                 if (!authSchemeSet.contains(authScheme)) {
-                    serviceModel.getAuthSchemes().add(authScheme);
                     authSchemeSet.add(authScheme);
                 }
             });
         });
-        serviceModel.setAuthSchemes(authschemes);
+        return new ArrayList<>(authSchemeSet);
     }
     //auth schemes can be named differently in endpoints/operations, this is a mapping
     private static final Map<String, String> AuthSchemeNameMapping = ImmutableMap.of(
diff --git a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/JsonCppClientGenerator.java b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/JsonCppClientGenerator.java
index 72bea867640..b5f9f3d625f 100644
--- a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/JsonCppClientGenerator.java
+++ b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/JsonCppClientGenerator.java
@@ -116,6 +116,8 @@ protected SdkFileEntry generateModelSourceFile(ServiceModel serviceModel, Map.En
             Template template;
             VelocityContext context = createContext(serviceModel);
 
+            context.put("operation", serviceModel.getOperationForRequestShapeName(shape.getName()));
+
             if (shape.isRequest() && (shape.hasStreamMembers() || shape.hasEventStreamMembers())) {
                 if (shape.hasEventStreamMembers()) {
                     HashMap<String, String> headersMap = new HashMap<>(10);
@@ -136,7 +138,6 @@ else if (shape.isResult()) {
                 template = velocityEngine.getTemplate("/com/amazonaws/util/awsclientgenerator/velocity/cpp/json/JsonSubObjectSource.vm", StandardCharsets.UTF_8.name());
             }
 
-            context.put("operation", serviceModel.getOperationForRequestShapeName(shape.getName()));
             context.put("shape", shape);
             context.put("typeInfo", new CppShapeInformation(shape, serviceModel));
             context.put("CppViewHelper", CppViewHelper.class);
diff --git a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/QueryCppClientGenerator.java b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/QueryCppClientGenerator.java
index fea79da2a8a..fb64e9e6849 100644
--- a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/QueryCppClientGenerator.java
+++ b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/QueryCppClientGenerator.java
@@ -132,6 +132,8 @@ protected SdkFileEntry generateModelSourceFile(ServiceModel serviceModel, Map.En
         Template template = null;
         VelocityContext context = createContext(serviceModel);
 
+        context.put("operation", serviceModel.getOperationForRequestShapeName(shape.getName()));
+
         if (shape.isStructure() && shape.isReferenced()) {
             if (shape.isRequest()) {
                 template = velocityEngine.getTemplate("/com/amazonaws/util/awsclientgenerator/velocity/cpp/queryxml/QueryRequestSource.vm", StandardCharsets.UTF_8.name());
diff --git a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/s3/S3RestXmlCppClientGenerator.java b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/s3/S3RestXmlCppClientGenerator.java
index 3f3f74e81d7..5d97a643b6e 100644
--- a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/s3/S3RestXmlCppClientGenerator.java
+++ b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/s3/S3RestXmlCppClientGenerator.java
@@ -198,7 +198,7 @@ public SdkFileEntry[] generateSourceFiles(ServiceModel serviceModel) throws Exce
         if(serviceModel.isUseSmithyClient())
         {
             updateAuthSchemesFromEndpointRules(serviceModel, serviceModel.getRawEndpointRules());
-            updateAuthSchemesFromOperations(serviceModel);
+            serviceModel.setAuthSchemes(getUpdatedAuthSchemesFromOperations(serviceModel));
         }
 
         // Add ID2 and RequestId to GetObjectResult
diff --git a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/transform/C2jModelToGeneratorModelTransformer.java b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/transform/C2jModelToGeneratorModelTransformer.java
index 8835ee8409d..281ec1b5b8c 100644
--- a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/transform/C2jModelToGeneratorModelTransformer.java
+++ b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/transform/C2jModelToGeneratorModelTransformer.java
@@ -610,6 +610,7 @@ Operation convertOperation(C2jOperation c2jOperation) {
 
         operation.setDocumentation(formatDocumentation(crossLinkedShapeDocs, 9));
         operation.setAuthtype(c2jOperation.getAuthtype());
+        operation.setAuth(c2jOperation.getAuth());
         operation.setAuthorizer(c2jOperation.getAuthorizer());
         if (c2jOperation.getEndpoint() != null) {
             operation.setEndpoint(convertEndpoint(c2jOperation.getEndpoint()));
diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/RequestHeader.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/RequestHeader.vm
index b7327a2f6a3..4516a24155a 100644
--- a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/RequestHeader.vm
+++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/RequestHeader.vm
@@ -77,6 +77,9 @@ namespace Model
     ${exportMacro} Aws::Http::HeaderValueCollection GetRequestSpecificHeaders() const override;
 
 #end
+#if($serviceModel.useSmithyClient && $operation.auth)
+    ${exportMacro} Aws::Vector<smithy::AuthSchemeOption> GetRequestSpecificSupportedAuth() const override;
+#end
 #if($shape.hasEmbeddedErrors())
     ${exportMacro} bool HasEmbeddedError(IOStream &body, const Http::HeaderValueCollection &header) const override;
 #end
diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceClientHeaderConstructors.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceClientHeaderConstructors.vm
index 945b03097f7..adcacef025b 100644
--- a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceClientHeaderConstructors.vm
+++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceClientHeaderConstructors.vm
@@ -69,7 +69,7 @@
         ${className}& operator=(${className} &&rhs) noexcept;
 #end
 #if($serviceModel.endpointRules && $serviceNamespace != "S3Crt")
-#if($serviceModel.hasOnlyBearerAuth())
+#if(($serviceModel.hasBearerAuth() && $serviceModel.useSmithyClient) || $serviceModel.hasOnlyBearerAuth())
 #set($bearerAddCtorArgs = {})
 #foreach ($ctorKey in ["signPayloads", "useVirtualAddressing", "USEast1RegionalEndpoint"])
 #if($additionalCtorArgs.containsKey($ctorKey))#set($addArgDummy = $bearerAddCtorArgs.put($ctorKey, $additionalCtorArgs.get($ctorKey)))#end
@@ -78,16 +78,15 @@
         * Initializes client to use BearerTokenAuthSignerProvider, with default http client factory, and optional client config.
         */
         ${className}(const Aws::Auth::BearerTokenAuthSignerProvider& bearerTokenProvider,
-#if($serviceModel.endpointRules)
         ${clsWSpace} std::shared_ptr<${metadata.classNamePrefix}EndpointProviderBase> endpointProvider = ${endpointsProviderDefaultCtorDummy},
-#end
         ${clsWSpace} const ${clientConfigurationCls}& clientConfiguration = ${clientConfigurationCls}()#if($bearerAddCtorArgs.isEmpty()));#else,#end
 
 #foreach($ctorArgument in $bearerAddCtorArgs)
         ${clsWSpace} ${ctorArgument}#if( $foreach.hasNext ),#else);#end
 
 #end
-#else##if($serviceModel.hasOnlyBearerAuth())
+#end ###if( ($serviceModel.hasBearerAuth() && $serviceModel.useSmithyClient) || ($serviceModel.hasOnlyBearerAuth()))
+#if(!$serviceModel.hasOnlyBearerAuth())
 #set($defCredsChainCtor = {})
 #foreach ($ctorKey in ["signPayloads", "useVirtualAddressing", "USEast1RegionalEndpoint", "additionalCredentialProvider"])
 #if($additionalCtorArgs.containsKey($ctorKey))#set($addArgDummy = $defCredsChainCtor.put($ctorKey, $additionalCtorArgs.get($ctorKey)))#end
@@ -144,7 +143,7 @@
         ${clsWSpace} ${ctorArgument}#if( $foreach.hasNext ),#else);#end
 
 #end
-#end##if($serviceModel.hasOnlyBearerAuth())
+#end##if(!$serviceModel.hasOnlyBearerAuth())
 
 #if($metadata.standalone || $metadata.apigateway)
 #set($standaloneCredsCtor = {})
diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceClientHeaderLegacyConstructors.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceClientHeaderLegacyConstructors.vm
index 8cf1fabc0fc..0443a594746 100644
--- a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceClientHeaderLegacyConstructors.vm
+++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceClientHeaderLegacyConstructors.vm
@@ -28,7 +28,7 @@
 #set($clientConfigurationNamespace = "Client")
 #end
 #set($clsWSpace = $className.replaceAll(".", " "))
-#if($serviceModel.hasOnlyBearerAuth())
+#if(($serviceModel.hasBearerAuth() && $serviceModel.useSmithyClient) || $serviceModel.hasOnlyBearerAuth())
 #set($bearerAddCtorArgs = {})
 #foreach ($ctorKey in ["signPayloads", "useVirtualAddressing", "USEast1RegionalEndpoint"])
 #if($additionalCtorArgs.containsKey($ctorKey))#set($addArgDummy = $bearerAddCtorArgs.put($ctorKey, $additionalCtorArgs.get($ctorKey)))#end
@@ -43,7 +43,8 @@
         ${clsWSpace} ${ctorArgument}#if( $foreach.hasNext ),#else);#end
 
 #end
-#else##if($serviceModel.hasOnlyBearerAuth())
+#end##if(($serviceModel.hasBearerAuth() && $serviceModel.useSmithyClient) || $serviceModel.hasOnlyBearerAuth())
+#if(!$serviceModel.hasOnlyBearerAuth())
 #set($defCredsChainCtor = {})
 #foreach ($ctorKey in ["signPayloads", "useVirtualAddressing", "USEast1RegionalEndpoint", "additionalCredentialProvider"])
 #if($additionalCtorArgs.containsKey($ctorKey))#set($addArgDummy = $defCredsChainCtor.put($ctorKey, $additionalCtorArgs.get($ctorKey)))#end
@@ -90,7 +91,7 @@
         ${clsWSpace} ${ctorArgument}#if( $foreach.hasNext ),#else);#end
 
 #end
-#end##if($serviceModel.hasOnlyBearerAuth())
+#end##if(!$serviceModel.hasOnlyBearerAuth())
 
 #if($metadata.standalone || $metadata.apigateway)
 #set($standaloneCredsCtor = {})
diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceClientSourceHeaders.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceClientSourceHeaders.vm
index 5f2520f09fb..fbaf190c7cf 100644
--- a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceClientSourceHeaders.vm
+++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceClientSourceHeaders.vm
@@ -30,7 +30,7 @@
 \#include <aws/${metadata.projectName}/${metadata.classNamePrefix}ARN.h>
 #end
 #end
-#if($serviceModel.hasBearerAuth())
+#if(($serviceModel.hasBearerAuth() && $serviceModel.useSmithyClient) || $serviceModel.hasOnlyBearerAuth())
 \#include <aws/core/auth/signer-provider/BearerTokenAuthSignerProvider.h>
 #end
 #foreach($operation in $serviceModel.operations)
diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/cbor/CborRequestSource.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/cbor/CborRequestSource.vm
index 1ed5555938c..6e8dd16d06f 100644
--- a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/cbor/CborRequestSource.vm
+++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/cbor/CborRequestSource.vm
@@ -14,6 +14,20 @@
 #foreach($header in $typeInfo.sourceIncludes)
 \#include $header
 #end
+#if($serviceModel.useSmithyClient)
+#if($operation.hasSigV4aAuth())
+\#include <smithy/identity/auth/built-in/SigV4aAuthSchemeOption.h>
+#end
+#if($operation.hasSigV4Auth())
+\#include <smithy/identity/auth/built-in/SigV4AuthSchemeOption.h>
+#end
+#if($operation.hasBearerAuth())
+\#include <smithy/identity/auth/built-in/BearerTokenAuthSchemeOption.h>
+#end
+#if($operation.hasNoAuth())
+\#include <smithy/identity/auth/built-in/NoAuthScheme.h>
+#end
+#end ###if($serviceModel.useSmithyClient)
 
 \#include <utility>
     #if(${CppViewHelper.hasListMemberUsedForHeader($shape)})
@@ -81,6 +95,14 @@
         #parse($presignerTemplate)
     }
 
+    #end
+
+    #if($serviceModel.useSmithyClient && $operation.auth)
+    Aws::Vector<smithy::AuthSchemeOption> ${typeInfo.className}::GetRequestSpecificSupportedAuth() const
+    {
+        Aws::Vector<smithy::AuthSchemeOption> authOptions{$CppViewHelper.computeAuthSchemes($operation)};
+        return authOptions;
+    }
     #end
     #parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/common/model/ModelGetEndpointRulesContextParamDefinition.vm")
     #parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/ModelClassChecksumMembers.vm")
diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/cbor/CborServiceClientSource.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/cbor/CborServiceClientSource.vm
index ac0c75656b0..60e3a3925b5 100644
--- a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/cbor/CborServiceClientSource.vm
+++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/cbor/CborServiceClientSource.vm
@@ -6,7 +6,7 @@
 #set($serviceNamespace = $metadata.namespace)
 #set($className = "${metadata.classNamePrefix}Client")
 \#include <aws/core/utils/Outcome.h>
-#if($serviceModel.hasBearerAuth())
+#if(($serviceModel.hasBearerAuth() && $serviceModel.useSmithyClient) || $serviceModel.hasOnlyBearerAuth())
 \#include <aws/core/auth/signer/AWSAuthBearerSigner.h>
 #end
 #if($serviceModel.hasSigV4Auth())
diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/common/model/ServiceClientModelHeaderInclude.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/common/model/ServiceClientModelHeaderInclude.vm
index 8610d4a8c14..f4b64bdb975 100644
--- a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/common/model/ServiceClientModelHeaderInclude.vm
+++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/common/model/ServiceClientModelHeaderInclude.vm
@@ -61,7 +61,7 @@ namespace Aws
 
   namespace Auth
   {
-#if($serviceModel.hasBearerAuth())
+#if(($serviceModel.hasBearerAuth() && $serviceModel.useSmithyClient) || $serviceModel.hasOnlyBearerAuth())
     class BearerTokenAuthSignerProvider;
 #end
 #if($serviceModel.hasSigV4Auth())
diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/json/JsonRequestSource.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/json/JsonRequestSource.vm
index ad45bba3376..b775ad68351 100644
--- a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/json/JsonRequestSource.vm
+++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/json/JsonRequestSource.vm
@@ -14,7 +14,20 @@
 #foreach($header in $typeInfo.sourceIncludes)
 \#include $header
 #end
-
+#if($serviceModel.useSmithyClient)
+#if($operation.hasSigV4aAuth())
+\#include <smithy/identity/auth/built-in/SigV4aAuthSchemeOption.h>
+#end
+#if($operation.hasSigV4Auth())
+\#include <smithy/identity/auth/built-in/SigV4AuthSchemeOption.h>
+#end
+#if($operation.hasBearerAuth())
+\#include <smithy/identity/auth/built-in/BearerTokenAuthSchemeOption.h>
+#end
+#if($operation.hasNoAuth())
+\#include <smithy/identity/auth/built-in/NoAuthScheme.h>
+#end
+#end ###if($serviceModel.useSmithyClient)
 \#include <utility>
 #if(${CppViewHelper.hasListMemberUsedForHeader($shape)})
 \#include <numeric>
@@ -69,6 +82,15 @@ void  ${typeInfo.className}::DumpBodyToUrl(Aws::Http::URI& uri ) const
 }
 
 #end
+
+#if($serviceModel.useSmithyClient && $operation.auth)
+Aws::Vector<smithy::AuthSchemeOption> ${typeInfo.className}::GetRequestSpecificSupportedAuth() const
+{
+  Aws::Vector<smithy::AuthSchemeOption> authOptions{$CppViewHelper.computeAuthSchemes($operation)};
+  return authOptions;
+}
+#end
+
 #parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/common/model/ModelGetEndpointRulesContextParamDefinition.vm")
 #parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/ModelClassChecksumMembers.vm")
 #parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/ModelClassRequiredCompression.vm")
diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/json/JsonServiceClientSource.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/json/JsonServiceClientSource.vm
index da4175ad333..ad76a6a595b 100644
--- a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/json/JsonServiceClientSource.vm
+++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/json/JsonServiceClientSource.vm
@@ -6,7 +6,7 @@
 #set($serviceNamespace = $metadata.namespace)
 #set($className = "${metadata.classNamePrefix}Client")
 \#include <aws/core/utils/Outcome.h>
-#if($serviceModel.hasBearerAuth())
+#if(($serviceModel.hasBearerAuth() && $serviceModel.useSmithyClient) || $serviceModel.hasOnlyBearerAuth())
 \#include <aws/core/auth/signer/AWSAuthBearerSigner.h>
 #end
 #if($serviceModel.hasSigV4Auth())
diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/queryxml/QueryRequestSource.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/queryxml/QueryRequestSource.vm
index 3a83cad90a8..149288b6cc4 100644
--- a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/queryxml/QueryRequestSource.vm
+++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/queryxml/QueryRequestSource.vm
@@ -89,6 +89,15 @@ Aws::Http::HeaderValueCollection ${typeInfo.className}::GetRequestSpecificHeader
   return headers;
 }
 #end
+
+#if($serviceModel.useSmithyClient && $operation.auth)
+Aws::Vector<smithy::AuthSchemeOption> ${typeInfo.className}::GetRequestSpecificSupportedAuth() const
+  {
+  Aws::Vector<smithy::AuthSchemeOption> authOptions{$CppViewHelper.computeAuthSchemes($operation)};
+  return authOptions;
+  }
+#end
+
 #parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/common/model/ModelGetEndpointRulesContextParamDefinition.vm")
 #parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/ModelClassChecksumMembers.vm")
 #parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/ModelClassRequiredCompression.vm")
diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/smithy/SmithyClientHeader.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/smithy/SmithyClientHeader.vm
index b10b2c429d9..7d9e54e533d 100644
--- a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/smithy/SmithyClientHeader.vm
+++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/smithy/SmithyClientHeader.vm
@@ -27,6 +27,9 @@
 #if($serviceModel.hasSigV4aAuth())
 \#include <smithy/identity/auth/built-in/SigV4aAuthScheme.h>
 #end
+#if($serviceModel.hasNoAuth())
+\#include <smithy/identity/auth/built-in/NoAuthScheme.h>
+#end
 \#include <smithy/identity/auth/built-in/GenericAuthSchemeResolver.h>
 \#include <smithy/client/serializer/${serializer}.h>
 \#include <aws/${metadata.projectName}/${metadata.classNamePrefix}ErrorMarshaller.h>
diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/smithy/SmithyClientSourceInit.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/smithy/SmithyClientSourceInit.vm
index 5be03661570..4ff6a95e5c2 100644
--- a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/smithy/SmithyClientSourceInit.vm
+++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/smithy/SmithyClientSourceInit.vm
@@ -1,6 +1,6 @@
 #set($clientConfiguration = ${serviceNamespace} + "::" + ${metadata.classNamePrefix} + "ClientConfiguration")
 #set($s3_express_auth = "sigv4-s3express")
-#if($serviceModel.hasOnlyBearerAuth())
+#if($serviceModel.hasBearerAuth())
 ##BEARER TOKEN AUTH PROVIDER C-TOR
 ${className}::${className}(const Aws::Auth::BearerTokenAuthSignerProvider& bearerTokenProvider,
                            std::shared_ptr<${metadata.classNamePrefix}EndpointProviderBase> endpointProvider,
@@ -14,7 +14,11 @@ ${className}::${className}(const Aws::Auth::BearerTokenAuthSignerProvider& beare
       Aws::MakeShared<smithy::${AuthSchemeResolver}<>>(ALLOCATION_TAG, Aws::Vector<smithy::AuthSchemeOption>({$AuthSchemeOptions})),
       {
 #foreach($entry in $AuthSchemeMapEntries)
-          {${entry}{Aws::MakeShared<smithy::AwsBearerTokenIdentityResolver>(ALLOCATION_TAG, bearerTokenProvider), GetServiceName(), clientConfiguration.region}},
+    #if($entry.contains("smithy::BearerTokenAuthScheme"))
+        {${entry}{Aws::MakeShared<smithy::AwsBearerTokenIdentityResolver>(ALLOCATION_TAG, bearerTokenProvider), GetServiceName(), clientConfiguration.region}},
+    #else
+        {${entry}{GetServiceName(), clientConfiguration.region}},
+    #end
 #end
       })
 {
@@ -31,7 +35,11 @@ ${className}::${className}(const Aws::Auth::BearerTokenAuthSignerProvider& beare
       Aws::MakeShared<smithy::${AuthSchemeResolver}<>>(ALLOCATION_TAG, Aws::Vector<smithy::AuthSchemeOption>({$AuthSchemeOptions})),
       {
 #foreach($entry in $AuthSchemeMapEntries)
-          {${entry}{Aws::MakeShared<smithy::AwsBearerTokenIdentityResolver>(ALLOCATION_TAG, bearerTokenProvider), GetServiceName(), clientConfiguration.region}},
+    #if($entry.contains("smithy::BearerTokenAuthScheme"))
+        {${entry}{Aws::MakeShared<smithy::AwsBearerTokenIdentityResolver>(ALLOCATION_TAG, bearerTokenProvider), GetServiceName(), clientConfiguration.region}},
+    #else
+        {${entry}{GetServiceName(), clientConfiguration.region}},
+    #end
 #end
       })
 {
@@ -39,7 +47,8 @@ ${className}::${className}(const Aws::Auth::BearerTokenAuthSignerProvider& beare
 ## END OF BEARER TOKEN AUTH PROVIDER C-TOR
 
 
-#else
+#end
+#if(!$serviceModel.hasOnlyBearerAuth())
 ${className}::${className}(const ${clientConfiguration}& clientConfiguration,
                            std::shared_ptr<${metadata.classNamePrefix}EndpointProviderBase> endpointProvider) :
     AwsSmithyClientT(clientConfiguration,
@@ -113,8 +122,10 @@ ${className}::${className}(const AWSCredentials& credentials,
             }()
 #else
 #foreach($entry in $AuthSchemeMapEntries)
+#if(!$entry.contains("smithy::BearerTokenAuthScheme"))
             {${entry}{Aws::MakeShared<smithy::SimpleAwsCredentialIdentityResolver>(ALLOCATION_TAG, credentials), GetServiceName(), clientConfiguration.region}},
 #end
+#end
 #end
         })
 {}
@@ -153,8 +164,10 @@ ${className}::${className}(const std::shared_ptr<AWSCredentialsProvider>& creden
             }()
 #else
 #foreach($entry in $AuthSchemeMapEntries)
+#if(!$entry.contains("smithy::BearerTokenAuthScheme"))
             {${entry}{ Aws::MakeShared<smithy::AwsCredentialsProviderIdentityResolver>(ALLOCATION_TAG, credentialsProvider), GetServiceName(), clientConfiguration.region}},
 #end
+#end
 #end
         })
 {}
@@ -288,7 +301,11 @@ ${className}::${className}(const Client::ClientConfiguration& clientConfiguratio
 #end
       {
 #foreach($entry in $AuthSchemeMapEntries)
+#if($entry.contains("smithy::BearerTokenAuthScheme"))
+          {${entry}{Aws::MakeShared<smithy::AwsBearerTokenIdentityResolver>(ALLOCATION_TAG), GetServiceName(), clientConfiguration.region}},
+#else
           {$entry{Aws::MakeShared<smithy::DefaultAwsCredentialIdentityResolver>(ALLOCATION_TAG), GetServiceName(), clientConfiguration.region}},
+#end
 #end
       })
 {}
@@ -308,7 +325,9 @@ ${className}::${className}(const AWSCredentials& credentials,
 #end
         {
 #foreach($entry in $AuthSchemeMapEntries)
+#if(!$entry.contains("smithy::BearerTokenAuthScheme"))
           {$entry{Aws::MakeShared<smithy::SimpleAwsCredentialIdentityResolver>(ALLOCATION_TAG, credentials), GetServiceName(), clientConfiguration.region}},
+#end
 #end
         })
 {}
@@ -327,7 +346,9 @@ ${className}::${className}(const std::shared_ptr<AWSCredentialsProvider>& creden
         Aws::MakeShared<smithy::${AuthSchemeResolver}>(ALLOCATION_TAG, ${metadata.classNamePrefix}EndpointProvider, ${clientConfiguration}),
 #end        {
 #foreach($entry in $AuthSchemeMapEntries)
+#if(!$entry.contains("smithy::BearerTokenAuthScheme"))
           {$entry{Aws::MakeShared<smithy::AwsCredentialsProviderIdentityResolver>(ALLOCATION_TAG, credentialsProvider), GetServiceName(), clientConfiguration.region}},
+#end
 #end
         })
 {}
diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/xml/XmlRequestSource.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/xml/XmlRequestSource.vm
index 9ea9f9789ef..83dabaeac6f 100644
--- a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/xml/XmlRequestSource.vm
+++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/xml/XmlRequestSource.vm
@@ -18,7 +18,20 @@
 #foreach($header in $typeInfo.sourceIncludes)
 \#include $header
 #end
-
+#if($serviceModel.useSmithyClient)
+#if($operation.hasSigV4aAuth())
+\#include <smithy/identity/auth/built-in/SigV4aAuthSchemeOption.h>
+#end
+#if($operation.hasSigV4Auth())
+\#include <smithy/identity/auth/built-in/SigV4AuthSchemeOption.h>
+#end
+#if($operation.hasBearerAuth())
+\#include <smithy/identity/auth/built-in/BearerTokenAuthSchemeOption.h>
+#end
+#if($operation.hasNoAuth())
+\#include <smithy/identity/auth/built-in/NoAuthScheme.h>
+#end
+#end ###if($serviceModel.useSmithyClient)
 \#include <utility>
 #if(${CppViewHelper.hasListMemberUsedForHeader($shape)})
 \#include <numeric>
@@ -132,6 +145,14 @@ Aws::Http::HeaderValueCollection ${typeInfo.className}::GetRequestSpecificHeader
   return headers;
 }
 #end
+
+#if($serviceModel.useSmithyClient && $operation.auth)
+Aws::Vector<smithy::AuthSchemeOption> ${typeInfo.className}::GetRequestSpecificSupportedAuth() const
+{
+  Aws::Vector<smithy::AuthSchemeOption> authOptions{$CppViewHelper.computeAuthSchemes($operation)};
+  return authOptions;
+}
+#end
 #parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/common/model/ModelGetEndpointRulesContextParamDefinition.vm")
 #parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/ModelClassChecksumMembers.vm")
 #parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/ModelClassRequiredCompression.vm")