diff --git a/files/galaxy/tpv/tool_defaults.yml b/files/galaxy/tpv/tool_defaults.yml
index 19d3d0b3c..965e144c1 100644
--- a/files/galaxy/tpv/tool_defaults.yml
+++ b/files/galaxy/tpv/tool_defaults.yml
@@ -36,11 +36,9 @@ tools:
 
           user_preferences = user.extra_preferences
           pulsar_tag = user_preferences.get("distributed_compute|remote_resources", "None")
-          pulsar_tag = Tag("scheduling", pulsar_tag, TagType.REQUIRE) if pulsar_tag != "None" else None
-
-          if pulsar_tag:
+          if pulsar_tag != "None":
               entity.tpv_tags = entity.tpv_tags.combine(
-                  TagSetManager(tags=[pulsar_tag])
+                  SchedulingTags(require=[pulsar_tag])
               )
       - id: removed_remote_resources
         # This rule displays a meaningful error message when users who have selected remote resources that are no longer available (e.g. because they have been removed) attempt to send jobs to them.