diff --git a/.gitmodules b/.gitmodules
index a88a83f9..5a34d2af 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -18,7 +18,7 @@
 [submodule "test-server/java-v3-transition-server/s3ec-staging"]
 	path = test-server/java-v3-transition-server/s3ec-staging
 	url = git@github.com:aws/private-amazon-s3-encryption-client-java-staging.git
-	branch = imabhichow/transition-read-kc
+	branch = imabhichow/transition-read-kc-merge
 [submodule "test-server/java-v4-server/s3ec-staging"]
 	path = test-server/java-v4-server/s3ec-staging
 	url = git@github.com:aws/private-amazon-s3-encryption-client-java-staging.git
diff --git a/all-examples/java/v3/build.gradle.kts b/all-examples/java/v3/build.gradle.kts
index f0748625..9a4e35da 100644
--- a/all-examples/java/v3/build.gradle.kts
+++ b/all-examples/java/v3/build.gradle.kts
@@ -19,7 +19,7 @@ dependencies {
     implementation("software.amazon.awssdk:auth")
     
     // S3 Encryption Client v3 from local Maven repository
-    implementation("software.amazon.encryption.s3:amazon-s3-encryption-client-java:3.4.0-read-kc")
+    implementation("software.amazon.encryption.s3:amazon-s3-encryption-client-java:3.5.0-TRANSITION")
 }
 
 application {
diff --git a/all-examples/java/v4/build.gradle.kts b/all-examples/java/v4/build.gradle.kts
index 56b02b97..e20d0976 100644
--- a/all-examples/java/v4/build.gradle.kts
+++ b/all-examples/java/v4/build.gradle.kts
@@ -19,7 +19,7 @@ dependencies {
     implementation("software.amazon.awssdk:auth")
     
     // S3 Encryption Client v4 from local Maven repository
-    implementation("software.amazon.encryption.s3:amazon-s3-encryption-client-java:3.4.0-add-kc")
+    implementation("software.amazon.encryption.s3:amazon-s3-encryption-client-java:3.6.0")
 }
 
 application {
diff --git a/test-server/java-v3-transition-server/build.gradle.kts b/test-server/java-v3-transition-server/build.gradle.kts
index 7f249d65..09413acd 100644
--- a/test-server/java-v3-transition-server/build.gradle.kts
+++ b/test-server/java-v3-transition-server/build.gradle.kts
@@ -14,7 +14,7 @@ dependencies {
     implementation("software.amazon.smithy.java:aws-server-restjson:$smithyJavaVersion")
 
     // S3EC from local Maven repository (installed by mvn install)
-    implementation("software.amazon.encryption.s3:amazon-s3-encryption-client-java:3.4.0-read-kc")
+    implementation("software.amazon.encryption.s3:amazon-s3-encryption-client-java:3.5.0-TRANSITION")
 }
 
 // Use that application plugin to start the service via the `run` task.
diff --git a/test-server/java-v3-transition-server/s3ec-staging b/test-server/java-v3-transition-server/s3ec-staging
index 183f1984..c7fdc483 160000
--- a/test-server/java-v3-transition-server/s3ec-staging
+++ b/test-server/java-v3-transition-server/s3ec-staging
@@ -1 +1 @@
-Subproject commit 183f1984ed1679e8aa4cb368aeda66f2131a2061
+Subproject commit c7fdc483bd113b5e37e23f92ed0296702464506b
diff --git a/test-server/java-v4-server/build.gradle.kts b/test-server/java-v4-server/build.gradle.kts
index fcb3c3ca..57c45ef0 100644
--- a/test-server/java-v4-server/build.gradle.kts
+++ b/test-server/java-v4-server/build.gradle.kts
@@ -14,7 +14,7 @@ dependencies {
     implementation("software.amazon.smithy.java:aws-server-restjson:$smithyJavaVersion")
 
     // S3EC from local Maven repository (installed by mvn install)
-    implementation("software.amazon.encryption.s3:amazon-s3-encryption-client-java:3.4.0-add-kc")
+    implementation("software.amazon.encryption.s3:amazon-s3-encryption-client-java:3.6.0")
 }
 
 // Use that application plugin to start the service via the `run` task.
diff --git a/test-server/java-v4-server/s3ec-staging b/test-server/java-v4-server/s3ec-staging
index 7a1899bb..f3e490e1 160000
--- a/test-server/java-v4-server/s3ec-staging
+++ b/test-server/java-v4-server/s3ec-staging
@@ -1 +1 @@
-Subproject commit 7a1899bb8be6f137a3031ff76f2a1bf3f278e98d
+Subproject commit f3e490e19d3c51aa4a8ef87686693cd1ae2f9f6c