diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6509f392..8762c373 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
           project-name: AWS-ESDK-Java-CI
           buildspec-override: codebuild/ci/static-analysis.yml
           compute-type-override: BUILD_GENERAL1_MEDIUM
-          image-override: aws/codebuild/amazonlinux2-x86_64-standard:3.0
+          image-override: aws/codebuild/amazonlinux2-x86_64-standard:5.0
   vectorTests:
     name: Vector Tests
     runs-on: ubuntu-latest
@@ -36,9 +36,11 @@ jobs:
       matrix:
         platform:
           - distribution: openjdk
-            image: "aws/codebuild/standard:3.0"
+            runtime: corretto
+            image: "aws/codebuild/standard:7.0"
           - distribution: corretto
-            image: "aws/codebuild/amazonlinux2-x86_64-standard:3.0" # Corretto only runs on AL2
+            runtime: corretto
+            image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2
         version: [ 8, 11 ]
     steps:
       - name: Configure AWS Credentials
@@ -57,7 +59,7 @@ jobs:
           image-override: ${{ matrix.platform.image }}
           env-vars-for-codebuild: JAVA_ENV_VERSION
         env:
-          JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }}
+          JAVA_ENV_VERSION: ${{ matrix.platform.runtime }}${{ matrix.version }}
   vectorTestsMasterKeyProvider:
     name: Vector Tests MasterKeyProvider
     runs-on: ubuntu-latest
@@ -66,9 +68,11 @@ jobs:
       matrix:
         platform:
           - distribution: openjdk
-            image: "aws/codebuild/standard:3.0"
+            runtime: corretto
+            image: "aws/codebuild/standard:7.0"
           - distribution: corretto
-            image: "aws/codebuild/amazonlinux2-x86_64-standard:3.0" # Corretto only runs on AL2
+            runtime: corretto
+            image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2
         version: [ 8, 11 ]
     steps:
       - name: Configure AWS Credentials
@@ -87,7 +91,7 @@ jobs:
           image-override: ${{ matrix.platform.image }}
           env-vars-for-codebuild: JAVA_ENV_VERSION
         env:
-          JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }}
+          JAVA_ENV_VERSION: ${{ matrix.platform.runtime }}${{ matrix.version }}
   netVectorTests:
     name: ESDK-NET Vector Tests
     runs-on: ubuntu-latest
@@ -96,9 +100,11 @@ jobs:
       matrix:
         platform:
           - distribution: openjdk
-            image: "aws/codebuild/standard:3.0"
+            runtime: corretto
+            image: "aws/codebuild/standard:7.0"
           - distribution: corretto
-            image: "aws/codebuild/amazonlinux2-x86_64-standard:3.0" # Corretto only runs on AL2
+            runtime: corretto
+            image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2
         version: [ 8, 11 ]
     steps:
       - name: Configure AWS Credentials
@@ -117,7 +123,7 @@ jobs:
           image-override: ${{ matrix.platform.image }}
           env-vars-for-codebuild: JAVA_ENV_VERSION
         env:
-          JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }}
+          JAVA_ENV_VERSION: ${{ matrix.platform.runtime }}${{ matrix.version }}
   generateTestVectors:
     name: Generate Vectors
     runs-on: ubuntu-latest
@@ -127,9 +133,11 @@ jobs:
       matrix:
         platform:
           - distribution: openjdk
-            image: "aws/codebuild/standard:3.0"
+            runtime: corretto
+            image: "aws/codebuild/standard:7.0"
           - distribution: corretto
-            image: "aws/codebuild/amazonlinux2-x86_64-standard:3.0" # Corretto only runs on AL2
+            runtime: corretto
+            image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2
         version: [ 8, 11 ]
     steps:
       - name: Configure AWS Credentials
@@ -148,7 +156,7 @@ jobs:
           image-override: ${{ matrix.platform.image }}
           env-vars-for-codebuild: JAVA_ENV_VERSION
         env:
-          JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }}
+          JAVA_ENV_VERSION: ${{ matrix.platform.runtime }}${{ matrix.version }}
   releaseCI:
     name: Release CI
     runs-on: ubuntu-latest
