diff --git a/files/galaxy/tpv/tool_defaults.yml b/files/galaxy/tpv/tool_defaults.yml
index 8e12981d5..7b8d366fd 100644
--- a/files/galaxy/tpv/tool_defaults.yml
+++ b/files/galaxy/tpv/tool_defaults.yml
@@ -32,17 +32,24 @@ tools:
       - id: remote_resources
         if: user is not None
         execute: |
-          from tpv.core.entities import TagSetManager
-          pulsar_tag = None
+          from tpv.core.entities import Tag, TagSetManager, TagType
+
           user_preferences = user.extra_preferences
-          for data_item in user_preferences:
-            if "distributed_compute|remote_resources" in data_item:
-                if user_preferences[data_item] != "None":
-                    pulsar_tag = user_preferences[data_item]
-          new_tag = {'require':[pulsar_tag]} if pulsar_tag else {}
-          entity.tpv_tags = entity.tpv_tags.combine(TagSetManager.from_dict(new_tag))
-          if pulsar_tag == 'cz-pulsar' and helpers.tool_version_gte(tool, '2.3.1') and 'alphafold2' in tool.id:
-            entity.gpus = 1
+          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:
+              entity.tpv_tags = entity.tpv_tags.combine(
+                  TagSetManager(tags=[pulsar_tag])
+              )
+      - id: cz-pulsar_alphafold
+        if: |
+          all((
+              "cz-pulsar" in {tag.value for tag in entity.tpv_tags.tags},
+              tool.id.startswith("toolshed.g2.bx.psu.edu/repos/galaxy-australia/alphafold2/alphafold"),
+              helpers.tool_version_gte(tool, '2.3.1'),
+          ))
+        gpus: 1
 
     rank: |
       final_destinations = helpers.weighted_random_sampling(candidate_destinations)
diff --git a/files/galaxy/tpv/tools.yml b/files/galaxy/tpv/tools.yml
index 0b85d16c2..9a80209c6 100644
--- a/files/galaxy/tpv/tools.yml
+++ b/files/galaxy/tpv/tools.yml
@@ -18,6 +18,22 @@ tools:
     scheduling:
       require:
         - upload
+    rules:
+      - id: no-pulsar
+        if: user is not None
+        execute: |
+            from tpv.core.entities import Tag, TagSetManager, TagType
+
+            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
+
+            entity.tpv_tags.tags = [
+                tag
+                for tag in entity.tpv_tags.tags
+                if tag != pulsar_tag
+            ]
+
     env:
       TEMP: /data/1/galaxy_db/tmp