diff --git a/java/google/registry/bigquery/BigqueryModule.java b/java/google/registry/bigquery/BigqueryModule.java
index 33137691c..cc2ef0c40 100644
--- a/java/google/registry/bigquery/BigqueryModule.java
+++ b/java/google/registry/bigquery/BigqueryModule.java
@@ -14,8 +14,6 @@
 
 package google.registry.bigquery;
 
-import static dagger.Provides.Type.SET_VALUES;
-
 import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.JsonFactory;
@@ -27,6 +25,7 @@ import com.google.common.collect.ImmutableList;
 import dagger.Module;
 import dagger.Multibindings;
 import dagger.Provides;
+import dagger.multibindings.ElementsIntoSet;
 
 import google.registry.config.ConfigModule.Config;
 import google.registry.request.OAuthScopes;
@@ -54,7 +53,8 @@ public final class BigqueryModule {
   }
 
   /** Provides OAuth2 scopes for the Bigquery service needed by Domain Registry. */
-  @Provides(type = SET_VALUES)
+  @Provides
+  @ElementsIntoSet
   @OAuthScopes
   static Set<String> provideBigqueryOAuthScopes() {
     return BigqueryScopes.all();
diff --git a/java/google/registry/export/DriveModule.java b/java/google/registry/export/DriveModule.java
index 80dd08a8a..14a7f1475 100644
--- a/java/google/registry/export/DriveModule.java
+++ b/java/google/registry/export/DriveModule.java
@@ -14,8 +14,6 @@
 
 package google.registry.export;
 
-import static dagger.Provides.Type.SET_VALUES;
-
 import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.JsonFactory;
@@ -24,6 +22,7 @@ import com.google.api.services.drive.DriveScopes;
 
 import dagger.Module;
 import dagger.Provides;
+import dagger.multibindings.ElementsIntoSet;
 
 import google.registry.config.ConfigModule.Config;
 import google.registry.request.OAuthScopes;
@@ -43,7 +42,8 @@ import java.util.Set;
 public final class DriveModule {
 
   /** Provides OAuth2 scopes for the Drive service needed by Domain Registry. */
-  @Provides(type = SET_VALUES)
+  @Provides
+  @ElementsIntoSet
   @OAuthScopes
   static Set<String> provideDriveOAuthScopes() {
     return DriveScopes.all();
diff --git a/java/google/registry/groups/DirectoryModule.java b/java/google/registry/groups/DirectoryModule.java
index d3742f9b1..a25a6cb0a 100644
--- a/java/google/registry/groups/DirectoryModule.java
+++ b/java/google/registry/groups/DirectoryModule.java
@@ -14,8 +14,6 @@
 
 package google.registry.groups;
 
-import static dagger.Provides.Type.SET_VALUES;
-
 import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
 import com.google.api.services.admin.directory.Directory;
 import com.google.api.services.admin.directory.DirectoryScopes;
@@ -23,6 +21,7 @@ import com.google.common.collect.ImmutableSet;
 
 import dagger.Module;
 import dagger.Provides;
+import dagger.multibindings.ElementsIntoSet;
 
 import google.registry.config.ConfigModule.Config;
 import google.registry.request.DelegatedOAuthScopes;
@@ -44,7 +43,8 @@ import javax.inject.Named;
 public final class DirectoryModule {
 
   /** Provides OAuth2 scopes for the Directory service needed by Domain Registry. */
-  @Provides(type = SET_VALUES)
+  @Provides
+  @ElementsIntoSet
   @DelegatedOAuthScopes
   static Set<String> provideDirectoryOAuthScopes() {
     return ImmutableSet.of(
diff --git a/java/google/registry/groups/GroupssettingsModule.java b/java/google/registry/groups/GroupssettingsModule.java
index 8937c8e60..215c8116b 100644
--- a/java/google/registry/groups/GroupssettingsModule.java
+++ b/java/google/registry/groups/GroupssettingsModule.java
@@ -14,8 +14,6 @@
 
 package google.registry.groups;
 
-import static dagger.Provides.Type.SET_VALUES;
-
 import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
 import com.google.api.services.groupssettings.Groupssettings;
 import com.google.api.services.groupssettings.GroupssettingsScopes;
@@ -23,6 +21,7 @@ import com.google.common.collect.ImmutableSet;
 
 import dagger.Module;
 import dagger.Provides;
+import dagger.multibindings.ElementsIntoSet;
 
 import google.registry.config.ConfigModule.Config;
 import google.registry.request.DelegatedOAuthScopes;
@@ -44,7 +43,8 @@ import javax.inject.Named;
 public final class GroupssettingsModule {
 
   /** Provides OAuth2 scopes for the Groupssettings service needed by Domain Registry. */
-  @Provides(type = SET_VALUES)
+  @Provides
+  @ElementsIntoSet
   @DelegatedOAuthScopes
   static Set<String> provideGroupssettingsOAuthScopes() {
     return ImmutableSet.of(GroupssettingsScopes.APPS_GROUPS_SETTINGS);