diff --git a/aws-encryption-sdk-net/codebuild/release/release-prod.yml b/aws-encryption-sdk-net/codebuild/release/release-prod.yml
index 31f4b9240..6acc22812 100644
--- a/aws-encryption-sdk-net/codebuild/release/release-prod.yml
+++ b/aws-encryption-sdk-net/codebuild/release/release-prod.yml
@@ -18,7 +18,7 @@ env:
 phases:
   install:
     runtime-versions:
-      dotnet: 5.0
+      dotnet: 6.0
       python: 3.x
     commands:
       - cd ..
@@ -50,8 +50,8 @@ phases:
       # Now validate we can run examples
       - sed -i.backup '/Source\/AWSEncryptionSDK.csproj/d' Examples/AWSEncryptionSDKExamples.csproj
       - dotnet add Examples/AWSEncryptionSDKExamples.csproj package AWS.EncryptionSDK --version $VERSION
-      # Target only netcoreapp3.1, because we only support net452 for windows.
+      # Run examples for just one supported version.
       # Since all frameworks and OS's are tested on commit, we mainly want to
       # run this as a smoke test and the confirm we can find the dependency,
       # rather than a comprehensive test suite.
-      - dotnet test Examples -f netcoreapp3.1
+      - dotnet test Examples -f net6.0
diff --git a/aws-encryption-sdk-net/codebuild/release/release-staging.yml b/aws-encryption-sdk-net/codebuild/release/release-staging.yml
index b2b948d65..ddf199bac 100644
--- a/aws-encryption-sdk-net/codebuild/release/release-staging.yml
+++ b/aws-encryption-sdk-net/codebuild/release/release-staging.yml
@@ -18,7 +18,7 @@ env:
 phases:
   install:
     runtime-versions:
-      dotnet: 5.0
+      dotnet: 6.0
       python: 3.x
     commands:
       - cd ..
@@ -59,11 +59,11 @@ phases:
       # Now validate we can run examples
       - sed -i.backup '/Source\/AWSEncryptionSDK.csproj/d' Examples/AWSEncryptionSDKExamples.csproj
       - dotnet add Examples/AWSEncryptionSDKExamples.csproj package AWS.EncryptionSDK --version $UNIQUE_VERSION
-      # Target only netcoreapp3.1, because we only support net452 for windows.
+      # Run examples for just one supported version.
       # Since all frameworks and OS's are tested on commit, we mainly want to
       # run this as a smoke test and the confirm we can find the dependency,
       # rather than a comprehensive test suite.
-      - dotnet test Examples -f netcoreapp3.1
+      - dotnet test Examples -f net6.0
   post_build:
     commands:
       - >-
diff --git a/aws-encryption-sdk-net/codebuild/release/release.yml b/aws-encryption-sdk-net/codebuild/release/release.yml
index ea61eec42..b9d006fe0 100644
--- a/aws-encryption-sdk-net/codebuild/release/release.yml
+++ b/aws-encryption-sdk-net/codebuild/release/release.yml
@@ -5,19 +5,28 @@ batch:
   build-graph:
     - identifier: sign
       buildspec: aws-encryption-sdk-net/codebuild/release/sign.yml
-    - identifier: verify 
+      env:
+        type: LINUX_CONTAINER
+        image: aws/codebuild/standard:6.0
+    - identifier: verify
       buildspec: aws-encryption-sdk-net/codebuild/release/verify.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
-        image: aws/codebuild/windows-base:2019-1.0
+        image: aws/codebuild/windows-base:2019-2.0
       depend-on:
         - sign
     - identifier: release_staging
       buildspec: aws-encryption-sdk-net/codebuild/release/release-staging.yml
+      env:
+        type: LINUX_CONTAINER
+        image: aws/codebuild/standard:6.0
       depend-on:
         - sign
     - identifier: release_prod
       buildspec: aws-encryption-sdk-net/codebuild/release/release-prod.yml
+      env:
+        type: LINUX_CONTAINER
+        image: aws/codebuild/standard:6.0
       depend-on:
         - verify
         - release_staging
diff --git a/aws-encryption-sdk-net/codebuild/release/sign.yml b/aws-encryption-sdk-net/codebuild/release/sign.yml
index 369f4ece5..b66e11976 100644
--- a/aws-encryption-sdk-net/codebuild/release/sign.yml
+++ b/aws-encryption-sdk-net/codebuild/release/sign.yml
@@ -3,7 +3,7 @@ version: 0.2
 phases:
   install:
     runtime-versions:
-      dotnet: 5.0
+      dotnet: 6.0
       python: 3.x
     commands:
       - cd ..
diff --git a/aws-encryption-sdk-net/codebuild/release/verify.yml b/aws-encryption-sdk-net/codebuild/release/verify.yml
index 24b031e55..2314d891a 100644
--- a/aws-encryption-sdk-net/codebuild/release/verify.yml
+++ b/aws-encryption-sdk-net/codebuild/release/verify.yml
@@ -8,7 +8,7 @@ env:
 phases:
   install:
     runtime-versions:
-      dotnet: 5.0
+      dotnet: 6.0
       python: 3.x
   build:
     commands:
diff --git a/codebuild/dotnet/generate-test-vectors.yml b/codebuild/dotnet/generate-test-vectors.yml
index a19a6c6a2..c58922039 100644
--- a/codebuild/dotnet/generate-test-vectors.yml
+++ b/codebuild/dotnet/generate-test-vectors.yml
@@ -7,6 +7,7 @@ env:
 phases:
   install:
     runtime-versions:
+      # TODO update to .NET 6.0
       dotnet: 5.0
       nodejs: 14
     commands:
diff --git a/codebuild/dotnet/test-vectors.yml b/codebuild/dotnet/test-vectors.yml
index b69cd12dd..61f7718c3 100644
--- a/codebuild/dotnet/test-vectors.yml
+++ b/codebuild/dotnet/test-vectors.yml
@@ -3,6 +3,7 @@ version: 0.2
 phases:
   install:
     runtime-versions:
+      # TODO update to .NET 6.0
       dotnet: 5.0
     commands:
       - cd ..
diff --git a/codebuild/dotnet/tests.yml b/codebuild/dotnet/tests.yml
index 0268cb005..9e2016d1b 100644
--- a/codebuild/dotnet/tests.yml
+++ b/codebuild/dotnet/tests.yml
@@ -3,6 +3,7 @@ version: 0.2
 phases:
   install:
     runtime-versions:
+      # TODO update to .NET 6.0
       dotnet: 5.0
     commands:
       - cd ..