diff --git a/dshackle-cli/grpc b/dshackle-cli/grpc
index 48ea13c0..d21e88f5 160000
--- a/dshackle-cli/grpc
+++ b/dshackle-cli/grpc
@@ -1 +1 @@
-Subproject commit 48ea13c0d1ec8498d249039bc815a4698585873a
+Subproject commit d21e88f56f5a31fb5619cf9cf36c8649fa998535
diff --git a/emerald-java-client b/emerald-java-client
index ce795a05..8acf9425 160000
--- a/emerald-java-client
+++ b/emerald-java-client
@@ -1 +1 @@
-Subproject commit ce795a0572494745ee99da0719faaf0ff939cc0a
+Subproject commit 8acf9425bbadb6430f27ff609afc146026760066