diff --git a/openpype/hosts/tvpaint/plugins/publish/collect_workfile.py b/openpype/hosts/tvpaint/plugins/publish/collect_workfile.py
index 8c7c8c3899..a3449663f8 100644
--- a/openpype/hosts/tvpaint/plugins/publish/collect_workfile.py
+++ b/openpype/hosts/tvpaint/plugins/publish/collect_workfile.py
@@ -2,17 +2,15 @@ import os
 import json
 import pyblish.api
 
-from openpype.client import get_asset_by_name
-from openpype.pipeline import legacy_io
-from openpype.pipeline.create import get_subset_name
 
-
-class CollectWorkfile(pyblish.api.ContextPlugin):
+class CollectWorkfile(pyblish.api.InstancePlugin):
     label = "Collect Workfile"
     order = pyblish.api.CollectorOrder - 0.4
     hosts = ["tvpaint"]
+    families = ["workfile"]
 
-    def process(self, context):
+    def process(self, instance):
+        context = instance.context
         current_file = context.data["currentFile"]
 
         self.log.info(
@@ -21,49 +19,14 @@ class CollectWorkfile(pyblish.api.ContextPlugin):
 
         dirpath, filename = os.path.split(current_file)
         basename, ext = os.path.splitext(filename)
-        instance = context.create_instance(name=basename)
 
-        # Project name from workfile context
-        project_name = context.data["workfile_context"]["project"]
-
-        # Get subset name of workfile instance
-        # Collect asset doc to get asset id
-        # - not sure if it's good idea to require asset id in
-        #   get_subset_name?
-        family = "workfile"
-        asset_name = context.data["workfile_context"]["asset"]
-        asset_doc = get_asset_by_name(project_name, asset_name)
-
-        # Host name from environment variable
-        host_name = os.environ["AVALON_APP"]
-        # Use empty variant value
-        variant = ""
-        task_name = legacy_io.Session["AVALON_TASK"]
-        subset_name = get_subset_name(
-            family,
-            variant,
-            task_name,
-            asset_doc,
-            project_name,
-            host_name,
-            project_settings=context.data["project_settings"]
-        )
-
-        # Create Workfile instance
-        instance.data.update({
-            "subset": subset_name,
-            "asset": context.data["asset"],
-            "label": subset_name,
-            "publish": True,
-            "family": "workfile",
-            "families": ["workfile"],
-            "representations": [{
-                "name": ext.lstrip("."),
-                "ext": ext.lstrip("."),
-                "files": filename,
-                "stagingDir": dirpath
-            }]
+        instance.data["representations"].append({
+            "name": ext.lstrip("."),
+            "ext": ext.lstrip("."),
+            "files": filename,
+            "stagingDir": dirpath
         })
+
         self.log.info("Collected workfile instance: {}".format(
             json.dumps(instance.data, indent=4)
         ))