diff --git a/sdk/AWSDotNetSDK.ruleset b/sdk/AWSDotNetSDK.ruleset
index a98f4d102274..e7b67bea0504 100644
--- a/sdk/AWSDotNetSDK.ruleset
+++ b/sdk/AWSDotNetSDK.ruleset
@@ -70,7 +70,7 @@
     <Rule Id="CA1819" Action="Error" />
     <Rule Id="CA1822" Action="Error" />
     <Rule Id="CA1823" Action="None" />
-    <Rule Id="CA2007" Action="None" />
+    <Rule Id="CA2007" Action="Error" />
     <Rule Id="CA2119" Action="Error" />
     <Rule Id="CA2211" Action="Error" />
     <Rule Id="CA2214" Action="Error" />
diff --git a/sdk/AWSDotNetSDKForBuild.ruleset b/sdk/AWSDotNetSDKForBuild.ruleset
index a98f4d102274..e7b67bea0504 100644
--- a/sdk/AWSDotNetSDKForBuild.ruleset
+++ b/sdk/AWSDotNetSDKForBuild.ruleset
@@ -70,7 +70,7 @@
     <Rule Id="CA1819" Action="Error" />
     <Rule Id="CA1822" Action="Error" />
     <Rule Id="CA1823" Action="None" />
-    <Rule Id="CA2007" Action="None" />
+    <Rule Id="CA2007" Action="Error" />
     <Rule Id="CA2119" Action="Error" />
     <Rule Id="CA2211" Action="Error" />
     <Rule Id="CA2214" Action="Error" />
diff --git a/sdk/src/Services/S3/Custom/Util/_async/BucketRegionDetector.cs b/sdk/src/Services/S3/Custom/Util/_async/BucketRegionDetector.cs
index fc838eea326a..9ccce856cd42 100644
--- a/sdk/src/Services/S3/Custom/Util/_async/BucketRegionDetector.cs
+++ b/sdk/src/Services/S3/Custom/Util/_async/BucketRegionDetector.cs
@@ -45,7 +45,7 @@ public static partial class BucketRegionDetector
         internal static async Task<string> DetectMismatchWithHeadBucketFallbackAsync(AmazonS3Uri requestedBucketUri, AmazonServiceException serviceException, ImmutableCredentials credentials)
         {
             return GetCorrectRegion(requestedBucketUri, serviceException) ??
-                CheckRegionAndUpdateCache(requestedBucketUri, await GetBucketRegionNoPipelineAsync(requestedBucketUri.Bucket, credentials));
+                CheckRegionAndUpdateCache(requestedBucketUri, await GetBucketRegionNoPipelineAsync(requestedBucketUri.Bucket, credentials).ConfigureAwait(false));
         }
 
         /// <summary>
diff --git a/sdk/src/Services/WorkDocs/Custom/_async/ContentManager.cs b/sdk/src/Services/WorkDocs/Custom/_async/ContentManager.cs
index 51ca6bf22a8b..2c67cc55c5bc 100644
--- a/sdk/src/Services/WorkDocs/Custom/_async/ContentManager.cs
+++ b/sdk/src/Services/WorkDocs/Custom/_async/ContentManager.cs
@@ -120,7 +120,7 @@ public async Task<UploadDocumentStreamResponse> UploadDocumentStreamAsync(Upload
                 content.RemoveHttpContentHeader("Content-Type");
                 content.AddHttpContentHeader("Content-Type", uploadDocumentStreamRequest.ContentType);
 
-                await httpClient.PutRequestUriAsync(uploadUrl, content, requestHeaders);
+                await httpClient.PutRequestUriAsync(uploadUrl, content, requestHeaders).ConfigureAwait(false);
                 var task = CompleteUpload(documentId, versionId);
 
                 UploadDocumentStreamResponse uploadDocumentStreamResponse = new UploadDocumentStreamResponse(uploadDocumentStreamRequest)