diff --git a/openpype/hosts/nuke/plugins/publish/extract_thumbnail.py b/openpype/hosts/nuke/plugins/publish/extract_thumbnail.py
index b20df4ffe2..46288db743 100644
--- a/openpype/hosts/nuke/plugins/publish/extract_thumbnail.py
+++ b/openpype/hosts/nuke/plugins/publish/extract_thumbnail.py
@@ -8,6 +8,7 @@ from openpype.hosts.nuke import api as napi
 from openpype.hosts.nuke.api.lib import set_node_knobs_from_settings
 
 
+# Python 2/3 compatibility
 if sys.version_info[0] >= 3:
     unicode = str
 
@@ -45,11 +46,12 @@ class ExtractThumbnail(publish.Extractor):
                 for o_name, o_data in instance.data["bakePresets"].items():
                     self.render_thumbnail(instance, o_name, **o_data)
             else:
-                viewer_process_swithes = {
+                viewer_process_switches = {
                     "bake_viewer_process": True,
                     "bake_viewer_input_process": True
                 }
-                self.render_thumbnail(instance, None, **viewer_process_swithes)
+                self.render_thumbnail(
+                    instance, None, **viewer_process_switches)
 
     def render_thumbnail(self, instance, output_name=None, **kwargs):
         first_frame = instance.data["frameStartHandle"]
@@ -61,8 +63,6 @@ class ExtractThumbnail(publish.Extractor):
 
         # solve output name if any is set
         output_name = output_name or ""
-        if output_name:
-            output_name = "_" + output_name
 
         bake_viewer_process = kwargs["bake_viewer_process"]
         bake_viewer_input_process_node = kwargs[
@@ -166,26 +166,42 @@ class ExtractThumbnail(publish.Extractor):
             previous_node = dag_node
             temporary_nodes.append(dag_node)
 
+        thumb_name = "thumbnail"
+        # only add output name and
+        # if there are more than one bake preset
+        if (
+            output_name
+            and len(instance.data.get("bakePresets", {}).keys()) > 1
+        ):
+            thumb_name = "{}_{}".format(output_name, thumb_name)
+
         # create write node
         write_node = nuke.createNode("Write")
-        file = fhead[:-1] + output_name + ".jpg"
-        name = "thumbnail"
-        path = os.path.join(staging_dir, file).replace("\\", "/")
-        instance.data["thumbnail"] = path
-        write_node["file"].setValue(path)
+        file = fhead[:-1] + thumb_name + ".jpg"
+        thumb_path = os.path.join(staging_dir, file).replace("\\", "/")
+
+        # add thumbnail to cleanup
+        instance.context.data["cleanupFullPaths"].append(thumb_path)
+
+        # make sure only one thumbnail path is set
+        # and it is existing file
+        instance_thumb_path = instance.data.get("thumbnailPath")
+        if not instance_thumb_path or not os.path.isfile(instance_thumb_path):
+            instance.data["thumbnailPath"] = thumb_path
+
+        write_node["file"].setValue(thumb_path)
         write_node["file_type"].setValue("jpg")
         write_node["raw"].setValue(1)
         write_node.setInput(0, previous_node)
         temporary_nodes.append(write_node)
-        tags = ["thumbnail", "publish_on_farm"]
 
         repre = {
-            'name': name,
+            'name': thumb_name,
             'ext': "jpg",
-            "outputName": "thumb",
+            "outputName": thumb_name,
             'files': file,
             "stagingDir": staging_dir,
-            "tags": tags
+            "tags": ["thumbnail", "publish_on_farm", "delete"]
         }
         instance.data["representations"].append(repre)
 
diff --git a/openpype/plugins/publish/preintegrate_thumbnail_representation.py b/openpype/plugins/publish/preintegrate_thumbnail_representation.py
index 1c95b82c97..77bf2edba5 100644
--- a/openpype/plugins/publish/preintegrate_thumbnail_representation.py
+++ b/openpype/plugins/publish/preintegrate_thumbnail_representation.py
@@ -29,13 +29,12 @@ class PreIntegrateThumbnails(pyblish.api.InstancePlugin):
         if not repres:
             return
 
-        thumbnail_repre = None
+        thumbnail_repres = []
         for repre in repres:
-            if repre["name"] == "thumbnail":
-                thumbnail_repre = repre
-                break
+            if "thumbnail" in repre.get("tags", []):
+                thumbnail_repres.append(repre)
 
-        if not thumbnail_repre:
+        if not thumbnail_repres:
             return
 
         family = instance.data["family"]
@@ -60,14 +59,15 @@ class PreIntegrateThumbnails(pyblish.api.InstancePlugin):
         if not found_profile:
             return
 
-        thumbnail_repre.setdefault("tags", [])
+        for thumbnail_repre in thumbnail_repres:
+            thumbnail_repre.setdefault("tags", [])
 
-        if not found_profile["integrate_thumbnail"]:
-            if "delete" not in thumbnail_repre["tags"]:
-                thumbnail_repre["tags"].append("delete")
-        else:
-            if "delete" in thumbnail_repre["tags"]:
-                thumbnail_repre["tags"].remove("delete")
+            if not found_profile["integrate_thumbnail"]:
+                if "delete" not in thumbnail_repre["tags"]:
+                    thumbnail_repre["tags"].append("delete")
+            else:
+                if "delete" in thumbnail_repre["tags"]:
+                    thumbnail_repre["tags"].remove("delete")
 
-        self.log.debug(
-            "Thumbnail repre tags {}".format(thumbnail_repre["tags"]))
+            self.log.debug(
+                "Thumbnail repre tags {}".format(thumbnail_repre["tags"]))
diff --git a/tests/integration/hosts/nuke/test_publish_in_nuke.py b/tests/integration/hosts/nuke/test_publish_in_nuke.py
index bfd84e4fd5..b7bb8716c0 100644
--- a/tests/integration/hosts/nuke/test_publish_in_nuke.py
+++ b/tests/integration/hosts/nuke/test_publish_in_nuke.py
@@ -68,7 +68,7 @@ class TestPublishInNuke(NukeLocalPublishTestClass):
                                     name="workfileTest_task"))
 
         failures.append(
-            DBAssert.count_of_types(dbcon, "representation", 4))
+            DBAssert.count_of_types(dbcon, "representation", 3))
 
         additional_args = {"context.subset": "workfileTest_task",
                            "context.ext": "nk"}
@@ -85,7 +85,7 @@ class TestPublishInNuke(NukeLocalPublishTestClass):
         additional_args = {"context.subset": "renderTest_taskMain",
                            "name": "thumbnail"}
         failures.append(
-            DBAssert.count_of_types(dbcon, "representation", 1,
+            DBAssert.count_of_types(dbcon, "representation", 0,
                                     additional_args=additional_args))
 
         additional_args = {"context.subset": "renderTest_taskMain",