@@ -166,10 +174,13 @@ jobs:
           project-name: AWS-ESDK-Java-CI
           buildspec-override: codebuild/ci/release-ci.yml
           compute-type-override: BUILD_GENERAL1_LARGE
-          image-override: aws/codebuild/standard:3.0
-          env-vars-for-codebuild: GITHUB_EVENT_NAME
+          image-override: aws/codebuild/standard:7.0
+          env-vars-for-codebuild: |
+            GITHUB_EVENT_NAME,
+            JAVA_ENV_VERSION
         env:
           GITHUB_EVENT_NAME: $GITHUB_EVENT_NAME
+          JAVA_ENV_VERSION: corretto11
   validateCI:
     name: Validate CI
     runs-on: ubuntu-latest
@@ -179,9 +190,11 @@ jobs:
       matrix:
         platform:
           - distribution: openjdk
-            image: "aws/codebuild/standard:3.0"
+            runtime: corretto
+            image: "aws/codebuild/standard:7.0"
           - distribution: corretto
-            image: "aws/codebuild/amazonlinux2-x86_64-standard:3.0" # Corretto only runs on AL2
+            runtime: corretto
+            image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2
         version: [ 8, 11 ]
     steps:
       - name: Configure AWS Credentials
@@ -203,6 +216,6 @@ jobs:
             JAVA_NUMERIC_VERSION,
             GITHUB_EVENT_NAME
         env:
-          JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }}
+          JAVA_ENV_VERSION: ${{ matrix.platform.runtime }}${{ matrix.version }}
           JAVA_NUMERIC_VERSION: ${{ matrix.version }}
           GITHUB_EVENT_NAME: $GITHUB_EVENT_NAME
diff --git a/README.md b/README.md
index 0955c229..629ca5ae 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ To use the AWS Encryption SDK for Java you must have:
       <dependency>
         <groupId>software.amazon.cryptography</groupId>
         <artifactId>aws-cryptographic-material-providers</artifactId>
-        <version>3.0.2</version>
+        <version>1.11.0</version>
       </dependency>
       <dependency>
         <groupId>software.amazon.awssdk</groupId>
@@ -69,7 +69,7 @@ To use the AWS Encryption SDK for Java you must have:
       <dependency>
           <groupId>com.amazonaws</groupId>
           <artifactId>aws-java-sdk</artifactId>
-          <version>3.0.2</version>
+          <version>1.12.794</version>
           <optional>true</optional>
       </dependency>
     </dependencies>
@@ -80,13 +80,13 @@ To use the AWS Encryption SDK for Java you must have:
   * **Via Gradle Kotlin**  
     In a Gradle Java Project, add the following to the _dependencies_ section:
     ```kotlin
-    implementation("com.amazonaws:aws-encryption-sdk-java:3.0.0")
-    implementation("software.amazon.cryptography:aws-cryptographic-material-providers:1.0.2")
-    implementation(platform("software.amazon.awssdk:bom:2.20.91"))
+    implementation("com.amazonaws:aws-encryption-sdk-java:3.0.2")
+    implementation("software.amazon.cryptography:aws-cryptographic-material-providers:1.11.0")
+    implementation(platform("software.amazon.awssdk:bom:2.40.2"))
     implementation("software.amazon.awssdk:kms")
     implementation("software.amazon.awssdk:dynamodb")
     // The following are optional:
-    implementation("com.amazonaws:aws-java-sdk:1.12.394")
+    implementation("com.amazonaws:aws-java-sdk:1.12.794")
     ```
 
 * **Bouncy Castle** or **Bouncy Castle FIPS**
diff --git a/codebuild/ci/release-ci.yml b/codebuild/ci/release-ci.yml
index 0505a956..79cc5cd3 100644
--- a/codebuild/ci/release-ci.yml
+++ b/codebuild/ci/release-ci.yml
@@ -16,7 +16,7 @@ env:
 phases:
   install:
     runtime-versions:
-      java: openjdk11
+      java: $JAVA_ENV_VERSION
     commands:
       - git submodule update --init submodules/MaterialProviders
       # Get Dafny