diff --git a/java/google/registry/bigquery/BigqueryModule.java b/java/google/registry/bigquery/BigqueryModule.java
index cc2ef0c40..74a005e14 100644
--- a/java/google/registry/bigquery/BigqueryModule.java
+++ b/java/google/registry/bigquery/BigqueryModule.java
@@ -23,9 +23,9 @@ import com.google.api.services.bigquery.model.TableFieldSchema;
 import com.google.common.collect.ImmutableList;
 
 import dagger.Module;
-import dagger.Multibindings;
 import dagger.Provides;
 import dagger.multibindings.ElementsIntoSet;
+import dagger.multibindings.Multibinds;
 
 import google.registry.config.ConfigModule.Config;
 import google.registry.request.OAuthScopes;
@@ -43,14 +43,11 @@ import java.util.Set;
  * @see google.registry.request.Modules.UseAppIdentityCredentialForGoogleApisModule
  */
 @Module
-public final class BigqueryModule {
+public abstract class BigqueryModule {
 
-  @Multibindings
-  interface BigQueryMultibindings {
-
-    /** Provides a map of BigQuery table names to field names. */
-    Map<String, ImmutableList<TableFieldSchema>> bigquerySchemas();
-  }
+  /** Provides a map of BigQuery table names to field names. */
+  @Multibinds
+  abstract Map<String, ImmutableList<TableFieldSchema>> bigquerySchemas();
 
   /** Provides OAuth2 scopes for the Bigquery service needed by Domain Registry. */
   @Provides
@@ -70,4 +67,7 @@ public final class BigqueryModule {
         .setApplicationName(projectId)
         .build();
   }
+
+  // No subclasses.
+  private BigqueryModule() {}
 }
diff --git a/java/google/registry/repositories.bzl b/java/google/registry/repositories.bzl
index 5940115f9..e9807e1c7 100644
--- a/java/google/registry/repositories.bzl
+++ b/java/google/registry/repositories.bzl
@@ -134,20 +134,20 @@ def domain_registry_repositories():
 
   native.maven_jar(
       name = "dagger",
-      artifact = "com.google.dagger:dagger:2.4",
-      sha1 = "6b290a792253035c9fcc912d6a4d7efb3e850211",
+      artifact = "com.google.dagger:dagger:2.5",
+      sha1 = "571f4e0451db64a7b41dbeb5f2503986fe5acdb4",
   )
 
   native.maven_jar(
       name = "dagger_compiler",
-      artifact = "com.google.dagger:dagger-compiler:2.4",
-      sha1 = "01053c9ef441e93088c9261c33163f6af30766b7",
+      artifact = "com.google.dagger:dagger-compiler:2.5",
+      sha1 = "96b9c749db4590549166740ba989fe3580eb0a19",
   )
 
   native.maven_jar(
       name = "dagger_producers",
-      artifact = "com.google.dagger:dagger-producers:2.4",
-      sha1 = "f334a19afdc2ce2d8d5191f8a0fac2321bdd50fc",
+      artifact = "com.google.dagger:dagger-producers:2.5",
+      sha1 = "a02d8016dddbe70c7c6c2093fae96bef5cb9fdbb",
   )
 
   native.maven_jar(