diff --git a/pype/plugins/tvpaint/publish/collect_instances.py b/pype/plugins/tvpaint/publish/collect_instances.py
index d75ea83a4c..f1b3239f11 100644
--- a/pype/plugins/tvpaint/publish/collect_instances.py
+++ b/pype/plugins/tvpaint/publish/collect_instances.py
@@ -17,9 +17,6 @@ class CollectInstances(pyblish.api.ContextPlugin):
         ))
 
         for instance_data in workfile_instances:
-            instance_data["frameStart"] = context.data["frameStart"]
-            instance_data["frameEnd"] = context.data["frameEnd"]
-
             # Store workfile instance data to instance data
             instance_data["originData"] = copy.deepcopy(instance_data)
             # Global instance data modifications
@@ -54,6 +51,16 @@ class CollectInstances(pyblish.api.ContextPlugin):
                     "Instance with unknown family \"{}\": {}"
                 )
 
+            frame_start = context.data["frameStart"]
+            frame_end = frame_start
+            for layer in instance.data["layers"]:
+                _frame_end = layer["frame_end"]
+                if _frame_end > frame_end:
+                    frame_end = _frame_end
+
+            instance.data["frameStart"] = frame_start
+            instance.data["frameEnd"] = frame_end
+
             self.log.debug("Created instance: {}\n{}".format(
                 instance, json.dumps(instance.data, indent=4)
             ))
diff --git a/pype/plugins/tvpaint/publish/extract_sequence.py b/pype/plugins/tvpaint/publish/extract_sequence.py
index 5021862a88..358e91931c 100644
--- a/pype/plugins/tvpaint/publish/extract_sequence.py
+++ b/pype/plugins/tvpaint/publish/extract_sequence.py
@@ -123,7 +123,6 @@ class ExtractSequence(pyblish.api.Extractor):
             instance.data["representations"] = []
 
         # Fill tags
-        # TODO where to find out which tags should be added?
         if family_lowered in ("review", "renderlayer"):
             tags = ["review", "ftrack"]
         else: