diff --git a/build.gradle.kts b/build.gradle.kts
index 0aa9c03c..0e9f76d9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,10 +1,10 @@
 plugins {
-  id("org.hypertrace.repository-plugin") version "0.4.0"
+  id("org.hypertrace.repository-plugin") version "0.4.1"
   id("org.hypertrace.ci-utils-plugin") version "0.3.0"
   id("org.hypertrace.jacoco-report-plugin") version "0.2.0" apply false
-  id("org.hypertrace.docker-java-application-plugin") version "0.9.0" apply false
-  id("org.hypertrace.docker-publish-plugin") version "0.9.0" apply false
-  id("org.hypertrace.code-style-plugin") version "1.1.0" apply false
+  id("org.hypertrace.docker-java-application-plugin") version "0.9.5" apply false
+  id("org.hypertrace.docker-publish-plugin") version "0.9.5" apply false
+  id("org.hypertrace.code-style-plugin") version "1.1.2" apply false
 }
 
 subprojects {
diff --git a/hypertrace-core-graphql b/hypertrace-core-graphql
index b3f39e74..fd5b13d6 160000
--- a/hypertrace-core-graphql
+++ b/hypertrace-core-graphql
@@ -1 +1 @@
-Subproject commit b3f39e740c0c51357d3a744dbef5bbb7f4425dd8
+Subproject commit fd5b13d60a63ef6a5bacdfb9ae3fea49ce11f946
diff --git a/hypertrace-graphql-impl/src/main/java/org/hypertrace/graphql/impl/GraphQlModule.java b/hypertrace-graphql-impl/src/main/java/org/hypertrace/graphql/impl/GraphQlModule.java
index 4108b9f5..2d72e54e 100644
--- a/hypertrace-graphql-impl/src/main/java/org/hypertrace/graphql/impl/GraphQlModule.java
+++ b/hypertrace-graphql-impl/src/main/java/org/hypertrace/graphql/impl/GraphQlModule.java
@@ -54,9 +54,10 @@ protected void configure() {
     bind(GraphQlServiceConfig.class).toInstance(this.config);
     bind(HypertraceGraphQlServiceConfig.class).toInstance(this.config);
     bind(GraphQlServiceLifecycle.class).toInstance(this.serviceLifecycle);
+    bind(GrpcChannelRegistry.class).toInstance(this.grpcChannelRegistry);
     bind(Clock.class).toInstance(Clock.systemUTC());
     install(new GraphQlRequestContextModule());
-    install(new GraphQlGrpcModule(this.grpcChannelRegistry));
+    install(new GraphQlGrpcModule());
     install(new GraphQlSchemaRegistryModule());
     install(new GraphQlDeserializationRegistryModule());
     install(new HypertraceAttributeScopeModule());
diff --git a/hypertrace-graphql-impl/src/test/java/org/hypertrace/graphql/impl/GraphQlModuleTest.java b/hypertrace-graphql-impl/src/test/java/org/hypertrace/graphql/impl/GraphQlModuleTest.java
index 9a36d5bc..a6714759 100644
--- a/hypertrace-graphql-impl/src/test/java/org/hypertrace/graphql/impl/GraphQlModuleTest.java
+++ b/hypertrace-graphql-impl/src/test/java/org/hypertrace/graphql/impl/GraphQlModuleTest.java
@@ -4,6 +4,7 @@
 import static org.mockito.Mockito.mock;
 
 import com.google.inject.Guice;
+import graphql.schema.GraphQLSchema;
 import org.hypertrace.core.graphql.spi.lifecycle.GraphQlServiceLifecycle;
 import org.hypertrace.core.grpcutils.client.GrpcChannelRegistry;
 import org.hypertrace.graphql.config.HypertraceGraphQlServiceConfig;
@@ -22,4 +23,16 @@ public void testResolveBindings() {
                         mock(GrpcChannelRegistry.class)))
                 .getAllBindings());
   }
+
+  @Test
+  public void testResolveSchema() {
+    assertDoesNotThrow(
+        () ->
+            Guice.createInjector(
+                    new GraphQlModule(
+                        mock(HypertraceGraphQlServiceConfig.class),
+                        mock(GraphQlServiceLifecycle.class),
+                        mock(GrpcChannelRegistry.class)))
+                .getInstance(GraphQLSchema.class));
+  }
 }