diff --git a/entity-service b/entity-service
index 200095f2..88a7e4c0 160000
--- a/entity-service
+++ b/entity-service
@@ -1 +1 @@
-Subproject commit 200095f2d5486e38bfe554f39dea250908f472c2
+Subproject commit 88a7e4c0b77e538daf73663e092fbd3c6d067d40
diff --git a/hypertrace-graphql b/hypertrace-graphql
index cef8ab9b..2cdb158f 160000
--- a/hypertrace-graphql
+++ b/hypertrace-graphql
@@ -1 +1 @@
-Subproject commit cef8ab9b579df1208d2fc783209bf0416021ce94
+Subproject commit 2cdb158f0d2ae07a599dcce640e032b517037c22
diff --git a/hypertrace-service/src/main/resources/configs/hypertrace-graphql-service/default-cluster/application.conf b/hypertrace-service/src/main/resources/configs/hypertrace-graphql-service/default-cluster/application.conf
index f5499739..637e6513 100644
--- a/hypertrace-service/src/main/resources/configs/hypertrace-graphql-service/default-cluster/application.conf
+++ b/hypertrace-service/src/main/resources/configs/hypertrace-graphql-service/default-cluster/application.conf
@@ -12,6 +12,8 @@ gateway.service = {
   host = ${?GATEWAY_SERVICE_HOST_CONFIG}
   port = 9001
   port = ${?GATEWAY_SERVICE_PORT_CONFIG}
+  timeout = 10s
+  timeout = ${?GATEWAY_SERVICE_TIMEOUT}
 }
 
 entity.service = {