diff --git a/client/ayon_core/addon/base.py b/client/ayon_core/addon/base.py
index 21b1193b07..939fab68b8 100644
--- a/client/ayon_core/addon/base.py
+++ b/client/ayon_core/addon/base.py
@@ -51,8 +51,13 @@ IGNORED_MODULES_IN_AYON = set()
 # - this is used to log the missing addon
 MOVED_ADDON_MILESTONE_VERSIONS = {
     "applications": VersionInfo(0, 2, 0),
+    "clockify": VersionInfo(0, 2, 0),
+    "traypublisher": VersionInfo(0, 2, 0),
+    "tvpaint": VersionInfo(0, 2, 0),
+    "nuke": VersionInfo(0, 2, 0),
 }
 
+
 # Inherit from `object` for Python 2 hosts
 class _ModuleClass(object):
     """Fake module class for storing AYON addons.
diff --git a/client/ayon_core/hosts/blender/api/lib.py b/client/ayon_core/hosts/blender/api/lib.py
index 32137f0fcd..ea37f17d05 100644
--- a/client/ayon_core/hosts/blender/api/lib.py
+++ b/client/ayon_core/hosts/blender/api/lib.py
@@ -365,3 +365,62 @@ def maintained_time():
         yield
     finally:
         bpy.context.scene.frame_current = current_time
+
+
+def get_all_parents(obj):
+    """Get all recursive parents of object.
+
+    Arguments:
+        obj (bpy.types.Object): Object to get all parents for.
+
+    Returns:
+        List[bpy.types.Object]: All parents of object
+
+    """
+    result = []
+    while True:
+        obj = obj.parent
+        if not obj:
+            break
+        result.append(obj)
+    return result
+
+
+def get_highest_root(objects):
+    """Get the highest object (the least parents) among the objects.
+
+    If multiple objects have the same amount of parents (or no parents) the
+    first object found in the input iterable will be returned.
+
+    Note that this will *not* return objects outside of the input list, as
+    such it will not return the root of node from a child node. It is purely
+    intended to find the highest object among a list of objects. To instead
+    get the root from one object use, e.g. `get_all_parents(obj)[-1]`
+
+    Arguments:
+        objects (List[bpy.types.Object]): Objects to find the highest root in.
+
+    Returns:
+        Optional[bpy.types.Object]: First highest root found or None if no
+            `bpy.types.Object` found in input list.
+
+    """
+    included_objects = {obj.name_full for obj in objects}
+    num_parents_to_obj = {}
+    for obj in objects:
+        if isinstance(obj, bpy.types.Object):
+            parents = get_all_parents(obj)
+            # included parents
+            parents = [parent for parent in parents if
+                       parent.name_full in included_objects]
+            if not parents:
+                # A node without parents must be a highest root
+                return obj
+
+            num_parents_to_obj.setdefault(len(parents), obj)
+
+    if not num_parents_to_obj:
+        return
+
+    minimum_parent = min(num_parents_to_obj)
+    return num_parents_to_obj[minimum_parent]
diff --git a/client/ayon_core/hosts/blender/api/plugin.py b/client/ayon_core/hosts/blender/api/plugin.py
index 4a13d16805..e00e127f70 100644
--- a/client/ayon_core/hosts/blender/api/plugin.py
+++ b/client/ayon_core/hosts/blender/api/plugin.py
@@ -26,7 +26,8 @@ from .ops import (
 )
 from .lib import imprint
 
-VALID_EXTENSIONS = [".blend", ".json", ".abc", ".fbx"]
+VALID_EXTENSIONS = [".blend", ".json", ".abc", ".fbx",
+                    ".usd", ".usdc", ".usda"]
 
 
 def prepare_scene_name(
diff --git a/client/ayon_core/hosts/blender/plugins/create/create_usd.py b/client/ayon_core/hosts/blender/plugins/create/create_usd.py
new file mode 100644
index 0000000000..2c2d0c46c6
--- /dev/null
+++ b/client/ayon_core/hosts/blender/plugins/create/create_usd.py
@@ -0,0 +1,30 @@
+"""Create a USD Export."""
+
+from ayon_core.hosts.blender.api import plugin, lib
+
+
+class CreateUSD(plugin.BaseCreator):
+    """Create USD Export"""
+
+    identifier = "io.openpype.creators.blender.usd"
+    name = "usdMain"
+    label = "USD"
+    product_type = "usd"
+    icon = "gears"
+
+    def create(
+        self, product_name: str, instance_data: dict, pre_create_data: dict
+    ):
+        # Run parent create method
+        collection = super().create(
+            product_name, instance_data, pre_create_data
+        )
+
+        if pre_create_data.get("use_selection"):
+            objects = lib.get_selection()
+            for obj in objects:
+                collection.objects.link(obj)
+                if obj.type == 'EMPTY':
+                    objects.extend(obj.children)
+
+        return collection
diff --git a/client/ayon_core/hosts/blender/plugins/load/load_abc.py b/client/ayon_core/hosts/blender/plugins/load/load_cache.py
similarity index 94%
rename from client/ayon_core/hosts/blender/plugins/load/load_abc.py
rename to client/ayon_core/hosts/blender/plugins/load/load_cache.py
index c074b5ed13..30c847f89d 100644
--- a/client/ayon_core/hosts/blender/plugins/load/load_abc.py
+++ b/client/ayon_core/hosts/blender/plugins/load/load_cache.py
@@ -26,10 +26,10 @@ class CacheModelLoader(plugin.AssetLoader):
     Note:
         At least for now it only supports Alembic files.
     """
-    product_types = {"model", "pointcache", "animation"}
-    representations = {"abc"}
+    product_types = {"model", "pointcache", "animation", "usd"}
+    representations = {"abc", "usd"}
 
-    label = "Load Alembic"
+    label = "Load Cache"
     icon = "code-fork"
     color = "orange"
 
@@ -53,10 +53,21 @@ class CacheModelLoader(plugin.AssetLoader):
         plugin.deselect_all()
 
         relative = bpy.context.preferences.filepaths.use_relative_paths
-        bpy.ops.wm.alembic_import(
-            filepath=libpath,
-            relative_path=relative
-        )
+
+        if any(libpath.lower().endswith(ext)
+               for ext in [".usd", ".usda", ".usdc"]):
+            # USD
+            bpy.ops.wm.usd_import(
+                filepath=libpath,
+                relative_path=relative
+            )
+
+        else:
+            # Alembic
+            bpy.ops.wm.alembic_import(
+                filepath=libpath,
+                relative_path=relative
+            )
 
         imported = lib.get_selection()
 
diff --git a/client/ayon_core/hosts/blender/plugins/publish/collect_instance.py b/client/ayon_core/hosts/blender/plugins/publish/collect_instance.py
index d47c69a270..314ffd368a 100644
--- a/client/ayon_core/hosts/blender/plugins/publish/collect_instance.py
+++ b/client/ayon_core/hosts/blender/plugins/publish/collect_instance.py
@@ -12,7 +12,7 @@ class CollectBlenderInstanceData(pyblish.api.InstancePlugin):
     order = pyblish.api.CollectorOrder
     hosts = ["blender"]
     families = ["model", "pointcache", "animation", "rig", "camera", "layout",
-                "blendScene"]
+                "blendScene", "usd"]
     label = "Collect Instance"
 
     def process(self, instance):
diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_usd.py b/client/ayon_core/hosts/blender/plugins/publish/extract_usd.py
new file mode 100644
index 0000000000..1d4fa3d7ac
--- /dev/null
+++ b/client/ayon_core/hosts/blender/plugins/publish/extract_usd.py
@@ -0,0 +1,90 @@
+import os
+
+import bpy
+
+from ayon_core.pipeline import publish
+from ayon_core.hosts.blender.api import plugin, lib
+
+
+class ExtractUSD(publish.Extractor):
+    """Extract as USD."""
+
+    label = "Extract USD"
+    hosts = ["blender"]
+    families = ["usd"]
+
+    def process(self, instance):
+
+        # Ignore runtime instances (e.g. USD layers)
+        # TODO: This is better done via more specific `families`
+        if not instance.data.get("transientData", {}).get("instance_node"):
+            return
+
+        # Define extract output file path
+        stagingdir = self.staging_dir(instance)
+        filename = f"{instance.name}.usd"
+        filepath = os.path.join(stagingdir, filename)
+
+        # Perform extraction
+        self.log.debug("Performing extraction..")
+
+        # Select all members to "export selected"
+        plugin.deselect_all()
+
+        selected = []
+        for obj in instance:
+            if isinstance(obj, bpy.types.Object):
+                obj.select_set(True)
+                selected.append(obj)
+
+        root = lib.get_highest_root(objects=instance[:])
+        if not root:
+            instance_node = instance.data["transientData"]["instance_node"]
+            raise publish.KnownPublishError(
+                f"No root object found in instance: {instance_node.name}"
+            )
+        self.log.debug(f"Exporting using active root: {root.name}")
+
+        context = plugin.create_blender_context(
+            active=root, selected=selected)
+
+        # Export USD
+        with bpy.context.temp_override(**context):
+            bpy.ops.wm.usd_export(
+                filepath=filepath,
+                selected_objects_only=True,
+                export_textures=False,
+                relative_paths=False,
+                export_animation=False,
+                export_hair=False,
+                export_uvmaps=True,
+                # TODO: add for new version of Blender (4+?)
+                # export_mesh_colors=True,
+                export_normals=True,
+                export_materials=True,
+                use_instancing=True
+            )
+
+        plugin.deselect_all()
+
+        # Add representation
+        representation = {
+            'name': 'usd',
+            'ext': 'usd',
+            'files': filename,
+            "stagingDir": stagingdir,
+        }
+        instance.data.setdefault("representations", []).append(representation)
+        self.log.debug("Extracted instance '%s' to: %s",
+                       instance.name, representation)
+
+
+class ExtractModelUSD(ExtractUSD):
+    """Extract model as USD."""
+
+    label = "Extract USD (Model)"
+    hosts = ["blender"]
+    families = ["model"]
+
+    # Driven by settings
+    optional = True
diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_model.py b/client/ayon_core/hosts/houdini/plugins/create/create_model.py
new file mode 100644
index 0000000000..74d067b133
--- /dev/null
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_model.py
@@ -0,0 +1,141 @@
+# -*- coding: utf-8 -*-
+"""Creator plugin for creating Model product type.
+
+Note:
+    Currently, This creator plugin is the same as 'create_pointcache.py'
+    But renaming the product type to 'model'.
+
+    It's purpose to support
+    Maya (load/publish model from maya to/from houdini).
+
+    It's considered to support multiple representations in the future.
+"""
+
+from ayon_core.hosts.houdini.api import plugin
+from ayon_core.lib import BoolDef
+
+import hou
+
+
+
+class CreateModel(plugin.HoudiniCreator):
+    """Create Model"""
+    identifier = "io.openpype.creators.houdini.model"
+    label = "Model"
+    product_type = "model"
+    icon = "cube"
+
+    def create(self, product_name, instance_data, pre_create_data):
+        instance_data.pop("active", None)
+        instance_data.update({"node_type": "alembic"})
+        creator_attributes = instance_data.setdefault(
+            "creator_attributes", dict())
+        creator_attributes["farm"] = pre_create_data["farm"]
+
+        instance = super(CreateModel, self).create(
+            product_name,
+            instance_data,
+            pre_create_data)
+
+        instance_node = hou.node(instance.get("instance_node"))
+        parms = {
+            "use_sop_path": True,
+            "build_from_path": True,
+            "path_attrib": "path",
+            "prim_to_detail_pattern": "cbId",
+            "format": 2,
+            "facesets": 0,
+            "filename": hou.text.expandString(
+                "$HIP/pyblish/{}.abc".format(product_name))
+        }
+
+        if self.selected_nodes:
+            selected_node = self.selected_nodes[0]
+
+            # Although Houdini allows ObjNode path on `sop_path` for the
+            # the ROP node we prefer it set to the SopNode path explicitly
+
+            # Allow sop level paths (e.g. /obj/geo1/box1)
+            if isinstance(selected_node, hou.SopNode):
+                parms["sop_path"] = selected_node.path()
+                self.log.debug(
+                   "Valid SopNode selection, 'SOP Path' in ROP will be set to '%s'."
+                   % selected_node.path()
+                )
+
+            # Allow object level paths to Geometry nodes (e.g. /obj/geo1)
+            # but do not allow other object level nodes types like cameras, etc.
+            elif isinstance(selected_node, hou.ObjNode) and \
+                    selected_node.type().name() in ["geo"]:
+
+                # get the output node with the minimum
+                # 'outputidx' or the node with display flag
+                sop_path = self.get_obj_output(selected_node)
+
+                if sop_path:
+                    parms["sop_path"] = sop_path.path()
+                    self.log.debug(
+                        "Valid ObjNode selection, 'SOP Path' in ROP will be set to "
+                        "the child path '%s'."
+                        % sop_path.path()
+                    )
+
+            if not parms.get("sop_path", None):
+                self.log.debug(
+                    "Selection isn't valid. 'SOP Path' in ROP will be empty."
+                )
+        else:
+            self.log.debug(
+                "No Selection. 'SOP Path' in ROP will be empty."
+            )
+
+        instance_node.setParms(parms)
+        instance_node.parm("trange").set(1)
+
+        # Explicitly set f1 and f2 to frame start.
+        # Which forces the rop node to export one frame.
+        instance_node.parmTuple('f').deleteAllKeyframes()
+        fstart = int(hou.hscriptExpression("$FSTART"))
+        instance_node.parmTuple('f').set((fstart, fstart, 1))
+
+        # Lock any parameters in this list
+        to_lock = ["prim_to_detail_pattern"]
+        self.lock_parameters(instance_node, to_lock)
+
+    def get_network_categories(self):
+        return [
+            hou.ropNodeTypeCategory(),
+            hou.sopNodeTypeCategory()
+        ]
+
+    def get_obj_output(self, obj_node):
+        """Find output node with the smallest 'outputidx'."""
+
+        outputs = obj_node.subnetOutputs()
+
+        # if obj_node is empty
+        if not outputs:
+            return
+
+        # if obj_node has one output child whether its
+        # sop output node or a node with the render flag
+        elif len(outputs) == 1:
+            return outputs[0]
+
+        # if there are more than one, then it have multiple output nodes
+        # return the one with the minimum 'outputidx'
+        else:
+            return min(outputs,
+                       key=lambda node: node.evalParm('outputidx'))
+
+    def get_instance_attr_defs(self):
+        return [
+            BoolDef("farm",
+                    label="Submitting to Farm",
+                    default=False)
+        ]
+
+    def get_pre_create_attr_defs(self):
+        attrs = super().get_pre_create_attr_defs()
+        # Use same attributes as for instance attributes
+        return attrs + self.get_instance_attr_defs()
diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_cache_farm.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_cache_farm.py
index e931c7bf1b..e1782b2bb3 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/collect_cache_farm.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_cache_farm.py
@@ -11,7 +11,7 @@ class CollectDataforCache(pyblish.api.InstancePlugin):
     order = pyblish.api.CollectorOrder + 0.11
     families = ["ass", "pointcache",
                 "mantraifd", "redshiftproxy",
-                "vdbcache"]
+                "vdbcache", "model"]
     hosts = ["houdini"]
     targets = ["local", "remote"]
     label = "Collect Data for Cache"
@@ -43,10 +43,7 @@ class CollectDataforCache(pyblish.api.InstancePlugin):
         cache_files = {"_": instance.data["files"]}
         # Convert instance family to pointcache if it is bgeo or abc
         # because ???
-        for family in instance.data["families"]:
-            if family == "bgeo" or "abc":
-                instance.data["productType"] = "pointcache"
-                break
+        self.log.debug(instance.data["families"])
         instance.data.update({
             "plugin": "Houdini",
             "publish": True
diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_chunk_size.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_chunk_size.py
index 3e2561dd6f..f0913f2f0a 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/collect_chunk_size.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_chunk_size.py
@@ -10,7 +10,7 @@ class CollectChunkSize(pyblish.api.InstancePlugin,
     order = pyblish.api.CollectorOrder + 0.05
     families = ["ass", "pointcache",
                 "vdbcache", "mantraifd",
-                "redshiftproxy"]
+                "redshiftproxy", "model"]
     hosts = ["houdini"]
     targets = ["local", "remote"]
     label = "Collect Chunk Size"
diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_pointcache_type.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_instances_type.py
similarity index 51%
rename from client/ayon_core/hosts/houdini/plugins/publish/collect_pointcache_type.py
rename to client/ayon_core/hosts/houdini/plugins/publish/collect_instances_type.py
index 3323e97c20..07851387fe 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/collect_pointcache_type.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_instances_type.py
@@ -1,21 +1,24 @@
-"""Collector for pointcache types.
+"""Collector for different types.
 
-This will add additional family to pointcache instance based on
+This will add additional families to different instance based on
 the creator_identifier parameter.
 """
 import pyblish.api
 
 
 class CollectPointcacheType(pyblish.api.InstancePlugin):
-    """Collect data type for pointcache instance."""
+    """Collect data type for different instances."""
 
     order = pyblish.api.CollectorOrder
     hosts = ["houdini"]
-    families = ["pointcache"]
-    label = "Collect type of pointcache"
+    families = ["pointcache", "model"]
+    label = "Collect instances types"
 
     def process(self, instance):
         if instance.data["creator_identifier"] == "io.openpype.creators.houdini.bgeo":  # noqa: E501
             instance.data["families"] += ["bgeo"]
-        elif instance.data["creator_identifier"] == "io.openpype.creators.houdini.pointcache":  # noqa: E501
+        elif instance.data["creator_identifier"] in {
+            "io.openpype.creators.houdini.pointcache",
+            "io.openpype.creators.houdini.model"
+        }:
             instance.data["families"] += ["abc"]
diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_local_render_instances.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_local_render_instances.py
index 5a446fa0d3..474002e1ee 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/collect_local_render_instances.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_local_render_instances.py
@@ -132,6 +132,6 @@ class CollectLocalRenderInstances(pyblish.api.InstancePlugin):
                 ]
             })
 
-        # Remove original render instance
-        # I can't remove it here as I still need it to trigger the render.
-        # context.remove(instance)
+        # Skip integrating original render instance.
+        # We are not removing it because it's used to trigger the render.
+        instance.data["integrate"] = False
diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_output_node.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_output_node.py
index 26381e065e..289222f32b 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/collect_output_node.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_output_node.py
@@ -15,7 +15,8 @@ class CollectOutputSOPPath(pyblish.api.InstancePlugin):
         "usd",
         "usdrender",
         "redshiftproxy",
-        "staticMesh"
+        "staticMesh",
+        "model"
     ]
 
     hosts = ["houdini"]
diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_export_is_a_single_frame.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_export_is_a_single_frame.py
new file mode 100644
index 0000000000..b188055bc7
--- /dev/null
+++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_export_is_a_single_frame.py
@@ -0,0 +1,60 @@
+# -*- coding: utf-8 -*-
+"""Validator for checking that export is a single frame."""
+import pyblish.api
+from ayon_core.pipeline import (
+    PublishValidationError,
+    OptionalPyblishPluginMixin
+)
+from ayon_core.pipeline.publish import ValidateContentsOrder
+from ayon_core.hosts.houdini.api.action import SelectInvalidAction
+
+
+class ValidateSingleFrame(pyblish.api.InstancePlugin,
+                           OptionalPyblishPluginMixin):
+    """Validate Export is a Single Frame.
+
+    It checks if rop node is exporting one frame.
+    This is mainly for Model product type.
+    """
+
+    families = ["model"]
+    hosts = ["houdini"]
+    label = "Validate Single Frame"
+    order = ValidateContentsOrder + 0.1
+    actions = [SelectInvalidAction]
+
+    def process(self, instance):
+
+        invalid = self.get_invalid(instance)
+        if invalid:
+            nodes = [n.path() for n in invalid]
+            raise PublishValidationError(
+                "See log for details. "
+                "Invalid nodes: {0}".format(nodes)
+            )
+
+    @classmethod
+    def get_invalid(cls, instance):
+
+        invalid = []
+
+        frame_start = instance.data.get("frameStartHandle")
+        frame_end = instance.data.get("frameEndHandle")
+
+        # This happens if instance node has no 'trange' parameter.
+        if frame_start is None or frame_end is None:
+            cls.log.debug(
+                "No frame data, skipping check.."
+            )
+            return
+
+        if frame_start != frame_end:
+            invalid.append(instance.data["instance_node"])
+            cls.log.error(
+                "Invalid frame range on '%s'."
+                "You should use the same frame number for 'f1' "
+                "and 'f2' parameters.",
+                instance.data["instance_node"].path()
+            )
+
+        return invalid
diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_mesh_is_static.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_mesh_is_static.py
index 289e00339b..9652367bfe 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/validate_mesh_is_static.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_mesh_is_static.py
@@ -16,9 +16,13 @@ class ValidateMeshIsStatic(pyblish.api.InstancePlugin,
     """Validate mesh is static.
 
     It checks if output node is time dependent.
+    this avoids getting different output from ROP node when extracted
+    from a different frame than the first frame.
+    (Might be overly restrictive though)
     """
 
-    families = ["staticMesh"]
+    families = ["staticMesh",
+                "model"]
     hosts = ["houdini"]
     label = "Validate Mesh is Static"
     order = ValidateContentsOrder + 0.1
diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_mkpaths_toggled.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_mkpaths_toggled.py
index 38f1c4e176..5e59eb505f 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/validate_mkpaths_toggled.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_mkpaths_toggled.py
@@ -7,7 +7,7 @@ class ValidateIntermediateDirectoriesChecked(pyblish.api.InstancePlugin):
     """Validate Create Intermediate Directories is enabled on ROP node."""
 
     order = pyblish.api.ValidatorOrder
-    families = ["pointcache", "camera", "vdbcache"]
+    families = ["pointcache", "camera", "vdbcache", "model"]
     hosts = ["houdini"]
     label = "Create Intermediate Directories Checked"
 
diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_sop_output_node.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_sop_output_node.py
index 61cf7596ac..d67192d28e 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/validate_sop_output_node.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_sop_output_node.py
@@ -22,7 +22,7 @@ class ValidateSopOutputNode(pyblish.api.InstancePlugin):
     """
 
     order = pyblish.api.ValidatorOrder
-    families = ["pointcache", "vdbcache"]
+    families = ["pointcache", "vdbcache", "model"]
     hosts = ["houdini"]
     label = "Validate Output Node (SOP)"
     actions = [SelectROPAction, SelectInvalidAction]
diff --git a/client/ayon_core/modules/clockify/__init__.py b/client/ayon_core/modules/clockify/__init__.py
deleted file mode 100644
index 98834b516c..0000000000
--- a/client/ayon_core/modules/clockify/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from .clockify_module import ClockifyModule
-
-__all__ = (
-    "ClockifyModule",
-)
diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_pools.py b/client/ayon_core/modules/deadline/plugins/publish/collect_pools.py
index 6923c2b16b..2592d358e5 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/collect_pools.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/collect_pools.py
@@ -26,27 +26,32 @@ class CollectDeadlinePools(pyblish.api.InstancePlugin,
 
     order = pyblish.api.CollectorOrder + 0.420
     label = "Collect Deadline Pools"
-    hosts = ["aftereffects",
-             "fusion",
-             "harmony"
-             "nuke",
-             "maya",
-             "max",
-             "houdini"]
+    hosts = [
+        "aftereffects",
+        "fusion",
+        "harmony",
+        "maya",
+        "max",
+        "houdini",
+        "nuke",
+    ]
 
-    families = ["render",
-                "rendering",
-                "render.farm",
-                "renderFarm",
-                "renderlayer",
-                "maxrender",
-                "usdrender",
-                "redshift_rop",
-                "arnold_rop",
-                "mantra_rop",
-                "karma_rop",
-                "vray_rop",
-                "publish.hou"]
+    families = [
+        "render",
+        "prerender",
+        "rendering",
+        "render.farm",
+        "renderFarm",
+        "renderlayer",
+        "maxrender",
+        "usdrender",
+        "redshift_rop",
+        "arnold_rop",
+        "mantra_rop",
+        "karma_rop",
+        "vray_rop",
+        "publish.hou",
+    ]
 
     primary_pool = None
     secondary_pool = None
diff --git a/client/ayon_core/plugins/publish/validate_version.py b/client/ayon_core/plugins/publish/validate_version.py
index 9031194e8c..25a5757330 100644
--- a/client/ayon_core/plugins/publish/validate_version.py
+++ b/client/ayon_core/plugins/publish/validate_version.py
@@ -1,8 +1,10 @@
 import pyblish.api
-from ayon_core.pipeline.publish import PublishValidationError
+from ayon_core.pipeline.publish import (
+    PublishValidationError, OptionalPyblishPluginMixin
+)
 
 
-class ValidateVersion(pyblish.api.InstancePlugin):
+class ValidateVersion(pyblish.api.InstancePlugin, OptionalPyblishPluginMixin):
     """Validate instance version.
 
     AYON does not allow overwriting previously published versions.
@@ -18,6 +20,9 @@ class ValidateVersion(pyblish.api.InstancePlugin):
     active = True
 
     def process(self, instance):
+        if not self.is_active(instance.data):
+            return
+
         version = instance.data.get("version")
         latest_version = instance.data.get("latestVersion")
 
diff --git a/client/ayon_core/tools/common_models/projects.py b/client/ayon_core/tools/common_models/projects.py
index 19a38bee21..89dd881a10 100644
--- a/client/ayon_core/tools/common_models/projects.py
+++ b/client/ayon_core/tools/common_models/projects.py
@@ -5,7 +5,7 @@ import ayon_api
 import six
 
 from ayon_core.style import get_default_entity_icon_color
-from ayon_core.lib import CacheItem
+from ayon_core.lib import CacheItem, NestedCacheItem
 
 PROJECTS_MODEL_SENDER = "projects.model"
 
@@ -17,6 +17,49 @@ class AbstractHierarchyController:
         pass
 
 
+class StatusItem:
+    """Item representing status of project.
+
+    Args:
+        name (str): Status name ("Not ready").
+        color (str): Status color in hex ("#434a56").
+        short (str): Short status name ("NRD").
+        icon (str): Icon name in MaterialIcons ("fiber_new").
+        state (Literal["not_started", "in_progress", "done", "blocked"]):
+            Status state.
+
+    """
+    def __init__(self, name, color, short, icon, state):
+        self.name = name
+        self.color = color
+        self.short = short
+        self.icon = icon
+        self.state = state
+
+    def to_data(self):
+        return {
+            "name": self.name,
+            "color": self.color,
+            "short": self.short,
+            "icon": self.icon,
+            "state": self.state,
+        }
+
+    @classmethod
+    def from_data(cls, data):
+        return cls(**data)
+
+    @classmethod
+    def from_project_item(cls, status_data):
+        return cls(
+            name=status_data["name"],
+            color=status_data["color"],
+            short=status_data["shortName"],
+            icon=status_data["icon"],
+            state=status_data["state"],
+        )
+
+
 class ProjectItem:
     """Item representing folder entity on a server.
 
@@ -40,6 +83,23 @@ class ProjectItem:
             }
         self.icon = icon
 
+    @classmethod
+    def from_entity(cls, project_entity):
+        """Creates folder item from entity.
+
+        Args:
+            project_entity (dict[str, Any]): Project entity.
+
+        Returns:
+            ProjectItem: Project item.
+
+        """
+        return cls(
+            project_entity["name"],
+            project_entity["active"],
+            project_entity["library"],
+        )
+
     def to_data(self):
         """Converts folder item to data.
 
@@ -79,7 +139,7 @@ def _get_project_items_from_entitiy(projects):
     """
 
     return [
-        ProjectItem(project["name"], project["active"], project["library"])
+        ProjectItem.from_entity(project)
         for project in projects
     ]
 
@@ -87,18 +147,29 @@ def _get_project_items_from_entitiy(projects):
 class ProjectsModel(object):
     def __init__(self, controller):
         self._projects_cache = CacheItem(default_factory=list)
-        self._project_items_by_name = {}
-        self._projects_by_name = {}
+        self._project_statuses_cache = NestedCacheItem(
+            levels=1, default_factory=list
+        )
+        self._projects_by_name = NestedCacheItem(
+            levels=1, default_factory=list
+        )
 
         self._is_refreshing = False
         self._controller = controller
 
     def reset(self):
         self._projects_cache.reset()
-        self._project_items_by_name = {}
-        self._projects_by_name = {}
+        self._project_statuses_cache.reset()
+        self._projects_by_name.reset()
 
     def refresh(self):
+        """Refresh project items.
+
+        This method will requery list of ProjectItem returned by
+        'get_project_items'.
+
+        To reset all cached items use 'reset' method.
+        """
         self._refresh_projects_cache()
 
     def get_project_items(self, sender):
@@ -117,12 +188,51 @@ class ProjectsModel(object):
         return self._projects_cache.get_data()
 
     def get_project_entity(self, project_name):
-        if project_name not in self._projects_by_name:
+        """Get project entity.
+
+        Args:
+            project_name (str): Project name.
+
+        Returns:
+            Union[dict[str, Any], None]: Project entity or None if project
+                was not found by name.
+
+        """
+        project_cache = self._projects_by_name[project_name]
+        if not project_cache.is_valid:
             entity = None
             if project_name:
                 entity = ayon_api.get_project(project_name)
-            self._projects_by_name[project_name] = entity
-        return self._projects_by_name[project_name]
+            project_cache.update_data(entity)
+        return project_cache.get_data()
+
+    def get_project_status_items(self, project_name, sender):
+        """Get project status items.
+
+        Args:
+            project_name (str): Project name.
+            sender (Union[str, None]): Name of sender who asked for items.
+
+        Returns:
+            list[StatusItem]: Status items for project.
+
+        """
+        statuses_cache = self._project_statuses_cache[project_name]
+        if not statuses_cache.is_valid:
+            with self._project_statuses_refresh_event_manager(
+                sender, project_name
+            ):
+                project_entity = None
+                if project_name:
+                    project_entity = self.get_project_entity(project_name)
+                statuses = []
+                if project_entity:
+                    statuses = [
+                        StatusItem.from_project_item(status)
+                        for status in project_entity["statuses"]
+                    ]
+                statuses_cache.update_data(statuses)
+        return statuses_cache.get_data()
 
     @contextlib.contextmanager
     def _project_refresh_event_manager(self, sender):
@@ -143,6 +253,23 @@ class ProjectsModel(object):
             )
             self._is_refreshing = False
 
+    @contextlib.contextmanager
+    def _project_statuses_refresh_event_manager(self, sender, project_name):
+        self._controller.emit_event(
+            "projects.statuses.refresh.started",
+            {"sender": sender, "project_name": project_name},
+            PROJECTS_MODEL_SENDER
+        )
+        try:
+            yield
+
+        finally:
+            self._controller.emit_event(
+                "projects.statuses.refresh.finished",
+                {"sender": sender, "project_name": project_name},
+                PROJECTS_MODEL_SENDER
+            )
+
     def _refresh_projects_cache(self, sender=None):
         if self._is_refreshing:
             return None
diff --git a/client/ayon_core/tools/launcher/ui/actions_widget.py b/client/ayon_core/tools/launcher/ui/actions_widget.py
index a225827418..2ffce13292 100644
--- a/client/ayon_core/tools/launcher/ui/actions_widget.py
+++ b/client/ayon_core/tools/launcher/ui/actions_widget.py
@@ -290,6 +290,34 @@ class ActionDelegate(QtWidgets.QStyledItemDelegate):
         painter.drawPixmap(extender_x, extender_y, pix)
 
 
+class ActionsProxyModel(QtCore.QSortFilterProxyModel):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.setSortCaseSensitivity(QtCore.Qt.CaseInsensitive)
+
+    def lessThan(self, left, right):
+        # Sort by action order and then by label
+        left_value = left.data(ACTION_SORT_ROLE)
+        right_value = right.data(ACTION_SORT_ROLE)
+
+        # Values are same -> use super sorting
+        if left_value == right_value:
+            # Default behavior is using DisplayRole
+            return super().lessThan(left, right)
+
+        # Validate 'None' values
+        if right_value is None:
+            return True
+        if left_value is None:
+            return False
+        # Sort values and handle incompatible types
+        try:
+            return left_value < right_value
+        except TypeError:
+            return True
+
+
 class ActionsWidget(QtWidgets.QWidget):
     def __init__(self, controller, parent):
         super(ActionsWidget, self).__init__(parent)
@@ -316,10 +344,7 @@ class ActionsWidget(QtWidgets.QWidget):
 
         model = ActionsQtModel(controller)
 
-        proxy_model = QtCore.QSortFilterProxyModel()
-        proxy_model.setSortCaseSensitivity(QtCore.Qt.CaseInsensitive)
-        proxy_model.setSortRole(ACTION_SORT_ROLE)
-
+        proxy_model = ActionsProxyModel()
         proxy_model.setSourceModel(model)
         view.setModel(proxy_model)
 
@@ -359,7 +384,8 @@ class ActionsWidget(QtWidgets.QWidget):
     def _on_model_refresh(self):
         self._proxy_model.sort(0)
         # Force repaint all items
-        self._view.update()
+        viewport = self._view.viewport()
+        viewport.update()
 
     def _on_animation(self):
         time_now = time.time()
diff --git a/client/ayon_core/tools/loader/abstract.py b/client/ayon_core/tools/loader/abstract.py
index 7a7d335092..509db4d037 100644
--- a/client/ayon_core/tools/loader/abstract.py
+++ b/client/ayon_core/tools/loader/abstract.py
@@ -114,6 +114,7 @@ class VersionItem:
         thumbnail_id (Union[str, None]): Thumbnail id.
         published_time (Union[str, None]): Published time in format
             '%Y%m%dT%H%M%SZ'.
+        status (Union[str, None]): Status name.
         author (Union[str, None]): Author.
         frame_range (Union[str, None]): Frame range.
         duration (Union[int, None]): Duration.
@@ -132,6 +133,7 @@ class VersionItem:
         thumbnail_id,
         published_time,
         author,
+        status,
         frame_range,
         duration,
         handles,
@@ -146,6 +148,7 @@ class VersionItem:
         self.is_hero = is_hero
         self.published_time = published_time
         self.author = author
+        self.status = status
         self.frame_range = frame_range
         self.duration = duration
         self.handles = handles
@@ -185,6 +188,7 @@ class VersionItem:
             "is_hero": self.is_hero,
             "published_time": self.published_time,
             "author": self.author,
+            "status": self.status,
             "frame_range": self.frame_range,
             "duration": self.duration,
             "handles": self.handles,
@@ -488,6 +492,27 @@ class FrontendLoaderController(_BaseLoaderController):
 
         pass
 
+    @abstractmethod
+    def get_project_status_items(self, project_name, sender=None):
+        """Items for all projects available on server.
+
+        Triggers event topics "projects.statuses.refresh.started" and
+        "projects.statuses.refresh.finished" with data:
+            {
+                "sender": sender,
+                "project_name": project_name
+            }
+
+        Args:
+            project_name (Union[str, None]): Project name.
+            sender (Optional[str]): Sender who requested the items.
+
+        Returns:
+            list[StatusItem]: List of status items.
+        """
+
+        pass
+
     @abstractmethod
     def get_product_items(self, project_name, folder_ids, sender=None):
         """Product items for folder ids.
diff --git a/client/ayon_core/tools/loader/control.py b/client/ayon_core/tools/loader/control.py
index 0c9bb369c7..35188369c2 100644
--- a/client/ayon_core/tools/loader/control.py
+++ b/client/ayon_core/tools/loader/control.py
@@ -180,6 +180,11 @@ class LoaderController(BackendLoaderController, FrontendLoaderController):
     def get_project_items(self, sender=None):
         return self._projects_model.get_project_items(sender)
 
+    def get_project_status_items(self, project_name, sender=None):
+        return self._projects_model.get_project_status_items(
+            project_name, sender
+        )
+
     def get_folder_items(self, project_name, sender=None):
         return self._hierarchy_model.get_folder_items(project_name, sender)
 
diff --git a/client/ayon_core/tools/loader/models/products.py b/client/ayon_core/tools/loader/models/products.py
index a3bbc30a09..c9325c4480 100644
--- a/client/ayon_core/tools/loader/models/products.py
+++ b/client/ayon_core/tools/loader/models/products.py
@@ -58,6 +58,7 @@ def version_item_from_entity(version):
         thumbnail_id=version["thumbnailId"],
         published_time=published_time,
         author=author,
+        status=version["status"],
         frame_range=frame_range,
         duration=duration,
         handles=handles,
@@ -526,8 +527,11 @@ class ProductsModel:
         products = list(ayon_api.get_products(project_name, **kwargs))
         product_ids = {product["id"] for product in products}
 
+        # Add 'status' to fields -> fixed in ayon-python-api 1.0.4
+        fields = ayon_api.get_default_fields_for_type("version")
+        fields.add("status")
         versions = ayon_api.get_versions(
-            project_name, product_ids=product_ids
+            project_name, product_ids=product_ids, fields=fields
         )
 
         return self._create_product_items(
diff --git a/client/ayon_core/tools/loader/ui/products_delegates.py b/client/ayon_core/tools/loader/ui/products_delegates.py
index 12ed1165ae..1ac19b53eb 100644
--- a/client/ayon_core/tools/loader/ui/products_delegates.py
+++ b/client/ayon_core/tools/loader/ui/products_delegates.py
@@ -6,6 +6,9 @@ from ayon_core.tools.utils.lib import format_version
 from .products_model import (
     PRODUCT_ID_ROLE,
     VERSION_NAME_EDIT_ROLE,
+    VERSION_STATUS_NAME_ROLE,
+    VERSION_STATUS_SHORT_ROLE,
+    VERSION_STATUS_COLOR_ROLE,
     VERSION_ID_ROLE,
     PRODUCT_IN_SCENE_ROLE,
     ACTIVE_SITE_ICON_ROLE,
@@ -104,7 +107,10 @@ class VersionDelegate(QtWidgets.QStyledItemDelegate):
             style = QtWidgets.QApplication.style()
 
         style.drawControl(
-            style.CE_ItemViewItem, option, painter, option.widget
+            QtWidgets.QCommonStyle.CE_ItemViewItem,
+            option,
+            painter,
+            option.widget
         )
 
         painter.save()
@@ -116,9 +122,14 @@ class VersionDelegate(QtWidgets.QStyledItemDelegate):
         pen.setColor(fg_color)
         painter.setPen(pen)
 
-        text_rect = style.subElementRect(style.SE_ItemViewItemText, option)
+        text_rect = style.subElementRect(
+            QtWidgets.QCommonStyle.SE_ItemViewItemText,
+            option
+        )
         text_margin = style.proxy().pixelMetric(
-            style.PM_FocusFrameHMargin, option, option.widget
+            QtWidgets.QCommonStyle.PM_FocusFrameHMargin,
+            option,
+            option.widget
         ) + 1
 
         painter.drawText(
@@ -194,6 +205,57 @@ class LoadedInSceneDelegate(QtWidgets.QStyledItemDelegate):
         option.palette.setBrush(QtGui.QPalette.Text, color)
 
 
+class StatusDelegate(QtWidgets.QStyledItemDelegate):
+    """Delegate showing status name and short name."""
+
+    def paint(self, painter, option, index):
+        if option.widget:
+            style = option.widget.style()
+        else:
+            style = QtWidgets.QApplication.style()
+
+        style.drawControl(
+            QtWidgets.QCommonStyle.CE_ItemViewItem,
+            option,
+            painter,
+            option.widget
+        )
+
+        painter.save()
+
+        text_rect = style.subElementRect(
+            QtWidgets.QCommonStyle.SE_ItemViewItemText,
+            option
+        )
+        text_margin = style.proxy().pixelMetric(
+            QtWidgets.QCommonStyle.PM_FocusFrameHMargin,
+            option,
+            option.widget
+        ) + 1
+        padded_text_rect = text_rect.adjusted(
+            text_margin, 0, - text_margin, 0
+        )
+
+        fm = QtGui.QFontMetrics(option.font)
+        text = index.data(VERSION_STATUS_NAME_ROLE)
+        if padded_text_rect.width() < fm.width(text):
+            text = index.data(VERSION_STATUS_SHORT_ROLE)
+
+        status_color = index.data(VERSION_STATUS_COLOR_ROLE)
+        fg_color = QtGui.QColor(status_color)
+        pen = painter.pen()
+        pen.setColor(fg_color)
+        painter.setPen(pen)
+
+        painter.drawText(
+            padded_text_rect,
+            option.displayAlignment,
+            text
+        )
+
+        painter.restore()
+
+
 class SiteSyncDelegate(QtWidgets.QStyledItemDelegate):
     """Paints icons and downloaded representation ration for both sites."""
 
diff --git a/client/ayon_core/tools/loader/ui/products_model.py b/client/ayon_core/tools/loader/ui/products_model.py
index b465679c3b..f309473d10 100644
--- a/client/ayon_core/tools/loader/ui/products_model.py
+++ b/client/ayon_core/tools/loader/ui/products_model.py
@@ -22,18 +22,21 @@ VERSION_HERO_ROLE = QtCore.Qt.UserRole + 11
 VERSION_NAME_ROLE = QtCore.Qt.UserRole + 12
 VERSION_NAME_EDIT_ROLE = QtCore.Qt.UserRole + 13
 VERSION_PUBLISH_TIME_ROLE = QtCore.Qt.UserRole + 14
-VERSION_AUTHOR_ROLE = QtCore.Qt.UserRole + 15
-VERSION_FRAME_RANGE_ROLE = QtCore.Qt.UserRole + 16
-VERSION_DURATION_ROLE = QtCore.Qt.UserRole + 17
-VERSION_HANDLES_ROLE = QtCore.Qt.UserRole + 18
-VERSION_STEP_ROLE = QtCore.Qt.UserRole + 19
-VERSION_AVAILABLE_ROLE = QtCore.Qt.UserRole + 20
-VERSION_THUMBNAIL_ID_ROLE = QtCore.Qt.UserRole + 21
-ACTIVE_SITE_ICON_ROLE = QtCore.Qt.UserRole + 22
-REMOTE_SITE_ICON_ROLE = QtCore.Qt.UserRole + 23
-REPRESENTATIONS_COUNT_ROLE = QtCore.Qt.UserRole + 24
-SYNC_ACTIVE_SITE_AVAILABILITY = QtCore.Qt.UserRole + 25
-SYNC_REMOTE_SITE_AVAILABILITY = QtCore.Qt.UserRole + 26
+VERSION_STATUS_NAME_ROLE = QtCore.Qt.UserRole + 15
+VERSION_STATUS_SHORT_ROLE = QtCore.Qt.UserRole + 16
+VERSION_STATUS_COLOR_ROLE = QtCore.Qt.UserRole + 17
+VERSION_AUTHOR_ROLE = QtCore.Qt.UserRole + 18
+VERSION_FRAME_RANGE_ROLE = QtCore.Qt.UserRole + 19
+VERSION_DURATION_ROLE = QtCore.Qt.UserRole + 20
+VERSION_HANDLES_ROLE = QtCore.Qt.UserRole + 21
+VERSION_STEP_ROLE = QtCore.Qt.UserRole + 22
+VERSION_AVAILABLE_ROLE = QtCore.Qt.UserRole + 23
+VERSION_THUMBNAIL_ID_ROLE = QtCore.Qt.UserRole + 24
+ACTIVE_SITE_ICON_ROLE = QtCore.Qt.UserRole + 25
+REMOTE_SITE_ICON_ROLE = QtCore.Qt.UserRole + 26
+REPRESENTATIONS_COUNT_ROLE = QtCore.Qt.UserRole + 27
+SYNC_ACTIVE_SITE_AVAILABILITY = QtCore.Qt.UserRole + 28
+SYNC_REMOTE_SITE_AVAILABILITY = QtCore.Qt.UserRole + 29
 
 
 class ProductsModel(QtGui.QStandardItemModel):
@@ -44,6 +47,7 @@ class ProductsModel(QtGui.QStandardItemModel):
         "Product type",
         "Folder",
         "Version",
+        "Status",
         "Time",
         "Author",
         "Frames",
@@ -69,11 +73,35 @@ class ProductsModel(QtGui.QStandardItemModel):
         ]
     ]
 
-    version_col = column_labels.index("Version")
-    published_time_col = column_labels.index("Time")
+    product_name_col = column_labels.index("Product name")
+    product_type_col = column_labels.index("Product type")
     folders_label_col = column_labels.index("Folder")
+    version_col = column_labels.index("Version")
+    status_col = column_labels.index("Status")
+    published_time_col = column_labels.index("Time")
+    author_col = column_labels.index("Author")
+    frame_range_col = column_labels.index("Frames")
+    duration_col = column_labels.index("Duration")
+    handles_col = column_labels.index("Handles")
+    step_col = column_labels.index("Step")
     in_scene_col = column_labels.index("In scene")
     sitesync_avail_col = column_labels.index("Availability")
+    _display_role_mapping = {
+        product_name_col: QtCore.Qt.DisplayRole,
+        product_type_col: PRODUCT_TYPE_ROLE,
+        folders_label_col: FOLDER_LABEL_ROLE,
+        version_col: VERSION_NAME_ROLE,
+        status_col: VERSION_STATUS_NAME_ROLE,
+        published_time_col: VERSION_PUBLISH_TIME_ROLE,
+        author_col: VERSION_AUTHOR_ROLE,
+        frame_range_col: VERSION_FRAME_RANGE_ROLE,
+        duration_col: VERSION_DURATION_ROLE,
+        handles_col: VERSION_HANDLES_ROLE,
+        step_col: VERSION_STEP_ROLE,
+        in_scene_col: PRODUCT_IN_SCENE_ROLE,
+        sitesync_avail_col: VERSION_AVAILABLE_ROLE,
+
+    }
 
     def __init__(self, controller):
         super(ProductsModel, self).__init__()
@@ -96,6 +124,7 @@ class ProductsModel(QtGui.QStandardItemModel):
 
         self._last_project_name = None
         self._last_folder_ids = []
+        self._last_project_statuses = {}
 
     def get_product_item_indexes(self):
         return [
@@ -141,6 +170,15 @@ class ProductsModel(QtGui.QStandardItemModel):
         if not index.isValid():
             return None
 
+        if role in (VERSION_STATUS_SHORT_ROLE, VERSION_STATUS_COLOR_ROLE):
+            status_name = self.data(index, VERSION_STATUS_NAME_ROLE)
+            status_item = self._last_project_statuses.get(status_name)
+            if status_item is None:
+                return ""
+            if role == VERSION_STATUS_SHORT_ROLE:
+                return status_item.short
+            return status_item.color
+
         col = index.column()
         if col == 0:
             return super(ProductsModel, self).data(index, role)
@@ -168,29 +206,8 @@ class ProductsModel(QtGui.QStandardItemModel):
         if role == QtCore.Qt.DisplayRole:
             if not index.data(PRODUCT_ID_ROLE):
                 return None
-            if col == self.version_col:
-                role = VERSION_NAME_ROLE
-            elif col == 1:
-                role = PRODUCT_TYPE_ROLE
-            elif col == 2:
-                role = FOLDER_LABEL_ROLE
-            elif col == 4:
-                role = VERSION_PUBLISH_TIME_ROLE
-            elif col == 5:
-                role = VERSION_AUTHOR_ROLE
-            elif col == 6:
-                role = VERSION_FRAME_RANGE_ROLE
-            elif col == 7:
-                role = VERSION_DURATION_ROLE
-            elif col == 8:
-                role = VERSION_HANDLES_ROLE
-            elif col == 9:
-                role = VERSION_STEP_ROLE
-            elif col == 10:
-                role = PRODUCT_IN_SCENE_ROLE
-            elif col == 11:
-                role = VERSION_AVAILABLE_ROLE
-            else:
+            role = self._display_role_mapping.get(col)
+            if role is None:
                 return None
 
         index = self.index(index.row(), 0, index.parent())
@@ -312,6 +329,7 @@ class ProductsModel(QtGui.QStandardItemModel):
             version_item.published_time, VERSION_PUBLISH_TIME_ROLE
         )
         model_item.setData(version_item.author, VERSION_AUTHOR_ROLE)
+        model_item.setData(version_item.status, VERSION_STATUS_NAME_ROLE)
         model_item.setData(version_item.frame_range, VERSION_FRAME_RANGE_ROLE)
         model_item.setData(version_item.duration, VERSION_DURATION_ROLE)
         model_item.setData(version_item.handles, VERSION_HANDLES_ROLE)
@@ -393,6 +411,11 @@ class ProductsModel(QtGui.QStandardItemModel):
 
         self._last_project_name = project_name
         self._last_folder_ids = folder_ids
+        status_items = self._controller.get_project_status_items(project_name)
+        self._last_project_statuses = {
+            status_item.name: status_item
+            for status_item in status_items
+        }
 
         active_site_icon_def = self._controller.get_active_site_icon_def(
             project_name
diff --git a/client/ayon_core/tools/loader/ui/products_widget.py b/client/ayon_core/tools/loader/ui/products_widget.py
index d9f027153e..3a30d83d52 100644
--- a/client/ayon_core/tools/loader/ui/products_widget.py
+++ b/client/ayon_core/tools/loader/ui/products_widget.py
@@ -22,7 +22,8 @@ from .products_model import (
 from .products_delegates import (
     VersionDelegate,
     LoadedInSceneDelegate,
-    SiteSyncDelegate
+    StatusDelegate,
+    SiteSyncDelegate,
 )
 from .actions_utils import show_actions_menu
 
@@ -89,6 +90,7 @@ class ProductsWidget(QtWidgets.QWidget):
         90,   # Product type
         130,  # Folder label
         60,   # Version
+        100,   # Status
         125,  # Time
         75,   # Author
         75,   # Frames
@@ -128,20 +130,19 @@ class ProductsWidget(QtWidgets.QWidget):
             products_view.setColumnWidth(idx, width)
 
         version_delegate = VersionDelegate()
-        products_view.setItemDelegateForColumn(
-            products_model.version_col, version_delegate)
-
         time_delegate = PrettyTimeDelegate()
-        products_view.setItemDelegateForColumn(
-            products_model.published_time_col, time_delegate)
-
+        status_delegate = StatusDelegate()
         in_scene_delegate = LoadedInSceneDelegate()
-        products_view.setItemDelegateForColumn(
-            products_model.in_scene_col, in_scene_delegate)
-
         sitesync_delegate = SiteSyncDelegate()
-        products_view.setItemDelegateForColumn(
-            products_model.sitesync_avail_col, sitesync_delegate)
+
+        for col, delegate in (
+            (products_model.version_col, version_delegate),
+            (products_model.published_time_col, time_delegate),
+            (products_model.status_col, status_delegate),
+            (products_model.in_scene_col, in_scene_delegate),
+            (products_model.sitesync_avail_col, sitesync_delegate),
+        ):
+            products_view.setItemDelegateForColumn(col, delegate)
 
         main_layout = QtWidgets.QHBoxLayout(self)
         main_layout.setContentsMargins(0, 0, 0, 0)
@@ -175,6 +176,7 @@ class ProductsWidget(QtWidgets.QWidget):
 
         self._version_delegate = version_delegate
         self._time_delegate = time_delegate
+        self._status_delegate = status_delegate
         self._in_scene_delegate = in_scene_delegate
         self._sitesync_delegate = sitesync_delegate
 
diff --git a/client/ayon_core/version.py b/client/ayon_core/version.py
index 275e1b1dd6..e4297e2000 100644
--- a/client/ayon_core/version.py
+++ b/client/ayon_core/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring AYON core addon version."""
-__version__ = "0.3.2-dev.1"
+__version__ = "0.3.3-dev.1"
diff --git a/package.py b/package.py
index b7b8d2dae6..73f7174b6f 100644
--- a/package.py
+++ b/package.py
@@ -1,6 +1,6 @@
 name = "core"
 title = "Core"
-version = "0.3.2-dev.1"
+version = "0.3.3-dev.1"
 
 client_dir = "ayon_core"
 
diff --git a/server_addon/blender/package.py b/server_addon/blender/package.py
index 667076e533..d2c02a4909 100644
--- a/server_addon/blender/package.py
+++ b/server_addon/blender/package.py
@@ -1,3 +1,3 @@
 name = "blender"
 title = "Blender"
-version = "0.1.8"
+version = "0.1.9"
diff --git a/server_addon/blender/server/settings/publish_plugins.py b/server_addon/blender/server/settings/publish_plugins.py
index e998d7b057..8db8c5be46 100644
--- a/server_addon/blender/server/settings/publish_plugins.py
+++ b/server_addon/blender/server/settings/publish_plugins.py
@@ -151,6 +151,10 @@ class PublishPluginsModel(BaseSettingsModel):
         default_factory=ExtractPlayblastModel,
         title="Extract Playblast"
     )
+    ExtractModelUSD: ValidatePluginModel = SettingsField(
+        default_factory=ValidatePluginModel,
+        title="Extract Model USD"
+    )
 
 
 DEFAULT_BLENDER_PUBLISH_SETTINGS = {
@@ -348,5 +352,10 @@ DEFAULT_BLENDER_PUBLISH_SETTINGS = {
             },
             indent=4
         )
+    },
+    "ExtractModelUSD": {
+        "enabled": True,
+        "optional": True,
+        "active": True
     }
 }
diff --git a/server_addon/clockify/client/ayon_clockify/__init__.py b/server_addon/clockify/client/ayon_clockify/__init__.py
new file mode 100644
index 0000000000..75fb87494e
--- /dev/null
+++ b/server_addon/clockify/client/ayon_clockify/__init__.py
@@ -0,0 +1,5 @@
+from .addon import ClockifyAddon
+
+__all__ = (
+    "ClockifyAddon",
+)
diff --git a/client/ayon_core/modules/clockify/clockify_module.py b/server_addon/clockify/client/ayon_clockify/addon.py
similarity index 93%
rename from client/ayon_core/modules/clockify/clockify_module.py
rename to server_addon/clockify/client/ayon_clockify/addon.py
index d2ee4f1e1e..ce91b2be70 100644
--- a/client/ayon_core/modules/clockify/clockify_module.py
+++ b/server_addon/clockify/client/ayon_clockify/addon.py
@@ -2,12 +2,12 @@ import os
 import threading
 import time
 
-from ayon_core.modules import AYONAddon, ITrayModule, IPluginPaths
+from ayon_core.addon import AYONAddon, ITrayAddon, IPluginPaths
 
 from .constants import CLOCKIFY_FTRACK_USER_PATH, CLOCKIFY_FTRACK_SERVER_PATH
 
 
-class ClockifyModule(AYONAddon, ITrayModule, IPluginPaths):
+class ClockifyAddon(AYONAddon, ITrayAddon, IPluginPaths):
     name = "clockify"
 
     def initialize(self, studio_settings):
@@ -31,7 +31,7 @@ class ClockifyModule(AYONAddon, ITrayModule, IPluginPaths):
         # TimersManager attributes
         # - set `timers_manager_connector` only in `tray_init`
         self.timers_manager_connector = None
-        self._timers_manager_module = None
+        self._timer_manager_addon = None
 
     @property
     def clockify_api(self):
@@ -87,7 +87,7 @@ class ClockifyModule(AYONAddon, ITrayModule, IPluginPaths):
         return {"actions": [actions_path]}
 
     def get_ftrack_event_handler_paths(self):
-        """Function for Ftrack module to add ftrack event handler paths."""
+        """Function for ftrack addon to add ftrack event handler paths."""
         return {
             "user": [CLOCKIFY_FTRACK_USER_PATH],
             "server": [CLOCKIFY_FTRACK_SERVER_PATH],
@@ -206,19 +206,19 @@ class ClockifyModule(AYONAddon, ITrayModule, IPluginPaths):
         self.action_stop_timer.setVisible(self.bool_timer_run)
 
     # --- TimersManager connection methods ---
-    def register_timers_manager(self, timer_manager_module):
+    def register_timers_manager(self, timer_manager_addon):
         """Store TimersManager for future use."""
-        self._timers_manager_module = timer_manager_module
+        self._timer_manager_addon = timer_manager_addon
 
     def timer_started(self, data):
         """Tell TimersManager that timer started."""
-        if self._timers_manager_module is not None:
-            self._timers_manager_module.timer_started(self.id, data)
+        if self._timer_manager_addon is not None:
+            self._timer_manager_addon.timer_started(self.id, data)
 
     def timer_stopped(self):
         """Tell TimersManager that timer stopped."""
-        if self._timers_manager_module is not None:
-            self._timers_manager_module.timer_stopped(self.id)
+        if self._timer_manager_addon is not None:
+            self._timer_manager_addon.timer_stopped(self.id)
 
     def stop_timer(self):
         """Called from TimersManager to stop timer."""
diff --git a/client/ayon_core/modules/clockify/clockify_api.py b/server_addon/clockify/client/ayon_clockify/clockify_api.py
similarity index 99%
rename from client/ayon_core/modules/clockify/clockify_api.py
rename to server_addon/clockify/client/ayon_clockify/clockify_api.py
index 2e1d8f008f..38ca6cdb66 100644
--- a/client/ayon_core/modules/clockify/clockify_api.py
+++ b/server_addon/clockify/client/ayon_clockify/clockify_api.py
@@ -1,15 +1,17 @@
 import os
 import json
 import datetime
+
 import requests
+
+from ayon_core.lib.local_settings import AYONSecureRegistry
+from ayon_core.lib import Logger
+
 from .constants import (
     CLOCKIFY_ENDPOINT,
     ADMIN_PERMISSION_NAMES,
 )
 
-from ayon_core.lib.local_settings import AYONSecureRegistry
-from ayon_core.lib import Logger
-
 
 class ClockifyAPI:
     log = Logger.get_logger(__name__)
diff --git a/client/ayon_core/modules/clockify/constants.py b/server_addon/clockify/client/ayon_clockify/constants.py
similarity index 100%
rename from client/ayon_core/modules/clockify/constants.py
rename to server_addon/clockify/client/ayon_clockify/constants.py
diff --git a/client/ayon_core/modules/clockify/ftrack/server/action_clockify_sync_server.py b/server_addon/clockify/client/ayon_clockify/ftrack/server/action_clockify_sync_server.py
similarity index 97%
rename from client/ayon_core/modules/clockify/ftrack/server/action_clockify_sync_server.py
rename to server_addon/clockify/client/ayon_clockify/ftrack/server/action_clockify_sync_server.py
index 7854f0ceba..ed83fed287 100644
--- a/client/ayon_core/modules/clockify/ftrack/server/action_clockify_sync_server.py
+++ b/server_addon/clockify/client/ayon_clockify/ftrack/server/action_clockify_sync_server.py
@@ -1,7 +1,9 @@
 import os
 import json
-from openpype_modules.ftrack.lib import ServerAction
-from openpype_modules.clockify.clockify_api import ClockifyAPI
+
+from ayon_clockify.clockify_api import ClockifyAPI
+
+from ayon_ftrack.lib import ServerAction
 
 
 class SyncClockifyServer(ServerAction):
diff --git a/client/ayon_core/modules/clockify/ftrack/user/action_clockify_sync_local.py b/server_addon/clockify/client/ayon_clockify/ftrack/user/action_clockify_sync_local.py
similarity index 87%
rename from client/ayon_core/modules/clockify/ftrack/user/action_clockify_sync_local.py
rename to server_addon/clockify/client/ayon_clockify/ftrack/user/action_clockify_sync_local.py
index 4701653a0b..05a94e56fd 100644
--- a/client/ayon_core/modules/clockify/ftrack/user/action_clockify_sync_local.py
+++ b/server_addon/clockify/client/ayon_clockify/ftrack/user/action_clockify_sync_local.py
@@ -1,25 +1,20 @@
 import json
-from openpype_modules.ftrack.lib import BaseAction, statics_icon
-from openpype_modules.clockify.clockify_api import ClockifyAPI
+from ayon_clockify.clockify_api import ClockifyAPI
+from ayon_ftrack.lib import BaseAction, statics_icon
 
 
 class SyncClockifyLocal(BaseAction):
-    '''Synchronise project names and task types.'''
+    """Synchronise project names and task types."""
 
-    #: Action identifier.
-    identifier = 'clockify.sync.local'
-    #: Action label.
-    label = 'Sync To Clockify (local)'
-    #: Action description.
-    description = 'Synchronise data to Clockify workspace'
-    #: roles that are allowed to register this action
+    identifier = "clockify.sync.local"
+    label = "Sync To Clockify"
+    description = "Synchronise data to Clockify workspace"
     role_list = ["Administrator", "project Manager"]
-    #: icon
     icon = statics_icon("app_icons", "clockify-white.png")
 
     def __init__(self, *args, **kwargs):
         super(SyncClockifyLocal, self).__init__(*args, **kwargs)
-        #: CLockifyApi
+
         self.clockify_api = ClockifyAPI()
 
     def discover(self, session, entities, event):
@@ -56,7 +51,7 @@ class SyncClockifyLocal(BaseAction):
             'user': user,
             'status': 'running',
             'data': json.dumps({
-                'description': 'Sync Ftrack to Clockify'
+                'description': 'Sync ftrack to Clockify'
             })
         })
         session.commit()
diff --git a/client/ayon_core/modules/clockify/launcher_actions/ClockifyStart.py b/server_addon/clockify/client/ayon_clockify/launcher_actions/ClockifyStart.py
similarity index 96%
rename from client/ayon_core/modules/clockify/launcher_actions/ClockifyStart.py
rename to server_addon/clockify/client/ayon_clockify/launcher_actions/ClockifyStart.py
index 8381c7d73e..d69d0371c0 100644
--- a/client/ayon_core/modules/clockify/launcher_actions/ClockifyStart.py
+++ b/server_addon/clockify/client/ayon_clockify/launcher_actions/ClockifyStart.py
@@ -1,7 +1,8 @@
 import ayon_api
 
+from ayon_clockify.clockify_api import ClockifyAPI
+
 from ayon_core.pipeline import LauncherAction
-from openpype_modules.clockify.clockify_api import ClockifyAPI
 
 
 class ClockifyStart(LauncherAction):
diff --git a/client/ayon_core/modules/clockify/launcher_actions/ClockifySync.py b/server_addon/clockify/client/ayon_clockify/launcher_actions/ClockifySync.py
similarity index 97%
rename from client/ayon_core/modules/clockify/launcher_actions/ClockifySync.py
rename to server_addon/clockify/client/ayon_clockify/launcher_actions/ClockifySync.py
index 5388f47c98..a32f2a8082 100644
--- a/client/ayon_core/modules/clockify/launcher_actions/ClockifySync.py
+++ b/server_addon/clockify/client/ayon_clockify/launcher_actions/ClockifySync.py
@@ -1,6 +1,6 @@
 import ayon_api
 
-from openpype_modules.clockify.clockify_api import ClockifyAPI
+from ayon_clockify.clockify_api import ClockifyAPI
 from ayon_core.pipeline import LauncherAction
 
 
diff --git a/server_addon/clockify/client/ayon_clockify/version.py b/server_addon/clockify/client/ayon_clockify/version.py
new file mode 100644
index 0000000000..0e6e40cb7d
--- /dev/null
+++ b/server_addon/clockify/client/ayon_clockify/version.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+"""Package declaring AYON addon 'clockify' version."""
+__version__ = "0.2.0"
diff --git a/client/ayon_core/modules/clockify/widgets.py b/server_addon/clockify/client/ayon_clockify/widgets.py
similarity index 100%
rename from client/ayon_core/modules/clockify/widgets.py
rename to server_addon/clockify/client/ayon_clockify/widgets.py
diff --git a/server_addon/clockify/package.py b/server_addon/clockify/package.py
index bcf9425b3f..61e0685191 100644
--- a/server_addon/clockify/package.py
+++ b/server_addon/clockify/package.py
@@ -1,3 +1,9 @@
 name = "clockify"
 title = "Clockify"
-version = "0.1.1"
+version = "0.2.0"
+client_dir = "ayon_clockify"
+
+ayon_required_addons = {
+    "core": ">0.3.2",
+}
+ayon_compatible_addons = {}
diff --git a/server_addon/create_ayon_addons.py b/server_addon/create_ayon_addons.py
index f0a36d4740..749077d2a8 100644
--- a/server_addon/create_ayon_addons.py
+++ b/server_addon/create_ayon_addons.py
@@ -47,7 +47,7 @@ plugin_for = ["ayon_server"]
 """
 
 CLIENT_VERSION_CONTENT = '''# -*- coding: utf-8 -*-
-"""Package declaring AYON core addon version."""
+"""Package declaring AYON addon '{}' version."""
 __version__ = "{}"
 '''
 
@@ -183,6 +183,7 @@ def create_addon_zip(
 
 
 def prepare_client_code(
+    addon_name: str,
     addon_dir: Path,
     addon_output_dir: Path,
     addon_version: str
@@ -211,7 +212,9 @@ def prepare_client_code(
         version_path = subpath / "version.py"
         if version_path.exists():
             with open(version_path, "w") as stream:
-                stream.write(CLIENT_VERSION_CONTENT.format(addon_version))
+                stream.write(
+                    CLIENT_VERSION_CONTENT.format(addon_name, addon_version)
+                )
 
         zip_filepath = private_dir / "client.zip"
         with ZipFileLongPaths(zip_filepath, "w", zipfile.ZIP_DEFLATED) as zipf:
@@ -262,7 +265,9 @@ def create_addon_package(
         server_dir, addon_output_dir / "server", dirs_exist_ok=True
     )
 
-    prepare_client_code(addon_dir, addon_output_dir, addon_version)
+    prepare_client_code(
+        package.name, addon_dir, addon_output_dir, addon_version
+    )
 
     if create_zip:
         create_addon_zip(
diff --git a/server_addon/houdini/server/settings/create.py b/server_addon/houdini/server/settings/create.py
index 203ca4f9d6..cd1e110c23 100644
--- a/server_addon/houdini/server/settings/create.py
+++ b/server_addon/houdini/server/settings/create.py
@@ -57,6 +57,9 @@ class CreatePluginsModel(BaseSettingsModel):
     CreateMantraROP: CreatorModel = SettingsField(
         default_factory=CreatorModel,
         title="Create Mantra ROP")
+    CreateModel: CreatorModel = SettingsField(
+        default_factory=CreatorModel,
+        title="Create Model")
     CreatePointCache: CreatorModel = SettingsField(
         default_factory=CreatorModel,
         title="Create PointCache (Abc)")
@@ -124,6 +127,10 @@ DEFAULT_HOUDINI_CREATE_SETTINGS = {
         "enabled": True,
         "default_variants": ["Main"]
     },
+    "CreateModel": {
+        "enabled": True,
+        "default_variants": ["Main"]
+    },
     "CreatePointCache": {
         "enabled": True,
         "default_variants": ["Main"]
diff --git a/client/ayon_core/hosts/nuke/__init__.py b/server_addon/nuke/client/ayon_nuke/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/__init__.py
rename to server_addon/nuke/client/ayon_nuke/__init__.py
diff --git a/client/ayon_core/hosts/nuke/addon.py b/server_addon/nuke/client/ayon_nuke/addon.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/addon.py
rename to server_addon/nuke/client/ayon_nuke/addon.py
diff --git a/client/ayon_core/hosts/nuke/api/__init__.py b/server_addon/nuke/client/ayon_nuke/api/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/api/__init__.py
rename to server_addon/nuke/client/ayon_nuke/api/__init__.py
diff --git a/client/ayon_core/hosts/nuke/api/actions.py b/server_addon/nuke/client/ayon_nuke/api/actions.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/api/actions.py
rename to server_addon/nuke/client/ayon_nuke/api/actions.py
diff --git a/client/ayon_core/hosts/nuke/api/command.py b/server_addon/nuke/client/ayon_nuke/api/command.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/api/command.py
rename to server_addon/nuke/client/ayon_nuke/api/command.py
diff --git a/client/ayon_core/hosts/nuke/api/constants.py b/server_addon/nuke/client/ayon_nuke/api/constants.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/api/constants.py
rename to server_addon/nuke/client/ayon_nuke/api/constants.py
diff --git a/client/ayon_core/hosts/nuke/api/gizmo_menu.py b/server_addon/nuke/client/ayon_nuke/api/gizmo_menu.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/api/gizmo_menu.py
rename to server_addon/nuke/client/ayon_nuke/api/gizmo_menu.py
diff --git a/client/ayon_core/hosts/nuke/api/lib.py b/server_addon/nuke/client/ayon_nuke/api/lib.py
similarity index 98%
rename from client/ayon_core/hosts/nuke/api/lib.py
rename to server_addon/nuke/client/ayon_nuke/api/lib.py
index 0a4755c166..09dab4687a 100644
--- a/client/ayon_core/hosts/nuke/api/lib.py
+++ b/server_addon/nuke/client/ayon_nuke/api/lib.py
@@ -354,7 +354,7 @@ def imprint(node, data, tab=None):
     Examples:
         ```
         import nuke
-        from ayon_core.hosts.nuke.api import lib
+        from ayon_nuke.api import lib
 
         node = nuke.createNode("NoOp")
         data = {
@@ -419,7 +419,7 @@ def add_publish_knob(node):
     return node
 
 
-@deprecated("ayon_core.hosts.nuke.api.lib.set_node_data")
+@deprecated("ayon_nuke.api.lib.set_node_data")
 def set_avalon_knob_data(node, data=None, prefix="avalon:"):
     """[DEPRECATED] Sets data into nodes's avalon knob
 
@@ -485,7 +485,7 @@ def set_avalon_knob_data(node, data=None, prefix="avalon:"):
     return node
 
 
-@deprecated("ayon_core.hosts.nuke.api.lib.get_node_data")
+@deprecated("ayon_nuke.api.lib.get_node_data")
 def get_avalon_knob_data(node, prefix="avalon:", create=True):
     """[DEPRECATED]  Gets a data from nodes's avalon knob
 
@@ -1024,6 +1024,18 @@ def script_name():
     return nuke.root().knob("name").value()
 
 
+def add_button_render_on_farm(node):
+    name = "renderOnFarm"
+    label = "Render On Farm"
+    value = (
+        "from ayon_nuke.api.utils import submit_render_on_farm;"
+        "submit_render_on_farm(nuke.thisNode())"
+    )
+    knob = nuke.PyScript_Knob(name, label, value)
+    knob.clearFlag(nuke.STARTLINE)
+    node.addKnob(knob)
+
+
 def add_button_write_to_read(node):
     name = "createReadNode"
     label = "Read From Rendered"
@@ -1146,6 +1158,17 @@ def create_write_node(
     Return:
         node (obj): group node with avalon data as Knobs
     '''
+    # Ensure name does not contain any invalid characters.
+    special_chars = re.escape("!@#$%^&*()=[]{}|\\;',.<>/?~+-")
+    special_chars_regex = re.compile(f"[{special_chars}]")
+    found_special_characters = list(special_chars_regex.findall(name))
+
+    msg = (
+        f"Special characters found in name \"{name}\": "
+        f"{' '.join(found_special_characters)}"
+    )
+    assert not found_special_characters, msg
+
     prenodes = prenodes or []
 
     # filtering variables
@@ -1270,6 +1293,10 @@ def create_write_node(
                 link.setFlag(0x1000)
                 GN.addKnob(link)
 
+    # Adding render farm submission button.
+    if data.get("render_on_farm", False):
+        add_button_render_on_farm(GN)
+
     # adding write to read button
     add_button_write_to_read(GN)
 
@@ -2442,7 +2469,7 @@ def _launch_workfile_app():
     host_tools.show_workfiles(parent=None, on_top=True)
 
 
-@deprecated("ayon_core.hosts.nuke.api.lib.start_workfile_template_builder")
+@deprecated("ayon_nuke.api.lib.start_workfile_template_builder")
 def process_workfile_builder():
     """ [DEPRECATED] Process workfile builder on nuke start
 
diff --git a/client/ayon_core/hosts/nuke/api/pipeline.py b/server_addon/nuke/client/ayon_nuke/api/pipeline.py
similarity index 98%
rename from client/ayon_core/hosts/nuke/api/pipeline.py
rename to server_addon/nuke/client/ayon_nuke/api/pipeline.py
index d35a2e89e0..ad8e17b1f6 100644
--- a/client/ayon_core/hosts/nuke/api/pipeline.py
+++ b/server_addon/nuke/client/ayon_nuke/api/pipeline.py
@@ -28,7 +28,7 @@ from ayon_core.pipeline import (
 )
 from ayon_core.pipeline.workfile import BuildWorkfile
 from ayon_core.tools.utils import host_tools
-from ayon_core.hosts.nuke import NUKE_ROOT_DIR
+from ayon_nuke import NUKE_ROOT_DIR
 from ayon_core.tools.workfile_template_build import open_template_ui
 
 from .lib import (
@@ -188,10 +188,10 @@ def reload_config():
     """
 
     for module in (
-        "ayon_core.hosts.nuke.api.actions",
-        "ayon_core.hosts.nuke.api.menu",
-        "ayon_core.hosts.nuke.api.plugin",
-        "ayon_core.hosts.nuke.api.lib",
+        "ayon_nuke.api.actions",
+        "ayon_nuke.api.menu",
+        "ayon_nuke.api.plugin",
+        "ayon_nuke.api.lib",
     ):
         log.info("Reloading module: {}...".format(module))
 
diff --git a/client/ayon_core/hosts/nuke/api/plugin.py b/server_addon/nuke/client/ayon_nuke/api/plugin.py
similarity index 98%
rename from client/ayon_core/hosts/nuke/api/plugin.py
rename to server_addon/nuke/client/ayon_nuke/api/plugin.py
index bb9d175e62..4f05cd41b9 100644
--- a/client/ayon_core/hosts/nuke/api/plugin.py
+++ b/server_addon/nuke/client/ayon_nuke/api/plugin.py
@@ -572,8 +572,11 @@ class ExporterReview(object):
             self.fhead = self.fhead.replace("#", "")[:-1]
 
     def get_representation_data(
-        self, tags=None, range=False,
-        custom_tags=None, colorspace=None
+        self,
+        tags=None,
+        range=False,
+        custom_tags=None,
+        colorspace=None,
     ):
         """ Add representation data to self.data
 
@@ -584,6 +587,8 @@ class ExporterReview(object):
                                     Defaults to False.
             custom_tags (list[str], optional): user inputted custom tags.
                                                Defaults to None.
+            colorspace (str, optional): colorspace name.
+                                        Defaults to None.
         """
         add_tags = tags or []
         repre = {
@@ -591,7 +596,13 @@ class ExporterReview(object):
             "ext": self.ext,
             "files": self.file,
             "stagingDir": self.staging_dir,
-            "tags": [self.name.replace("_", "-")] + add_tags
+            "tags": [self.name.replace("_", "-")] + add_tags,
+            "data": {
+                # making sure that once intermediate file is published
+                # as representation, we will be able to then identify it
+                # from representation.data.isIntermediate
+                "isIntermediate": True
+            },
         }
 
         if custom_tags:
@@ -1000,7 +1011,7 @@ class ExporterReviewMov(ExporterReview):
             tags=tags + add_tags,
             custom_tags=add_custom_tags,
             range=True,
-            colorspace=colorspace
+            colorspace=colorspace,
         )
 
         self.log.debug("Representation...   `{}`".format(self.data))
@@ -1039,7 +1050,7 @@ def convert_to_valid_instaces():
         }
         return mapping[product_type]
 
-    from ayon_core.hosts.nuke.api import workio
+    from ayon_nuke.api import workio
 
     task_name = get_current_task_name()
 
diff --git a/client/ayon_core/hosts/nuke/api/utils.py b/server_addon/nuke/client/ayon_nuke/api/utils.py
similarity index 63%
rename from client/ayon_core/hosts/nuke/api/utils.py
rename to server_addon/nuke/client/ayon_nuke/api/utils.py
index 1bfc1919fa..646bb0ece1 100644
--- a/client/ayon_core/hosts/nuke/api/utils.py
+++ b/server_addon/nuke/client/ayon_nuke/api/utils.py
@@ -3,9 +3,15 @@ import re
 
 import nuke
 
-from ayon_core import resources
+import pyblish.util
+import pyblish.api
 from qtpy import QtWidgets
 
+from ayon_core import resources
+from ayon_core.pipeline import registered_host
+from ayon_core.tools.utils import show_message_dialog
+from ayon_core.pipeline.create import CreateContext
+
 
 def set_context_favorites(favorites=None):
     """ Adding favorite folders to nuke's browser
@@ -142,3 +148,77 @@ def is_headless():
         bool: headless
     """
     return QtWidgets.QApplication.instance() is None
+
+
+def submit_render_on_farm(node):
+    # Ensure code is executed in root context.
+    if nuke.root() == nuke.thisNode():
+        _submit_render_on_farm(node)
+    else:
+        # If not in root context, move to the root context and then execute the
+        # code.
+        with nuke.root():
+            _submit_render_on_farm(node)
+
+
+def _submit_render_on_farm(node):
+    """Render on farm submission
+
+    This function prepares the context for farm submission, validates it,
+    extracts relevant data, copies the current workfile to a timestamped copy,
+    and submits the job to the farm.
+
+    Args:
+        node (Node): The node for which the farm submission is being made.
+    """
+
+    host = registered_host()
+    create_context = CreateContext(host)
+
+    # Ensure CreateInstance is enabled.
+    for instance in create_context.instances:
+        if node.name() != instance.transient_data["node"].name():
+            continue
+
+        instance.data["active"] = True
+
+    context = pyblish.api.Context()
+    context.data["create_context"] = create_context
+    # Used in pyblish plugin to determine which instance to publish.
+    context.data["node_name"] = node.name()
+    # Used in pyblish plugins to determine whether to run or not.
+    context.data["render_on_farm"] = True
+
+    # Since we need to bypass version validation and incrementing, we need to
+    # remove the plugins from the list that are responsible for these tasks.
+    plugins = pyblish.api.discover()
+    blacklist = ["IncrementScriptVersion", "ValidateVersion"]
+    plugins = [
+        plugin
+        for plugin in plugins
+        if plugin.__name__ not in blacklist
+    ]
+
+    context = pyblish.util.publish(context, plugins=plugins)
+
+    error_message = ""
+    success = True
+    for result in context.data["results"]:
+        if result["success"]:
+            continue
+
+        success = False
+
+        err = result["error"]
+        error_message += "\n"
+        error_message += err.formatted_traceback
+
+    if not success:
+        show_message_dialog(
+            "Publish Errors", error_message, level="critical"
+        )
+        return
+
+    show_message_dialog(
+        "Submission Successful", "Submission to the farm was successful."
+    )
diff --git a/client/ayon_core/hosts/nuke/api/workfile_template_builder.py b/server_addon/nuke/client/ayon_nuke/api/workfile_template_builder.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/api/workfile_template_builder.py
rename to server_addon/nuke/client/ayon_nuke/api/workfile_template_builder.py
diff --git a/client/ayon_core/hosts/nuke/api/workio.py b/server_addon/nuke/client/ayon_nuke/api/workio.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/api/workio.py
rename to server_addon/nuke/client/ayon_nuke/api/workio.py
diff --git a/client/ayon_core/hosts/nuke/hooks/pre_nukeassist_setup.py b/server_addon/nuke/client/ayon_nuke/hooks/pre_nukeassist_setup.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/hooks/pre_nukeassist_setup.py
rename to server_addon/nuke/client/ayon_nuke/hooks/pre_nukeassist_setup.py
diff --git a/client/ayon_core/hosts/nuke/plugins/__init__.py b/server_addon/nuke/client/ayon_nuke/plugins/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/plugins/__init__.py
rename to server_addon/nuke/client/ayon_nuke/plugins/__init__.py
diff --git a/client/ayon_core/hosts/nuke/plugins/create/__init__.py b/server_addon/nuke/client/ayon_nuke/plugins/create/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/plugins/create/__init__.py
rename to server_addon/nuke/client/ayon_nuke/plugins/create/__init__.py
diff --git a/client/ayon_core/hosts/nuke/plugins/create/convert_legacy.py b/server_addon/nuke/client/ayon_nuke/plugins/create/convert_legacy.py
similarity index 93%
rename from client/ayon_core/hosts/nuke/plugins/create/convert_legacy.py
rename to server_addon/nuke/client/ayon_nuke/plugins/create/convert_legacy.py
index 8fb8abfbbf..65e719d15b 100644
--- a/client/ayon_core/hosts/nuke/plugins/create/convert_legacy.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/create/convert_legacy.py
@@ -1,12 +1,12 @@
 from ayon_core.pipeline import AYON_INSTANCE_ID, AVALON_INSTANCE_ID
 from ayon_core.pipeline.create.creator_plugins import ProductConvertorPlugin
-from ayon_core.hosts.nuke.api.lib import (
+from ayon_nuke.api.lib import (
     INSTANCE_DATA_KNOB,
     get_node_data,
     get_avalon_knob_data,
     NODE_TAB_NAME,
 )
-from ayon_core.hosts.nuke.api.plugin import convert_to_valid_instaces
+from ayon_nuke.api.plugin import convert_to_valid_instaces
 
 import nuke
 
diff --git a/client/ayon_core/hosts/nuke/plugins/create/create_backdrop.py b/server_addon/nuke/client/ayon_nuke/plugins/create/create_backdrop.py
similarity index 95%
rename from client/ayon_core/hosts/nuke/plugins/create/create_backdrop.py
rename to server_addon/nuke/client/ayon_nuke/plugins/create/create_backdrop.py
index cefd9501ec..f97b9efeb6 100644
--- a/client/ayon_core/hosts/nuke/plugins/create/create_backdrop.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/create/create_backdrop.py
@@ -1,6 +1,6 @@
 from nukescripts import autoBackdrop
 
-from ayon_core.hosts.nuke.api import (
+from ayon_nuke.api import (
     NukeCreator,
     maintained_selection,
     select_nodes
@@ -10,6 +10,8 @@ from ayon_core.hosts.nuke.api import (
 class CreateBackdrop(NukeCreator):
     """Add Publishable Backdrop"""
 
+    settings_category = "nuke"
+
     identifier = "create_backdrop"
     label = "Nukenodes (backdrop)"
     product_type = "nukenodes"
diff --git a/client/ayon_core/hosts/nuke/plugins/create/create_camera.py b/server_addon/nuke/client/ayon_nuke/plugins/create/create_camera.py
similarity index 95%
rename from client/ayon_core/hosts/nuke/plugins/create/create_camera.py
rename to server_addon/nuke/client/ayon_nuke/plugins/create/create_camera.py
index 764de84dcf..69e5b9c676 100644
--- a/client/ayon_core/hosts/nuke/plugins/create/create_camera.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/create/create_camera.py
@@ -1,10 +1,10 @@
 import nuke
-from ayon_core.hosts.nuke.api import (
+from ayon_nuke.api import (
     NukeCreator,
     NukeCreatorError,
     maintained_selection
 )
-from ayon_core.hosts.nuke.api.lib import (
+from ayon_nuke.api.lib import (
     create_camera_node_by_version
 )
 
@@ -12,6 +12,8 @@ from ayon_core.hosts.nuke.api.lib import (
 class CreateCamera(NukeCreator):
     """Add Publishable Camera"""
 
+    settings_category = "nuke"
+
     identifier = "create_camera"
     label = "Camera (3d)"
     product_type = "camera"
diff --git a/client/ayon_core/hosts/nuke/plugins/create/create_gizmo.py b/server_addon/nuke/client/ayon_nuke/plugins/create/create_gizmo.py
similarity index 96%
rename from client/ayon_core/hosts/nuke/plugins/create/create_gizmo.py
rename to server_addon/nuke/client/ayon_nuke/plugins/create/create_gizmo.py
index ccc6aa13bd..6be7cd58db 100644
--- a/client/ayon_core/hosts/nuke/plugins/create/create_gizmo.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/create/create_gizmo.py
@@ -1,5 +1,5 @@
 import nuke
-from ayon_core.hosts.nuke.api import (
+from ayon_nuke.api import (
     NukeCreator,
     NukeCreatorError,
     maintained_selection
@@ -9,6 +9,8 @@ from ayon_core.hosts.nuke.api import (
 class CreateGizmo(NukeCreator):
     """Add Publishable Group as gizmo"""
 
+    settings_category = "nuke"
+
     identifier = "create_gizmo"
     label = "Gizmo (group)"
     product_type = "gizmo"
diff --git a/client/ayon_core/hosts/nuke/plugins/create/create_model.py b/server_addon/nuke/client/ayon_nuke/plugins/create/create_model.py
similarity index 96%
rename from client/ayon_core/hosts/nuke/plugins/create/create_model.py
rename to server_addon/nuke/client/ayon_nuke/plugins/create/create_model.py
index 507b7a1b57..b7d7b740c2 100644
--- a/client/ayon_core/hosts/nuke/plugins/create/create_model.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/create/create_model.py
@@ -1,5 +1,5 @@
 import nuke
-from ayon_core.hosts.nuke.api import (
+from ayon_nuke.api import (
     NukeCreator,
     NukeCreatorError,
     maintained_selection
@@ -9,6 +9,8 @@ from ayon_core.hosts.nuke.api import (
 class CreateModel(NukeCreator):
     """Add Publishable Camera"""
 
+    settings_category = "nuke"
+
     identifier = "create_model"
     label = "Model (3d)"
     product_type = "model"
diff --git a/client/ayon_core/hosts/nuke/plugins/create/create_source.py b/server_addon/nuke/client/ayon_nuke/plugins/create/create_source.py
similarity index 97%
rename from client/ayon_core/hosts/nuke/plugins/create/create_source.py
rename to server_addon/nuke/client/ayon_nuke/plugins/create/create_source.py
index ac6b8f694b..1579cebb1d 100644
--- a/client/ayon_core/hosts/nuke/plugins/create/create_source.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/create/create_source.py
@@ -1,7 +1,7 @@
 import nuke
 import six
 import sys
-from ayon_core.hosts.nuke.api import (
+from ayon_nuke.api import (
     INSTANCE_DATA_KNOB,
     NukeCreator,
     NukeCreatorError,
@@ -15,6 +15,8 @@ from ayon_core.pipeline import (
 class CreateSource(NukeCreator):
     """Add Publishable Read with source"""
 
+    settings_category = "nuke"
+
     identifier = "create_source"
     label = "Source (read)"
     product_type = "source"
diff --git a/client/ayon_core/hosts/nuke/plugins/create/create_write_image.py b/server_addon/nuke/client/ayon_nuke/plugins/create/create_write_image.py
similarity index 91%
rename from client/ayon_core/hosts/nuke/plugins/create/create_write_image.py
rename to server_addon/nuke/client/ayon_nuke/plugins/create/create_write_image.py
index 770726e34f..2268817e76 100644
--- a/client/ayon_core/hosts/nuke/plugins/create/create_write_image.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/create/create_write_image.py
@@ -11,11 +11,14 @@ from ayon_core.lib import (
     UISeparatorDef,
     EnumDef
 )
-from ayon_core.hosts.nuke import api as napi
-from ayon_core.hosts.nuke.api.plugin import exposed_write_knobs
+from ayon_nuke import api as napi
+from ayon_nuke.api.plugin import exposed_write_knobs
 
 
 class CreateWriteImage(napi.NukeWriteCreator):
+
+    settings_category = "nuke"
+
     identifier = "create_write_image"
     label = "Image (write)"
     product_type = "image"
@@ -65,12 +68,16 @@ class CreateWriteImage(napi.NukeWriteCreator):
         )
 
     def create_instance_node(self, product_name, instance_data):
+        settings = self.project_settings["nuke"]["create"]["CreateWriteImage"]
 
         # add fpath_template
         write_data = {
             "creator": self.__class__.__name__,
             "productName": product_name,
-            "fpath_template": self.temp_rendering_path_template
+            "fpath_template": self.temp_rendering_path_template,
+            "render_on_farm": (
+                "render_on_farm" in settings["instance_attributes"]
+            )
         }
         write_data.update(instance_data)
 
diff --git a/client/ayon_core/hosts/nuke/plugins/create/create_write_prerender.py b/server_addon/nuke/client/ayon_nuke/plugins/create/create_write_prerender.py
similarity index 90%
rename from client/ayon_core/hosts/nuke/plugins/create/create_write_prerender.py
rename to server_addon/nuke/client/ayon_nuke/plugins/create/create_write_prerender.py
index 96ac2fac9c..014e91e81c 100644
--- a/client/ayon_core/hosts/nuke/plugins/create/create_write_prerender.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/create/create_write_prerender.py
@@ -8,11 +8,14 @@ from ayon_core.pipeline import (
 from ayon_core.lib import (
     BoolDef
 )
-from ayon_core.hosts.nuke import api as napi
-from ayon_core.hosts.nuke.api.plugin import exposed_write_knobs
+from ayon_nuke import api as napi
+from ayon_nuke.api.plugin import exposed_write_knobs
 
 
 class CreateWritePrerender(napi.NukeWriteCreator):
+
+    settings_category = "nuke"
+
     identifier = "create_write_prerender"
     label = "Prerender (write)"
     product_type = "prerender"
@@ -46,11 +49,17 @@ class CreateWritePrerender(napi.NukeWriteCreator):
         return attr_defs
 
     def create_instance_node(self, product_name, instance_data):
+        settings = self.project_settings["nuke"]["create"]
+        settings = settings["CreateWritePrerender"]
+
         # add fpath_template
         write_data = {
             "creator": self.__class__.__name__,
             "productName": product_name,
-            "fpath_template": self.temp_rendering_path_template
+            "fpath_template": self.temp_rendering_path_template,
+            "render_on_farm": (
+                "render_on_farm" in settings["instance_attributes"]
+            )
         }
 
         write_data.update(instance_data)
diff --git a/client/ayon_core/hosts/nuke/plugins/create/create_write_render.py b/server_addon/nuke/client/ayon_nuke/plugins/create/create_write_render.py
similarity index 89%
rename from client/ayon_core/hosts/nuke/plugins/create/create_write_render.py
rename to server_addon/nuke/client/ayon_nuke/plugins/create/create_write_render.py
index 24bddb3d26..bed081c882 100644
--- a/client/ayon_core/hosts/nuke/plugins/create/create_write_render.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/create/create_write_render.py
@@ -8,11 +8,14 @@ from ayon_core.pipeline import (
 from ayon_core.lib import (
     BoolDef
 )
-from ayon_core.hosts.nuke import api as napi
-from ayon_core.hosts.nuke.api.plugin import exposed_write_knobs
+from ayon_nuke import api as napi
+from ayon_nuke.api.plugin import exposed_write_knobs
 
 
 class CreateWriteRender(napi.NukeWriteCreator):
+
+    settings_category = "nuke"
+
     identifier = "create_write_render"
     label = "Render (write)"
     product_type = "render"
@@ -40,11 +43,16 @@ class CreateWriteRender(napi.NukeWriteCreator):
         return attr_defs
 
     def create_instance_node(self, product_name, instance_data):
+        settings = self.project_settings["nuke"]["create"]["CreateWriteRender"]
+
         # add fpath_template
         write_data = {
             "creator": self.__class__.__name__,
             "productName": product_name,
-            "fpath_template": self.temp_rendering_path_template
+            "fpath_template": self.temp_rendering_path_template,
+            "render_on_farm": (
+                "render_on_farm" in settings["instance_attributes"]
+            )
         }
 
         write_data.update(instance_data)
diff --git a/client/ayon_core/hosts/nuke/plugins/create/workfile_creator.py b/server_addon/nuke/client/ayon_nuke/plugins/create/workfile_creator.py
similarity index 96%
rename from client/ayon_core/hosts/nuke/plugins/create/workfile_creator.py
rename to server_addon/nuke/client/ayon_nuke/plugins/create/workfile_creator.py
index b9d83a2b48..463d898224 100644
--- a/client/ayon_core/hosts/nuke/plugins/create/workfile_creator.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/create/workfile_creator.py
@@ -1,11 +1,11 @@
 import ayon_api
 
-import ayon_core.hosts.nuke.api as api
+import ayon_nuke.api as api
 from ayon_core.pipeline import (
     AutoCreator,
     CreatedInstance,
 )
-from ayon_core.hosts.nuke.api import (
+from ayon_nuke.api import (
     INSTANCE_DATA_KNOB,
     set_node_data
 )
@@ -13,6 +13,9 @@ import nuke
 
 
 class WorkfileCreator(AutoCreator):
+
+    settings_category = "nuke"
+
     identifier = "workfile"
     product_type = "workfile"
 
diff --git a/client/ayon_core/hosts/nuke/plugins/inventory/repair_old_loaders.py b/server_addon/nuke/client/ayon_nuke/plugins/inventory/repair_old_loaders.py
similarity index 94%
rename from client/ayon_core/hosts/nuke/plugins/inventory/repair_old_loaders.py
rename to server_addon/nuke/client/ayon_nuke/plugins/inventory/repair_old_loaders.py
index 7bb5c8ef20..11d65d4b8c 100644
--- a/client/ayon_core/hosts/nuke/plugins/inventory/repair_old_loaders.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/inventory/repair_old_loaders.py
@@ -1,6 +1,6 @@
 from ayon_core.lib import Logger
 from ayon_core.pipeline import InventoryAction
-from ayon_core.hosts.nuke.api.lib import set_avalon_knob_data
+from ayon_nuke.api.lib import set_avalon_knob_data
 
 
 class RepairOldLoaders(InventoryAction):
diff --git a/client/ayon_core/hosts/nuke/plugins/inventory/select_containers.py b/server_addon/nuke/client/ayon_nuke/plugins/inventory/select_containers.py
similarity index 88%
rename from client/ayon_core/hosts/nuke/plugins/inventory/select_containers.py
rename to server_addon/nuke/client/ayon_nuke/plugins/inventory/select_containers.py
index 2fa9c06984..f67c8c16e9 100644
--- a/client/ayon_core/hosts/nuke/plugins/inventory/select_containers.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/inventory/select_containers.py
@@ -1,5 +1,5 @@
 from ayon_core.pipeline import InventoryAction
-from ayon_core.hosts.nuke.api.command import viewer_update_and_undo_stop
+from ayon_nuke.api.command import viewer_update_and_undo_stop
 
 
 class SelectContainers(InventoryAction):
diff --git a/client/ayon_core/hosts/nuke/plugins/load/actions.py b/server_addon/nuke/client/ayon_nuke/plugins/load/actions.py
similarity index 98%
rename from client/ayon_core/hosts/nuke/plugins/load/actions.py
rename to server_addon/nuke/client/ayon_nuke/plugins/load/actions.py
index 53cb03087b..a4e2b156a3 100644
--- a/client/ayon_core/hosts/nuke/plugins/load/actions.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/load/actions.py
@@ -4,7 +4,7 @@
 
 from ayon_core.lib import Logger
 from ayon_core.pipeline import load
-from ayon_core.hosts.nuke.api import lib
+from ayon_nuke.api import lib
 
 log = Logger.get_logger(__name__)
 
diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_backdrop.py b/server_addon/nuke/client/ayon_nuke/plugins/load/load_backdrop.py
similarity index 97%
rename from client/ayon_core/hosts/nuke/plugins/load/load_backdrop.py
rename to server_addon/nuke/client/ayon_nuke/plugins/load/load_backdrop.py
index 50af8a4eb9..054a56d041 100644
--- a/client/ayon_core/hosts/nuke/plugins/load/load_backdrop.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/load/load_backdrop.py
@@ -6,7 +6,7 @@ from ayon_core.pipeline import (
     load,
     get_representation_path,
 )
-from ayon_core.hosts.nuke.api.lib import (
+from ayon_nuke.api.lib import (
     find_free_space_to_paste_nodes,
     maintained_selection,
     reset_selection,
@@ -14,8 +14,8 @@ from ayon_core.hosts.nuke.api.lib import (
     get_avalon_knob_data,
     set_avalon_knob_data
 )
-from ayon_core.hosts.nuke.api.command import viewer_update_and_undo_stop
-from ayon_core.hosts.nuke.api import containerise, update_container
+from ayon_nuke.api.command import viewer_update_and_undo_stop
+from ayon_nuke.api import containerise, update_container
 
 
 class LoadBackdropNodes(load.LoaderPlugin):
@@ -25,6 +25,8 @@ class LoadBackdropNodes(load.LoaderPlugin):
     representations = {"*"}
     extensions = {"nk"}
 
+    settings_category = "nuke"
+
     label = "Import Nuke Nodes"
     order = 0
     icon = "eye"
diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_camera_abc.py b/server_addon/nuke/client/ayon_nuke/plugins/load/load_camera_abc.py
similarity index 98%
rename from client/ayon_core/hosts/nuke/plugins/load/load_camera_abc.py
rename to server_addon/nuke/client/ayon_nuke/plugins/load/load_camera_abc.py
index 3c7d4f3bb2..3930cf52fa 100644
--- a/client/ayon_core/hosts/nuke/plugins/load/load_camera_abc.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/load/load_camera_abc.py
@@ -5,12 +5,12 @@ from ayon_core.pipeline import (
     load,
     get_representation_path,
 )
-from ayon_core.hosts.nuke.api import (
+from ayon_nuke.api import (
     containerise,
     update_container,
     viewer_update_and_undo_stop
 )
-from ayon_core.hosts.nuke.api.lib import (
+from ayon_nuke.api.lib import (
     maintained_selection
 )
 
@@ -24,6 +24,8 @@ class AlembicCameraLoader(load.LoaderPlugin):
     representations = {"*"}
     extensions = {"abc"}
 
+    settings_category = "nuke"
+
     label = "Load Alembic Camera"
     icon = "camera"
     color = "orange"
diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_clip.py b/server_addon/nuke/client/ayon_nuke/plugins/load/load_clip.py
similarity index 92%
rename from client/ayon_core/hosts/nuke/plugins/load/load_clip.py
rename to server_addon/nuke/client/ayon_nuke/plugins/load/load_clip.py
index 7fa90da86f..d1e38eea6b 100644
--- a/client/ayon_core/hosts/nuke/plugins/load/load_clip.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/load/load_clip.py
@@ -12,11 +12,11 @@ from ayon_core.pipeline.colorspace import (
     get_imageio_file_rules_colorspace_from_filepath,
     get_current_context_imageio_config_preset,
 )
-from ayon_core.hosts.nuke.api.lib import (
+from ayon_nuke.api.lib import (
     get_imageio_input_colorspace,
     maintained_selection
 )
-from ayon_core.hosts.nuke.api import (
+from ayon_nuke.api import (
     containerise,
     update_container,
     viewer_update_and_undo_stop,
@@ -26,7 +26,7 @@ from ayon_core.lib.transcoding import (
     VIDEO_EXTENSIONS,
     IMAGE_EXTENSIONS
 )
-from ayon_core.hosts.nuke.api import plugin
+from ayon_nuke.api import plugin
 
 
 class LoadClip(plugin.NukeLoader):
@@ -48,6 +48,8 @@ class LoadClip(plugin.NukeLoader):
         ext.lstrip(".") for ext in IMAGE_EXTENSIONS.union(VIDEO_EXTENSIONS)
     )
 
+    settings_category = "nuke"
+
     label = "Load Clip"
     order = -20
     icon = "file-video-o"
@@ -61,7 +63,8 @@ class LoadClip(plugin.NukeLoader):
     # option gui
     options_defaults = {
         "start_at_workfile": True,
-        "add_retime": True
+        "add_retime": True,
+        "deep_exr": False
     }
 
     node_name_template = "{class_name}_{ext}"
@@ -78,6 +81,11 @@ class LoadClip(plugin.NukeLoader):
                 "add_retime",
                 help="Load with retime",
                 default=cls.options_defaults["add_retime"]
+            ),
+            qargparse.Boolean(
+                "deep_exr",
+                help="Read with deep exr",
+                default=cls.options_defaults["deep_exr"]
             )
         ]
 
@@ -113,6 +121,9 @@ class LoadClip(plugin.NukeLoader):
         add_retime = options.get(
             "add_retime", self.options_defaults["add_retime"])
 
+        deep_exr = options.get(
+            "deep_exr", self.options_defaults["deep_exr"])
+
         repre_id = repre_entity["id"]
 
         self.log.debug(
@@ -153,13 +164,21 @@ class LoadClip(plugin.NukeLoader):
             return
 
         read_name = self._get_node_name(context)
-
-        # Create the Loader with the filename path set
-        read_node = nuke.createNode(
-            "Read",
-            "name {}".format(read_name),
-            inpanel=False
-        )
+        read_node = None
+        if deep_exr:
+            # Create the Loader with the filename path set
+            read_node = nuke.createNode(
+                "DeepRead",
+                "name {}".format(read_name),
+                inpanel=False
+            )
+        else:
+            # Create the Loader with the filename path set
+            read_node = nuke.createNode(
+                "Read",
+                "name {}".format(read_name),
+                inpanel=False
+            )
 
         # get colorspace
         colorspace = (
@@ -171,14 +190,14 @@ class LoadClip(plugin.NukeLoader):
         # we will switch off undo-ing
         with viewer_update_and_undo_stop():
             read_node["file"].setValue(filepath)
-
-            self.set_colorspace_to_node(
-                read_node,
-                filepath,
-                project_name,
-                version_entity,
-                repre_entity
-            )
+            if read_node.Class() == "Read":
+                self.set_colorspace_to_node(
+                    read_node,
+                    filepath,
+                    project_name,
+                    version_entity,
+                    repre_entity
+                )
 
             self._set_range_to_node(
                 read_node, first, last, start_at_workfile, slate_frames
@@ -328,13 +347,14 @@ class LoadClip(plugin.NukeLoader):
         # to avoid multiple undo steps for rest of process
         # we will switch off undo-ing
         with viewer_update_and_undo_stop():
-            self.set_colorspace_to_node(
-                read_node,
-                filepath,
-                project_name,
-                version_entity,
-                repre_entity
-            )
+            if read_node.Class() == "Read":
+                self.set_colorspace_to_node(
+                    read_node,
+                    filepath,
+                    project_name,
+                    version_entity,
+                    repre_entity
+                )
 
             self._set_range_to_node(read_node, first, last, start_at_workfile)
 
diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_effects.py b/server_addon/nuke/client/ayon_nuke/plugins/load/load_effects.py
similarity index 99%
rename from client/ayon_core/hosts/nuke/plugins/load/load_effects.py
rename to server_addon/nuke/client/ayon_nuke/plugins/load/load_effects.py
index be7420fcf0..e923a02424 100644
--- a/client/ayon_core/hosts/nuke/plugins/load/load_effects.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/load/load_effects.py
@@ -8,7 +8,7 @@ from ayon_core.pipeline import (
     load,
     get_representation_path,
 )
-from ayon_core.hosts.nuke.api import (
+from ayon_nuke.api import (
     containerise,
     update_container,
     viewer_update_and_undo_stop
@@ -22,13 +22,14 @@ class LoadEffects(load.LoaderPlugin):
     representations = {"*"}
     extensions = {"json"}
 
+    settings_category = "nuke"
+
     label = "Load Effects - nodes"
     order = 0
     icon = "cc"
     color = "white"
     ignore_attr = ["useLifetime"]
 
-
     def load(self, context, name, namespace, data):
         """
         Loading function to get the soft effects to particular read node
diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_effects_ip.py b/server_addon/nuke/client/ayon_nuke/plugins/load/load_effects_ip.py
similarity index 99%
rename from client/ayon_core/hosts/nuke/plugins/load/load_effects_ip.py
rename to server_addon/nuke/client/ayon_nuke/plugins/load/load_effects_ip.py
index 9bb430b37b..ce7e7debeb 100644
--- a/client/ayon_core/hosts/nuke/plugins/load/load_effects_ip.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/load/load_effects_ip.py
@@ -8,8 +8,8 @@ from ayon_core.pipeline import (
     load,
     get_representation_path,
 )
-from ayon_core.hosts.nuke.api import lib
-from ayon_core.hosts.nuke.api import (
+from ayon_nuke.api import lib
+from ayon_nuke.api import (
     containerise,
     update_container,
     viewer_update_and_undo_stop
@@ -23,6 +23,8 @@ class LoadEffectsInputProcess(load.LoaderPlugin):
     representations = {"*"}
     extensions = {"json"}
 
+    settings_category = "nuke"
+
     label = "Load Effects - Input Process"
     order = 0
     icon = "eye"
diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_gizmo.py b/server_addon/nuke/client/ayon_nuke/plugins/load/load_gizmo.py
similarity index 98%
rename from client/ayon_core/hosts/nuke/plugins/load/load_gizmo.py
rename to server_addon/nuke/client/ayon_nuke/plugins/load/load_gizmo.py
index 57d00795ae..1c91af0c1c 100644
--- a/client/ayon_core/hosts/nuke/plugins/load/load_gizmo.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/load/load_gizmo.py
@@ -5,13 +5,13 @@ from ayon_core.pipeline import (
     load,
     get_representation_path,
 )
-from ayon_core.hosts.nuke.api.lib import (
+from ayon_nuke.api.lib import (
     maintained_selection,
     get_avalon_knob_data,
     set_avalon_knob_data,
     swap_node_with_dependency,
 )
-from ayon_core.hosts.nuke.api import (
+from ayon_nuke.api import (
     containerise,
     update_container,
     viewer_update_and_undo_stop
@@ -25,6 +25,8 @@ class LoadGizmo(load.LoaderPlugin):
     representations = {"*"}
     extensions = {"nk"}
 
+    settings_category = "nuke"
+
     label = "Load Gizmo"
     order = 0
     icon = "dropbox"
diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_gizmo_ip.py b/server_addon/nuke/client/ayon_nuke/plugins/load/load_gizmo_ip.py
similarity index 98%
rename from client/ayon_core/hosts/nuke/plugins/load/load_gizmo_ip.py
rename to server_addon/nuke/client/ayon_nuke/plugins/load/load_gizmo_ip.py
index ed2b1ec458..36e878fdf1 100644
--- a/client/ayon_core/hosts/nuke/plugins/load/load_gizmo_ip.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/load/load_gizmo_ip.py
@@ -6,14 +6,14 @@ from ayon_core.pipeline import (
     load,
     get_representation_path,
 )
-from ayon_core.hosts.nuke.api.lib import (
+from ayon_nuke.api.lib import (
     maintained_selection,
     create_backdrop,
     get_avalon_knob_data,
     set_avalon_knob_data,
     swap_node_with_dependency,
 )
-from ayon_core.hosts.nuke.api import (
+from ayon_nuke.api import (
     containerise,
     update_container,
     viewer_update_and_undo_stop
@@ -27,6 +27,8 @@ class LoadGizmoInputProcess(load.LoaderPlugin):
     representations = {"*"}
     extensions = {"nk"}
 
+    settings_category = "nuke"
+
     label = "Load Gizmo - Input Process"
     order = 0
     icon = "eye"
diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_image.py b/server_addon/nuke/client/ayon_nuke/plugins/load/load_image.py
similarity index 97%
rename from client/ayon_core/hosts/nuke/plugins/load/load_image.py
rename to server_addon/nuke/client/ayon_nuke/plugins/load/load_image.py
index b5fccd8a0d..0c43f5a5ca 100644
--- a/client/ayon_core/hosts/nuke/plugins/load/load_image.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/load/load_image.py
@@ -7,10 +7,10 @@ from ayon_core.pipeline import (
     load,
     get_representation_path,
 )
-from ayon_core.hosts.nuke.api.lib import (
+from ayon_nuke.api.lib import (
     get_imageio_input_colorspace
 )
-from ayon_core.hosts.nuke.api import (
+from ayon_nuke.api import (
     containerise,
     update_container,
     viewer_update_and_undo_stop
@@ -33,9 +33,9 @@ class LoadImage(load.LoaderPlugin):
         "image",
     }
     representations = {"*"}
-    extensions = set(
-        ext.lstrip(".") for ext in IMAGE_EXTENSIONS
-    )
+    extensions = set(ext.lstrip(".") for ext in IMAGE_EXTENSIONS)
+
+    settings_category = "nuke"
 
     label = "Load Image"
     order = -10
diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_matchmove.py b/server_addon/nuke/client/ayon_nuke/plugins/load/load_matchmove.py
similarity index 95%
rename from client/ayon_core/hosts/nuke/plugins/load/load_matchmove.py
rename to server_addon/nuke/client/ayon_nuke/plugins/load/load_matchmove.py
index beebd0458f..c1b5a24504 100644
--- a/client/ayon_core/hosts/nuke/plugins/load/load_matchmove.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/load/load_matchmove.py
@@ -11,6 +11,8 @@ class MatchmoveLoader(load.LoaderPlugin):
     representations = {"*"}
     extensions = {"py"}
 
+    settings_category = "nuke"
+
     defaults = ["Camera", "Object"]
 
     label = "Run matchmove script"
diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_model.py b/server_addon/nuke/client/ayon_nuke/plugins/load/load_model.py
similarity index 98%
rename from client/ayon_core/hosts/nuke/plugins/load/load_model.py
rename to server_addon/nuke/client/ayon_nuke/plugins/load/load_model.py
index 40862cd1e0..551147be96 100644
--- a/client/ayon_core/hosts/nuke/plugins/load/load_model.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/load/load_model.py
@@ -5,8 +5,8 @@ from ayon_core.pipeline import (
     load,
     get_representation_path,
 )
-from ayon_core.hosts.nuke.api.lib import maintained_selection
-from ayon_core.hosts.nuke.api import (
+from ayon_nuke.api.lib import maintained_selection
+from ayon_nuke.api import (
     containerise,
     update_container,
     viewer_update_and_undo_stop
@@ -22,6 +22,8 @@ class AlembicModelLoader(load.LoaderPlugin):
     representations = {"*"}
     extensions = {"abc"}
 
+    settings_category = "nuke"
+
     label = "Load Alembic"
     icon = "cube"
     color = "orange"
diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_ociolook.py b/server_addon/nuke/client/ayon_nuke/plugins/load/load_ociolook.py
similarity index 99%
rename from client/ayon_core/hosts/nuke/plugins/load/load_ociolook.py
rename to server_addon/nuke/client/ayon_nuke/plugins/load/load_ociolook.py
index c369030b65..bdff8d7e28 100644
--- a/client/ayon_core/hosts/nuke/plugins/load/load_ociolook.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/load/load_ociolook.py
@@ -10,7 +10,7 @@ from ayon_core.pipeline import (
     load,
     get_representation_path,
 )
-from ayon_core.hosts.nuke.api import (
+from ayon_nuke.api import (
     containerise,
     viewer_update_and_undo_stop,
     update_container,
@@ -24,6 +24,8 @@ class LoadOcioLookNodes(load.LoaderPlugin):
     representations = {"*"}
     extensions = {"json"}
 
+    settings_category = "nuke"
+
     label = "Load OcioLook [nodes]"
     order = 0
     icon = "cc"
diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_script_precomp.py b/server_addon/nuke/client/ayon_nuke/plugins/load/load_script_precomp.py
similarity index 97%
rename from client/ayon_core/hosts/nuke/plugins/load/load_script_precomp.py
rename to server_addon/nuke/client/ayon_nuke/plugins/load/load_script_precomp.py
index d6699be164..cf543dabfd 100644
--- a/client/ayon_core/hosts/nuke/plugins/load/load_script_precomp.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/load/load_script_precomp.py
@@ -5,8 +5,8 @@ from ayon_core.pipeline import (
     load,
     get_representation_path,
 )
-from ayon_core.hosts.nuke.api.lib import get_avalon_knob_data
-from ayon_core.hosts.nuke.api import (
+from ayon_nuke.api.lib import get_avalon_knob_data
+from ayon_nuke.api import (
     containerise,
     update_container,
     viewer_update_and_undo_stop
@@ -20,6 +20,8 @@ class LinkAsGroup(load.LoaderPlugin):
     representations = {"*"}
     extensions = {"nk"}
 
+    settings_category = "nuke"
+
     label = "Load Precomp"
     order = 0
     icon = "file"
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/collect_backdrop.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/collect_backdrop.py
similarity index 96%
rename from client/ayon_core/hosts/nuke/plugins/publish/collect_backdrop.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/collect_backdrop.py
index fc17de95b4..1471159380 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/collect_backdrop.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/collect_backdrop.py
@@ -1,6 +1,6 @@
 from pprint import pformat
 import pyblish.api
-from ayon_core.hosts.nuke.api import lib as pnlib
+from ayon_nuke.api import lib as pnlib
 import nuke
 
 
@@ -13,6 +13,8 @@ class CollectBackdrops(pyblish.api.InstancePlugin):
     hosts = ["nuke"]
     families = ["nukenodes"]
 
+    settings_category = "nuke"
+
     def process(self, instance):
         self.log.debug(pformat(instance.data))
 
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/collect_context_data.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/collect_context_data.py
similarity index 97%
rename from client/ayon_core/hosts/nuke/plugins/publish/collect_context_data.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/collect_context_data.py
index 0a032e5a2d..33c8e63e82 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/collect_context_data.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/collect_context_data.py
@@ -2,7 +2,7 @@ import os
 import nuke
 import pyblish.api
 from ayon_core.lib import get_version_from_path
-import ayon_core.hosts.nuke.api as napi
+import ayon_nuke.api as napi
 from ayon_core.pipeline import KnownPublishError
 
 
@@ -13,6 +13,8 @@ class CollectContextData(pyblish.api.ContextPlugin):
     label = "Collect context data"
     hosts = ['nuke']
 
+    settings_category = "nuke"
+
     def process(self, context):  # sourcery skip: avoid-builtin-shadow
         root_node = nuke.root()
 
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/collect_framerate.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/collect_framerate.py
similarity index 91%
rename from client/ayon_core/hosts/nuke/plugins/publish/collect_framerate.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/collect_framerate.py
index 88a449e745..cd77eab0f1 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/collect_framerate.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/collect_framerate.py
@@ -13,5 +13,7 @@ class CollectFramerate(pyblish.api.ContextPlugin):
         "nukeassist"
     ]
 
+    settings_category = "nuke"
+
     def process(self, context):
         context.data["fps"] = nuke.root()["fps"].getValue()
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/collect_gizmo.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/collect_gizmo.py
similarity index 98%
rename from client/ayon_core/hosts/nuke/plugins/publish/collect_gizmo.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/collect_gizmo.py
index fda1c7ac31..ece9823b37 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/collect_gizmo.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/collect_gizmo.py
@@ -11,6 +11,8 @@ class CollectGizmo(pyblish.api.InstancePlugin):
     hosts = ["nuke"]
     families = ["gizmo"]
 
+    settings_category = "nuke"
+
     def process(self, instance):
 
         gizmo_node = instance.data["transientData"]["node"]
diff --git a/server_addon/nuke/client/ayon_nuke/plugins/publish/collect_headless_farm.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/collect_headless_farm.py
new file mode 100644
index 0000000000..c00b9a8f5d
--- /dev/null
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/collect_headless_farm.py
@@ -0,0 +1,58 @@
+import pyblish.api
+
+from ayon_core.pipeline.publish import (
+    AYONPyblishPluginMixin
+)
+
+
+class CollectRenderOnFarm(pyblish.api.ContextPlugin):
+    """Setup instances for render on farm submission."""
+
+    # Needs to be after CollectFromCreateContext
+    order = pyblish.api.CollectorOrder - 0.49
+    label = "Collect Render On Farm"
+    hosts = ["nuke"]
+
+    settings_category = "nuke"
+
+    def process(self, context):
+        if not context.data.get("render_on_farm", False):
+            return
+
+        for instance in context:
+            if instance.data["family"] == "workfile":
+                instance.data["active"] = False
+                continue
+
+            # Filter out all other instances.
+            node = instance.data["transientData"]["node"]
+            if node.name() != instance.context.data["node_name"]:
+                instance.data["active"] = False
+                continue
+
+            instance.data["families"].append("render_on_farm")
+
+            # Enable for farm publishing.
+            instance.data["farm"] = True
+
+        # Skip workfile version incremental save.
+        instance.context.data["increment_script_version"] = False
+
+
+class SetupRenderOnFarm(pyblish.api.InstancePlugin, AYONPyblishPluginMixin):
+    """Setup instance for render on farm submission."""
+
+    order = pyblish.api.CollectorOrder + 0.4999
+    label = "Setup Render On Farm"
+    hosts = ["nuke"]
+    families = ["render_on_farm"]
+
+    def process(self, instance):
+        # Clear the families as we only want the main family, ei. no review
+        # etc.
+        instance.data["families"] = ["render_on_farm"]
+
+        # Use the workfile instead of published.
+        publish_attributes = instance.data["publish_attributes"]
+        plugin_attributes = publish_attributes["NukeSubmitDeadline"]
+        plugin_attributes["use_published_workfile"] = False
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/collect_model.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/collect_model.py
similarity index 98%
rename from client/ayon_core/hosts/nuke/plugins/publish/collect_model.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/collect_model.py
index 1a2bc9c019..f4266bbbcb 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/collect_model.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/collect_model.py
@@ -11,6 +11,8 @@ class CollectModel(pyblish.api.InstancePlugin):
     hosts = ["nuke"]
     families = ["model"]
 
+    settings_category = "nuke"
+
     def process(self, instance):
 
         geo_node = instance.data["transientData"]["node"]
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/collect_nuke_instance_data.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/collect_nuke_instance_data.py
similarity index 98%
rename from client/ayon_core/hosts/nuke/plugins/publish/collect_nuke_instance_data.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/collect_nuke_instance_data.py
index 951072ff3f..d1392a8460 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/collect_nuke_instance_data.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/collect_nuke_instance_data.py
@@ -11,6 +11,8 @@ class CollectInstanceData(pyblish.api.InstancePlugin):
     label = "Collect Nuke Instance Data"
     hosts = ["nuke", "nukeassist"]
 
+    settings_category = "nuke"
+
     # presets
     sync_workfile_version_on_families = []
 
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/collect_reads.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/collect_reads.py
similarity index 99%
rename from client/ayon_core/hosts/nuke/plugins/publish/collect_reads.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/collect_reads.py
index af17933eb1..439374e825 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/collect_reads.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/collect_reads.py
@@ -12,6 +12,8 @@ class CollectNukeReads(pyblish.api.InstancePlugin):
     hosts = ["nuke", "nukeassist"]
     families = ["source"]
 
+    settings_category = "nuke"
+
     def process(self, instance):
         self.log.debug("checking instance: {}".format(instance))
 
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/collect_slate_node.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/collect_slate_node.py
similarity index 97%
rename from client/ayon_core/hosts/nuke/plugins/publish/collect_slate_node.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/collect_slate_node.py
index ac30bd6051..bb3b0083ab 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/collect_slate_node.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/collect_slate_node.py
@@ -10,6 +10,8 @@ class CollectSlate(pyblish.api.InstancePlugin):
     hosts = ["nuke"]
     families = ["render"]
 
+    settings_category = "nuke"
+
     def process(self, instance):
         node = instance.data["transientData"]["node"]
 
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/collect_workfile.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/collect_workfile.py
similarity index 97%
rename from client/ayon_core/hosts/nuke/plugins/publish/collect_workfile.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/collect_workfile.py
index 0f03572f8b..e4bd5ed129 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/collect_workfile.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/collect_workfile.py
@@ -11,6 +11,8 @@ class CollectWorkfile(pyblish.api.InstancePlugin):
     hosts = ['nuke']
     families = ["workfile"]
 
+    settings_category = "nuke"
+
     def process(self, instance):  # sourcery skip: avoid-builtin-shadow
 
         script_data = instance.context.data["scriptData"]
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/collect_writes.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/collect_writes.py
similarity index 99%
rename from client/ayon_core/hosts/nuke/plugins/publish/collect_writes.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/collect_writes.py
index 27525bcad1..816f493d72 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/collect_writes.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/collect_writes.py
@@ -1,7 +1,7 @@
 import os
 import nuke
 import pyblish.api
-from ayon_core.hosts.nuke import api as napi
+from ayon_nuke import api as napi
 from ayon_core.pipeline import publish
 
 
@@ -14,6 +14,8 @@ class CollectNukeWrites(pyblish.api.InstancePlugin,
     hosts = ["nuke", "nukeassist"]
     families = ["render", "prerender", "image"]
 
+    settings_category = "nuke"
+
     # cache
     _write_nodes = {}
     _frame_ranges = {}
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_backdrop.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_backdrop.py
similarity index 98%
rename from client/ayon_core/hosts/nuke/plugins/publish/extract_backdrop.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/extract_backdrop.py
index e53ce9015a..8c42920979 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/extract_backdrop.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_backdrop.py
@@ -5,7 +5,7 @@ import nuke
 import pyblish.api
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.nuke.api.lib import (
+from ayon_nuke.api.lib import (
     maintained_selection,
     reset_selection,
     select_nodes
@@ -25,6 +25,8 @@ class ExtractBackdropNode(publish.Extractor):
     hosts = ["nuke"]
     families = ["nukenodes"]
 
+    settings_category = "nuke"
+
     def process(self, instance):
         tmp_nodes = []
         child_nodes = instance.data["transientData"]["childNodes"]
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_camera.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_camera.py
similarity index 98%
rename from client/ayon_core/hosts/nuke/plugins/publish/extract_camera.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/extract_camera.py
index a1a5acb63b..83914087e3 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/extract_camera.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_camera.py
@@ -6,7 +6,7 @@ import nuke
 import pyblish.api
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.nuke.api.lib import maintained_selection
+from ayon_nuke.api.lib import maintained_selection
 
 
 class ExtractCamera(publish.Extractor):
@@ -17,6 +17,8 @@ class ExtractCamera(publish.Extractor):
     families = ["camera"]
     hosts = ["nuke"]
 
+    settings_category = "nuke"
+
     # presets
     write_geo_knobs = [
         ("file_type", "abc"),
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_gizmo.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_gizmo.py
similarity index 95%
rename from client/ayon_core/hosts/nuke/plugins/publish/extract_gizmo.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/extract_gizmo.py
index 2a2e2255fd..05e3164163 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/extract_gizmo.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_gizmo.py
@@ -4,8 +4,8 @@ import nuke
 import pyblish.api
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.nuke.api import utils as pnutils
-from ayon_core.hosts.nuke.api.lib import (
+from ayon_nuke.api import utils as pnutils
+from ayon_nuke.api.lib import (
     maintained_selection,
     reset_selection,
     select_nodes
@@ -23,6 +23,8 @@ class ExtractGizmo(publish.Extractor):
     hosts = ["nuke"]
     families = ["gizmo"]
 
+    settings_category = "nuke"
+
     def process(self, instance):
         tmp_nodes = []
         orig_grpn = instance.data["transientData"]["node"]
diff --git a/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_headless_farm.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_headless_farm.py
new file mode 100644
index 0000000000..4721fe4462
--- /dev/null
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_headless_farm.py
@@ -0,0 +1,38 @@
+import os
+from datetime import datetime
+import shutil
+
+import pyblish.api
+
+from ayon_core.pipeline import registered_host
+
+
+class ExtractRenderOnFarm(pyblish.api.InstancePlugin):
+    """Copy the workfile to a timestamped copy."""
+
+    order = pyblish.api.ExtractorOrder + 0.499
+    label = "Extract Render On Farm"
+    hosts = ["nuke"]
+    families = ["render_on_farm"]
+
+    settings_category = "nuke"
+
+    def process(self, instance):
+        if not instance.context.data.get("render_on_farm", False):
+            return
+
+        host = registered_host()
+        current_datetime = datetime.now()
+        formatted_timestamp = current_datetime.strftime("%Y%m%d%H%M%S")
+        base, ext = os.path.splitext(host.current_file())
+
+        directory = os.path.join(os.path.dirname(base), "farm_submissions")
+        if not os.path.exists(directory):
+            os.makedirs(directory)
+
+        filename = "{}_{}{}".format(
+            os.path.basename(base), formatted_timestamp, ext
+        )
+        path = os.path.join(directory, filename).replace("\\", "/")
+        instance.context.data["currentFile"] = path
+        shutil.copy(host.current_file(), path)
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_model.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_model.py
similarity index 98%
rename from client/ayon_core/hosts/nuke/plugins/publish/extract_model.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/extract_model.py
index 36896fe595..58b9d4179b 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/extract_model.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_model.py
@@ -4,7 +4,7 @@ import nuke
 import pyblish.api
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.nuke.api.lib import (
+from ayon_nuke.api.lib import (
     maintained_selection,
     select_nodes
 )
@@ -18,6 +18,8 @@ class ExtractModel(publish.Extractor):
     families = ["model"]
     hosts = ["nuke"]
 
+    settings_category = "nuke"
+
     # presets
     write_geo_knobs = [
         ("file_type", "abc"),
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_ouput_node.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_ouput_node.py
similarity index 92%
rename from client/ayon_core/hosts/nuke/plugins/publish/extract_ouput_node.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/extract_ouput_node.py
index b8e038a4f5..52072cddc5 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/extract_ouput_node.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_ouput_node.py
@@ -1,6 +1,6 @@
 import nuke
 import pyblish.api
-from ayon_core.hosts.nuke.api.lib import maintained_selection
+from ayon_nuke.api.lib import maintained_selection
 
 
 class CreateOutputNode(pyblish.api.ContextPlugin):
@@ -11,7 +11,9 @@ class CreateOutputNode(pyblish.api.ContextPlugin):
     label = 'Output Node Create'
     order = pyblish.api.ExtractorOrder + 0.4
     families = ["workfile"]
-    hosts = ['nuke']
+    hosts = ["nuke"]
+
+    settings_category = "nuke"
 
     def process(self, context):
         # capture selection state
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_output_directory.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_output_directory.py
similarity index 94%
rename from client/ayon_core/hosts/nuke/plugins/publish/extract_output_directory.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/extract_output_directory.py
index d999d200de..45156ca9ae 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/extract_output_directory.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_output_directory.py
@@ -10,7 +10,7 @@ class ExtractOutputDirectory(pyblish.api.InstancePlugin):
     label = "Output Directory"
     optional = True
 
-    # targets = ["process"]
+    settings_category = "nuke"
 
     def process(self, instance):
 
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_render_local.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_render_local.py
similarity index 99%
rename from client/ayon_core/hosts/nuke/plugins/publish/extract_render_local.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/extract_render_local.py
index c8be2a5564..c865684e7a 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/extract_render_local.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_render_local.py
@@ -4,7 +4,7 @@ import shutil
 import pyblish.api
 import clique
 import nuke
-from ayon_core.hosts.nuke import api as napi
+from ayon_nuke import api as napi
 from ayon_core.pipeline import publish
 from ayon_core.lib import collect_frames
 
@@ -25,6 +25,8 @@ class NukeRenderLocal(publish.Extractor,
     hosts = ["nuke"]
     families = ["render.local", "prerender.local", "image.local"]
 
+    settings_category = "nuke"
+
     def process(self, instance):
         child_nodes = (
             instance.data.get("transientData", {}).get("childNodes")
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_review_data.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_review_data.py
similarity index 97%
rename from client/ayon_core/hosts/nuke/plugins/publish/extract_review_data.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/extract_review_data.py
index 258a019319..856616898b 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/extract_review_data.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_review_data.py
@@ -16,6 +16,8 @@ class ExtractReviewData(publish.Extractor):
     families = ["review"]
     hosts = ["nuke"]
 
+    settings_category = "nuke"
+
     def process(self, instance):
         fpath = instance.data["path"]
         ext = os.path.splitext(fpath)[-1][1:]
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_review_data_lut.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_review_data_lut.py
similarity index 94%
rename from client/ayon_core/hosts/nuke/plugins/publish/extract_review_data_lut.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/extract_review_data_lut.py
index 0674a2dd55..d3377807ea 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/extract_review_data_lut.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_review_data_lut.py
@@ -2,8 +2,8 @@ import os
 import pyblish.api
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.nuke.api import plugin
-from ayon_core.hosts.nuke.api.lib import maintained_selection
+from ayon_nuke.api import plugin
+from ayon_nuke.api.lib import maintained_selection
 
 
 class ExtractReviewDataLut(publish.Extractor):
@@ -19,6 +19,8 @@ class ExtractReviewDataLut(publish.Extractor):
     families = ["review"]
     hosts = ["nuke"]
 
+    settings_category = "nuke"
+
     def process(self, instance):
         self.log.debug("Creating staging dir...")
         if "representations" in instance.data:
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_review_intermediates.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_review_intermediates.py
similarity index 98%
rename from client/ayon_core/hosts/nuke/plugins/publish/extract_review_intermediates.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/extract_review_intermediates.py
index f3dac3a82e..b7bb911347 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/extract_review_intermediates.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_review_intermediates.py
@@ -4,8 +4,8 @@ from pprint import pformat
 import pyblish.api
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.nuke.api import plugin
-from ayon_core.hosts.nuke.api.lib import maintained_selection
+from ayon_nuke.api import plugin
+from ayon_nuke.api.lib import maintained_selection
 
 
 class ExtractReviewIntermediates(publish.Extractor):
@@ -22,6 +22,8 @@ class ExtractReviewIntermediates(publish.Extractor):
     families = ["review"]
     hosts = ["nuke"]
 
+    settings_category = "nuke"
+
     # presets
     viewer_lut_raw = None
     outputs = {}
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_script_save.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_script_save.py
similarity index 85%
rename from client/ayon_core/hosts/nuke/plugins/publish/extract_script_save.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/extract_script_save.py
index d325684a7c..ea584b6529 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/extract_script_save.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_script_save.py
@@ -6,7 +6,9 @@ class ExtractScriptSave(pyblish.api.InstancePlugin):
     """Save current Nuke workfile script"""
     label = 'Script Save'
     order = pyblish.api.ExtractorOrder - 0.1
-    hosts = ['nuke']
+    hosts = ["nuke"]
+
+    settings_category = "nuke"
 
     def process(self, instance):
 
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_slate_frame.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_slate_frame.py
similarity index 99%
rename from client/ayon_core/hosts/nuke/plugins/publish/extract_slate_frame.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/extract_slate_frame.py
index 627888ac92..47750ea637 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/extract_slate_frame.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/extract_slate_frame.py
@@ -7,7 +7,7 @@ import pyblish.api
 import six
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.nuke.api import (
+from ayon_nuke.api import (
     maintained_selection,
     duplicate_node,
     get_view_process_node
@@ -27,6 +27,8 @@ class ExtractSlateFrame(publish.Extractor):
     families = ["slate"]
     hosts = ["nuke"]
 
+    settings_category = "nuke"
+
     # Settings values
     key_value_mapping = {
         "f_submission_note": {
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/help/validate_asset_context.xml b/server_addon/nuke/client/ayon_nuke/plugins/publish/help/validate_asset_context.xml
similarity index 100%
rename from client/ayon_core/hosts/nuke/plugins/publish/help/validate_asset_context.xml
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/help/validate_asset_context.xml
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/help/validate_backdrop.xml b/server_addon/nuke/client/ayon_nuke/plugins/publish/help/validate_backdrop.xml
similarity index 100%
rename from client/ayon_core/hosts/nuke/plugins/publish/help/validate_backdrop.xml
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/help/validate_backdrop.xml
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/help/validate_gizmo.xml b/server_addon/nuke/client/ayon_nuke/plugins/publish/help/validate_gizmo.xml
similarity index 100%
rename from client/ayon_core/hosts/nuke/plugins/publish/help/validate_gizmo.xml
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/help/validate_gizmo.xml
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/help/validate_knobs.xml b/server_addon/nuke/client/ayon_nuke/plugins/publish/help/validate_knobs.xml
similarity index 100%
rename from client/ayon_core/hosts/nuke/plugins/publish/help/validate_knobs.xml
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/help/validate_knobs.xml
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/help/validate_output_resolution.xml b/server_addon/nuke/client/ayon_nuke/plugins/publish/help/validate_output_resolution.xml
similarity index 100%
rename from client/ayon_core/hosts/nuke/plugins/publish/help/validate_output_resolution.xml
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/help/validate_output_resolution.xml
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/help/validate_proxy_mode.xml b/server_addon/nuke/client/ayon_nuke/plugins/publish/help/validate_proxy_mode.xml
similarity index 100%
rename from client/ayon_core/hosts/nuke/plugins/publish/help/validate_proxy_mode.xml
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/help/validate_proxy_mode.xml
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/help/validate_rendered_frames.xml b/server_addon/nuke/client/ayon_nuke/plugins/publish/help/validate_rendered_frames.xml
similarity index 100%
rename from client/ayon_core/hosts/nuke/plugins/publish/help/validate_rendered_frames.xml
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/help/validate_rendered_frames.xml
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/help/validate_script_attributes.xml b/server_addon/nuke/client/ayon_nuke/plugins/publish/help/validate_script_attributes.xml
similarity index 100%
rename from client/ayon_core/hosts/nuke/plugins/publish/help/validate_script_attributes.xml
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/help/validate_script_attributes.xml
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/help/validate_write_nodes.xml b/server_addon/nuke/client/ayon_nuke/plugins/publish/help/validate_write_nodes.xml
similarity index 100%
rename from client/ayon_core/hosts/nuke/plugins/publish/help/validate_write_nodes.xml
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/help/validate_write_nodes.xml
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/increment_script_version.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/increment_script_version.py
similarity index 82%
rename from client/ayon_core/hosts/nuke/plugins/publish/increment_script_version.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/increment_script_version.py
index 6b0be42ba1..36659aa2d2 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/increment_script_version.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/increment_script_version.py
@@ -1,4 +1,3 @@
-
 import nuke
 import pyblish.api
 
@@ -10,9 +9,13 @@ class IncrementScriptVersion(pyblish.api.ContextPlugin):
     label = "Increment Script Version"
     optional = True
     families = ["workfile"]
-    hosts = ['nuke']
+    hosts = ["nuke"]
+
+    settings_category = "nuke"
 
     def process(self, context):
+        if not context.data.get("increment_script_version", True):
+            return
 
         assert all(result["success"] for result in context.data["results"]), (
             "Publishing not successful so version is not increased.")
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/remove_ouput_node.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/remove_ouput_node.py
similarity index 91%
rename from client/ayon_core/hosts/nuke/plugins/publish/remove_ouput_node.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/remove_ouput_node.py
index fb77e8638c..4c17cb5f56 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/remove_ouput_node.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/remove_ouput_node.py
@@ -9,7 +9,9 @@ class RemoveOutputNode(pyblish.api.ContextPlugin):
     label = 'Output Node Remove'
     order = pyblish.api.IntegratorOrder + 0.4
     families = ["workfile"]
-    hosts = ['nuke']
+    hosts = ["nuke"]
+
+    settings_category = "nuke"
 
     def process(self, context):
         try:
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/validate_asset_context.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/validate_asset_context.py
similarity index 97%
rename from client/ayon_core/hosts/nuke/plugins/publish/validate_asset_context.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/validate_asset_context.py
index 93a30aa438..903648fd1b 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/validate_asset_context.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/validate_asset_context.py
@@ -10,7 +10,7 @@ from ayon_core.pipeline.publish import (
     PublishXmlValidationError,
     OptionalPyblishPluginMixin
 )
-from ayon_core.hosts.nuke.api import SelectInstanceNodeAction
+from ayon_nuke.api import SelectInstanceNodeAction
 
 
 class ValidateCorrectAssetContext(
@@ -34,6 +34,8 @@ class ValidateCorrectAssetContext(
     ]
     optional = True
 
+    settings_category = "nuke"
+
     @classmethod
     def apply_settings(cls, project_settings):
         """Apply deprecated settings from project settings.
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/validate_backdrop.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/validate_backdrop.py
similarity index 97%
rename from client/ayon_core/hosts/nuke/plugins/publish/validate_backdrop.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/validate_backdrop.py
index 22344c661e..f7b94e0c82 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/validate_backdrop.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/validate_backdrop.py
@@ -1,6 +1,6 @@
 import nuke
 import pyblish
-from ayon_core.hosts.nuke import api as napi
+from ayon_nuke import api as napi
 
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
@@ -65,6 +65,8 @@ class ValidateBackdrop(
     hosts = ["nuke"]
     actions = [SelectCenterInNodeGraph]
 
+    settings_category = "nuke"
+
     def process(self, instance):
         if not self.is_active(instance.data):
             return
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/validate_exposed_knobs.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/validate_exposed_knobs.py
similarity index 97%
rename from client/ayon_core/hosts/nuke/plugins/publish/validate_exposed_knobs.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/validate_exposed_knobs.py
index 217fe6fb85..d1b7c146fb 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/validate_exposed_knobs.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/validate_exposed_knobs.py
@@ -1,7 +1,7 @@
 import pyblish.api
 
 from ayon_core.pipeline.publish import get_errored_instances_from_context
-from ayon_core.hosts.nuke.api.lib import link_knobs
+from ayon_nuke.api.lib import link_knobs
 from ayon_core.pipeline.publish import (
     OptionalPyblishPluginMixin,
     PublishValidationError
@@ -52,6 +52,9 @@ class ValidateExposedKnobs(
     label = "Validate Exposed Knobs"
     actions = [RepairExposedKnobs]
     hosts = ["nuke"]
+
+    settings_category = "nuke"
+
     product_types_mapping = {
         "render": "CreateWriteRender",
         "prerender": "CreateWritePrerender",
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/validate_gizmo.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/validate_gizmo.py
similarity index 97%
rename from client/ayon_core/hosts/nuke/plugins/publish/validate_gizmo.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/validate_gizmo.py
index 2cdcb90d70..55249ae931 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/validate_gizmo.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/validate_gizmo.py
@@ -1,6 +1,6 @@
 import pyblish
 from ayon_core.pipeline import PublishXmlValidationError
-from ayon_core.hosts.nuke import api as napi
+from ayon_nuke import api as napi
 import nuke
 
 
@@ -43,6 +43,8 @@ class ValidateGizmo(pyblish.api.InstancePlugin):
     hosts = ["nuke"]
     actions = [OpenFailedGroupNode]
 
+    settings_category = "nuke"
+
     def process(self, instance):
         grpn = instance.data["transientData"]["node"]
 
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/validate_knobs.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/validate_knobs.py
similarity index 99%
rename from client/ayon_core/hosts/nuke/plugins/publish/validate_knobs.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/validate_knobs.py
index 8bcde9609d..ea03bd94b2 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/validate_knobs.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/validate_knobs.py
@@ -32,6 +32,8 @@ class ValidateKnobs(pyblish.api.ContextPlugin):
     actions = [RepairContextAction]
     optional = True
 
+    settings_category = "nuke"
+
     knobs = "{}"
 
     def process(self, context):
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/validate_output_resolution.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/validate_output_resolution.py
similarity index 98%
rename from client/ayon_core/hosts/nuke/plugins/publish/validate_output_resolution.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/validate_output_resolution.py
index e8a00d2294..440cb8b758 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/validate_output_resolution.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/validate_output_resolution.py
@@ -1,6 +1,6 @@
 import pyblish.api
 
-from ayon_core.hosts.nuke import api as napi
+from ayon_nuke import api as napi
 from ayon_core.pipeline.publish import RepairAction
 from ayon_core.pipeline import (
     PublishXmlValidationError,
@@ -27,6 +27,8 @@ class ValidateOutputResolution(
     hosts = ["nuke"]
     actions = [RepairAction]
 
+    settings_category = "nuke"
+
     missing_msg = "Missing Reformat node in render group node"
     resolution_msg = "Reformat is set to wrong format"
 
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/validate_proxy_mode.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/validate_proxy_mode.py
similarity index 96%
rename from client/ayon_core/hosts/nuke/plugins/publish/validate_proxy_mode.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/validate_proxy_mode.py
index 26e54295c9..1eb858b17e 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/validate_proxy_mode.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/validate_proxy_mode.py
@@ -25,6 +25,8 @@ class ValidateProxyMode(pyblish.api.ContextPlugin):
     hosts = ["nuke"]
     actions = [FixProxyMode]
 
+    settings_category = "nuke"
+
     def process(self, context):
 
         rootNode = nuke.root()
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/validate_rendered_frames.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/validate_rendered_frames.py
similarity index 99%
rename from client/ayon_core/hosts/nuke/plugins/publish/validate_rendered_frames.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/validate_rendered_frames.py
index 76ac7e97ad..20b7f6a6ac 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/validate_rendered_frames.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/validate_rendered_frames.py
@@ -54,6 +54,8 @@ class ValidateRenderedFrames(pyblish.api.InstancePlugin):
     hosts = ["nuke", "nukestudio"]
     actions = [RepairCollectionActionToLocal, RepairCollectionActionToFarm]
 
+    settings_category = "nuke"
+
     def process(self, instance):
         node = instance.data["transientData"]["node"]
 
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/validate_script_attributes.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/validate_script_attributes.py
similarity index 98%
rename from client/ayon_core/hosts/nuke/plugins/publish/validate_script_attributes.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/validate_script_attributes.py
index 2bd2034079..617d8d835b 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/validate_script_attributes.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/validate_script_attributes.py
@@ -5,7 +5,7 @@ from ayon_core.pipeline import (
     OptionalPyblishPluginMixin
 )
 from ayon_core.pipeline.publish import RepairAction
-from ayon_core.hosts.nuke.api.lib import (
+from ayon_nuke.api.lib import (
     WorkfileSettings
 )
 
@@ -23,6 +23,8 @@ class ValidateScriptAttributes(
     optional = True
     actions = [RepairAction]
 
+    settings_category = "nuke"
+
     def process(self, instance):
         if not self.is_active(instance.data):
             return
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/validate_write_nodes.py b/server_addon/nuke/client/ayon_nuke/plugins/publish/validate_write_nodes.py
similarity index 98%
rename from client/ayon_core/hosts/nuke/plugins/publish/validate_write_nodes.py
rename to server_addon/nuke/client/ayon_nuke/plugins/publish/validate_write_nodes.py
index 0244c1d504..d642a4314c 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/validate_write_nodes.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/publish/validate_write_nodes.py
@@ -2,7 +2,7 @@ from collections import defaultdict
 
 import pyblish.api
 from ayon_core.pipeline.publish import get_errored_instances_from_context
-from ayon_core.hosts.nuke.api.lib import (
+from ayon_nuke.api.lib import (
     get_write_node_template_attr,
     set_node_knobs_from_settings,
     color_gui_to_int
@@ -59,6 +59,8 @@ class ValidateNukeWriteNode(
     actions = [RepairNukeWriteNodeAction]
     hosts = ["nuke"]
 
+    settings_category = "nuke"
+
     def process(self, instance):
         if not self.is_active(instance.data):
             return
diff --git a/client/ayon_core/hosts/nuke/plugins/workfile_build/create_placeholder.py b/server_addon/nuke/client/ayon_nuke/plugins/workfile_build/create_placeholder.py
similarity index 99%
rename from client/ayon_core/hosts/nuke/plugins/workfile_build/create_placeholder.py
rename to server_addon/nuke/client/ayon_nuke/plugins/workfile_build/create_placeholder.py
index a5490021e4..4d43d59bad 100644
--- a/client/ayon_core/hosts/nuke/plugins/workfile_build/create_placeholder.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/workfile_build/create_placeholder.py
@@ -4,7 +4,7 @@ from ayon_core.pipeline.workfile.workfile_template_builder import (
     CreatePlaceholderItem,
     PlaceholderCreateMixin,
 )
-from ayon_core.hosts.nuke.api.lib import (
+from ayon_nuke.api.lib import (
     find_free_space_to_paste_nodes,
     get_extreme_positions,
     get_group_io_nodes,
@@ -18,7 +18,7 @@ from ayon_core.hosts.nuke.api.lib import (
     duplicate_node,
     node_tempfile,
 )
-from ayon_core.hosts.nuke.api.workfile_template_builder import (
+from ayon_nuke.api.workfile_template_builder import (
     NukePlaceholderPlugin
 )
 
diff --git a/client/ayon_core/hosts/nuke/plugins/workfile_build/load_placeholder.py b/server_addon/nuke/client/ayon_nuke/plugins/workfile_build/load_placeholder.py
similarity index 99%
rename from client/ayon_core/hosts/nuke/plugins/workfile_build/load_placeholder.py
rename to server_addon/nuke/client/ayon_nuke/plugins/workfile_build/load_placeholder.py
index 258f48c9d3..68bc10e41b 100644
--- a/client/ayon_core/hosts/nuke/plugins/workfile_build/load_placeholder.py
+++ b/server_addon/nuke/client/ayon_nuke/plugins/workfile_build/load_placeholder.py
@@ -4,7 +4,7 @@ from ayon_core.pipeline.workfile.workfile_template_builder import (
     LoadPlaceholderItem,
     PlaceholderLoadMixin,
 )
-from ayon_core.hosts.nuke.api.lib import (
+from ayon_nuke.api.lib import (
     find_free_space_to_paste_nodes,
     get_extreme_positions,
     get_group_io_nodes,
@@ -18,7 +18,7 @@ from ayon_core.hosts.nuke.api.lib import (
     duplicate_node,
     node_tempfile,
 )
-from ayon_core.hosts.nuke.api.workfile_template_builder import (
+from ayon_nuke.api.workfile_template_builder import (
     NukePlaceholderPlugin
 )
 
diff --git a/client/ayon_core/hosts/nuke/startup/__init__.py b/server_addon/nuke/client/ayon_nuke/startup/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/startup/__init__.py
rename to server_addon/nuke/client/ayon_nuke/startup/__init__.py
diff --git a/client/ayon_core/hosts/nuke/startup/clear_rendered.py b/server_addon/nuke/client/ayon_nuke/startup/clear_rendered.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/startup/clear_rendered.py
rename to server_addon/nuke/client/ayon_nuke/startup/clear_rendered.py
diff --git a/client/ayon_core/hosts/nuke/startup/custom_write_node.py b/server_addon/nuke/client/ayon_nuke/startup/custom_write_node.py
similarity index 99%
rename from client/ayon_core/hosts/nuke/startup/custom_write_node.py
rename to server_addon/nuke/client/ayon_nuke/startup/custom_write_node.py
index f119e69919..5b0f240a49 100644
--- a/client/ayon_core/hosts/nuke/startup/custom_write_node.py
+++ b/server_addon/nuke/client/ayon_nuke/startup/custom_write_node.py
@@ -3,7 +3,7 @@ import os
 import nuke
 import nukescripts
 from ayon_core.pipeline import Anatomy, get_current_project_name
-from ayon_core.hosts.nuke.api.lib import (
+from ayon_nuke.api.lib import (
     set_node_knobs_from_settings,
     get_nuke_imageio_settings
 )
diff --git a/client/ayon_core/hosts/nuke/startup/frame_setting_for_read_nodes.py b/server_addon/nuke/client/ayon_nuke/startup/frame_setting_for_read_nodes.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/startup/frame_setting_for_read_nodes.py
rename to server_addon/nuke/client/ayon_nuke/startup/frame_setting_for_read_nodes.py
diff --git a/client/ayon_core/hosts/nuke/startup/menu.py b/server_addon/nuke/client/ayon_nuke/startup/menu.py
similarity index 64%
rename from client/ayon_core/hosts/nuke/startup/menu.py
rename to server_addon/nuke/client/ayon_nuke/startup/menu.py
index 2559e2142a..c3dd8cda8f 100644
--- a/client/ayon_core/hosts/nuke/startup/menu.py
+++ b/server_addon/nuke/client/ayon_nuke/startup/menu.py
@@ -1,5 +1,5 @@
 from ayon_core.pipeline import install_host
-from ayon_core.hosts.nuke.api import NukeHost
+from ayon_nuke.api import NukeHost
 
 host = NukeHost()
 install_host(host)
diff --git a/client/ayon_core/hosts/nuke/startup/write_to_read.py b/server_addon/nuke/client/ayon_nuke/startup/write_to_read.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/startup/write_to_read.py
rename to server_addon/nuke/client/ayon_nuke/startup/write_to_read.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/__init__.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/__init__.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/__init__.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/any_pb2.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/any_pb2.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/any_pb2.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/any_pb2.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/api_pb2.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/api_pb2.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/api_pb2.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/api_pb2.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/compiler/__init__.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/compiler/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/compiler/__init__.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/compiler/__init__.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/compiler/plugin_pb2.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/compiler/plugin_pb2.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/compiler/plugin_pb2.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/compiler/plugin_pb2.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/descriptor.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/descriptor.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/descriptor.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/descriptor.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/descriptor_database.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/descriptor_database.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/descriptor_database.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/descriptor_database.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/descriptor_pb2.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/descriptor_pb2.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/descriptor_pb2.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/descriptor_pb2.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/descriptor_pool.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/descriptor_pool.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/descriptor_pool.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/descriptor_pool.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/duration_pb2.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/duration_pb2.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/duration_pb2.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/duration_pb2.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/empty_pb2.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/empty_pb2.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/empty_pb2.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/empty_pb2.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/field_mask_pb2.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/field_mask_pb2.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/field_mask_pb2.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/field_mask_pb2.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/__init__.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/__init__.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/__init__.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/_parameterized.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/_parameterized.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/_parameterized.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/_parameterized.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/api_implementation.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/api_implementation.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/api_implementation.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/api_implementation.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/builder.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/builder.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/builder.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/builder.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/containers.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/containers.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/containers.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/containers.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/decoder.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/decoder.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/decoder.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/decoder.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/encoder.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/encoder.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/encoder.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/encoder.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/enum_type_wrapper.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/enum_type_wrapper.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/enum_type_wrapper.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/enum_type_wrapper.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/extension_dict.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/extension_dict.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/extension_dict.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/extension_dict.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/message_listener.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/message_listener.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/message_listener.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/message_listener.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/message_set_extensions_pb2.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/message_set_extensions_pb2.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/message_set_extensions_pb2.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/message_set_extensions_pb2.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/missing_enum_values_pb2.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/missing_enum_values_pb2.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/missing_enum_values_pb2.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/missing_enum_values_pb2.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/more_extensions_dynamic_pb2.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/more_extensions_dynamic_pb2.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/more_extensions_dynamic_pb2.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/more_extensions_dynamic_pb2.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/more_extensions_pb2.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/more_extensions_pb2.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/more_extensions_pb2.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/more_extensions_pb2.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/more_messages_pb2.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/more_messages_pb2.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/more_messages_pb2.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/more_messages_pb2.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/no_package_pb2.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/no_package_pb2.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/no_package_pb2.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/no_package_pb2.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/python_message.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/python_message.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/python_message.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/python_message.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/type_checkers.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/type_checkers.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/type_checkers.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/type_checkers.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/well_known_types.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/well_known_types.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/well_known_types.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/well_known_types.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/wire_format.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/wire_format.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/internal/wire_format.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/internal/wire_format.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/json_format.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/json_format.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/json_format.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/json_format.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/message.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/message.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/message.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/message.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/message_factory.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/message_factory.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/message_factory.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/message_factory.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/proto_builder.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/proto_builder.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/proto_builder.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/proto_builder.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/pyext/__init__.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/pyext/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/pyext/__init__.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/pyext/__init__.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/pyext/cpp_message.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/pyext/cpp_message.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/pyext/cpp_message.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/pyext/cpp_message.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/pyext/python_pb2.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/pyext/python_pb2.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/pyext/python_pb2.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/pyext/python_pb2.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/reflection.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/reflection.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/reflection.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/reflection.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/service.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/service.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/service.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/service.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/service_reflection.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/service_reflection.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/service_reflection.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/service_reflection.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/source_context_pb2.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/source_context_pb2.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/source_context_pb2.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/source_context_pb2.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/struct_pb2.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/struct_pb2.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/struct_pb2.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/struct_pb2.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/symbol_database.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/symbol_database.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/symbol_database.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/symbol_database.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/text_encoding.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/text_encoding.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/text_encoding.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/text_encoding.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/text_format.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/text_format.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/text_format.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/text_format.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/timestamp_pb2.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/timestamp_pb2.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/timestamp_pb2.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/timestamp_pb2.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/type_pb2.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/type_pb2.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/type_pb2.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/type_pb2.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/util/__init__.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/util/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/util/__init__.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/util/__init__.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/util/json_format_pb2.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/util/json_format_pb2.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/util/json_format_pb2.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/util/json_format_pb2.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/util/json_format_proto3_pb2.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/util/json_format_proto3_pb2.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/util/json_format_proto3_pb2.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/util/json_format_proto3_pb2.py
diff --git a/client/ayon_core/hosts/nuke/vendor/google/protobuf/wrappers_pb2.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/wrappers_pb2.py
similarity index 100%
rename from client/ayon_core/hosts/nuke/vendor/google/protobuf/wrappers_pb2.py
rename to server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/wrappers_pb2.py
diff --git a/server_addon/nuke/package.py b/server_addon/nuke/package.py
index bc166bd14e..9e1f9362cb 100644
--- a/server_addon/nuke/package.py
+++ b/server_addon/nuke/package.py
@@ -1,3 +1,10 @@
 name = "nuke"
 title = "Nuke"
-version = "0.1.13"
+version = "0.2.1"
+
+client_dir = "ayon_nuke"
+
+ayon_required_addons = {
+    "core": ">0.3.2",
+}
+ayon_compatible_addons = {}
diff --git a/server_addon/nuke/server/settings/create_plugins.py b/server_addon/nuke/server/settings/create_plugins.py
index 6bdc5ee5ad..e4a0f9c938 100644
--- a/server_addon/nuke/server/settings/create_plugins.py
+++ b/server_addon/nuke/server/settings/create_plugins.py
@@ -12,7 +12,11 @@ def instance_attributes_enum():
     return [
         {"value": "reviewable", "label": "Reviewable"},
         {"value": "farm_rendering", "label": "Farm rendering"},
-        {"value": "use_range_limit", "label": "Use range limit"}
+        {"value": "use_range_limit", "label": "Use range limit"},
+        {
+            "value": "render_on_farm",
+            "label": "Render On Farm"
+        }
     ]
 
 
diff --git a/server_addon/nuke/server/settings/loader_plugins.py b/server_addon/nuke/server/settings/loader_plugins.py
index 531ea8d986..22cb469e8d 100644
--- a/server_addon/nuke/server/settings/loader_plugins.py
+++ b/server_addon/nuke/server/settings/loader_plugins.py
@@ -22,7 +22,9 @@ class LoadClipOptionsModel(BaseSettingsModel):
     add_retime: bool = SettingsField(
         title="Add retime"
     )
-
+    deep_exr: bool = SettingsField(
+        title="Deep Exr Read Node"
+    )
 
 class LoadClipModel(BaseSettingsModel):
     enabled: bool = SettingsField(
@@ -65,7 +67,8 @@ DEFAULT_LOADER_PLUGINS_SETTINGS = {
         "node_name_template": "{class_name}_{ext}",
         "options_defaults": {
             "start_at_workfile": True,
-            "add_retime": True
+            "add_retime": True,
+            "deep_exr": False
         }
     }
 }
diff --git a/client/ayon_core/hosts/traypublisher/__init__.py b/server_addon/traypublisher/client/ayon_traypublisher/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/__init__.py
rename to server_addon/traypublisher/client/ayon_traypublisher/__init__.py
diff --git a/client/ayon_core/hosts/traypublisher/addon.py b/server_addon/traypublisher/client/ayon_traypublisher/addon.py
similarity index 93%
rename from client/ayon_core/hosts/traypublisher/addon.py
rename to server_addon/traypublisher/client/ayon_traypublisher/addon.py
index 3dd275f223..5432cb1a92 100644
--- a/client/ayon_core/hosts/traypublisher/addon.py
+++ b/server_addon/traypublisher/client/ayon_traypublisher/addon.py
@@ -29,8 +29,8 @@ class TrayPublishAddon(AYONAddon, IHostAddon, ITrayAction):
     def on_action_trigger(self):
         self.run_traypublisher()
 
-    def connect_with_addons(self, enabled_modules):
-        """Collect publish paths from other modules."""
+    def connect_with_addons(self, enabled_addons):
+        """Collect publish paths from other addons."""
         publish_paths = self.manager.collect_plugin_paths()["publish"]
         self.publish_paths.extend(publish_paths)
 
@@ -55,9 +55,9 @@ def cli_main():
 def launch():
     """Launch TrayPublish tool UI."""
 
-    from ayon_core.tools import traypublisher
+    from ayon_traypublisher import ui
 
-    traypublisher.main()
+    ui.main()
 
 
 @cli_main.command()
diff --git a/client/ayon_core/hosts/traypublisher/api/__init__.py b/server_addon/traypublisher/client/ayon_traypublisher/api/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/api/__init__.py
rename to server_addon/traypublisher/client/ayon_traypublisher/api/__init__.py
diff --git a/client/ayon_core/hosts/traypublisher/api/editorial.py b/server_addon/traypublisher/client/ayon_traypublisher/api/editorial.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/api/editorial.py
rename to server_addon/traypublisher/client/ayon_traypublisher/api/editorial.py
diff --git a/client/ayon_core/hosts/traypublisher/api/pipeline.py b/server_addon/traypublisher/client/ayon_traypublisher/api/pipeline.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/api/pipeline.py
rename to server_addon/traypublisher/client/ayon_traypublisher/api/pipeline.py
diff --git a/client/ayon_core/hosts/traypublisher/api/plugin.py b/server_addon/traypublisher/client/ayon_traypublisher/api/plugin.py
similarity index 99%
rename from client/ayon_core/hosts/traypublisher/api/plugin.py
rename to server_addon/traypublisher/client/ayon_traypublisher/api/plugin.py
index 257d01eb50..973eb65b11 100644
--- a/client/ayon_core/hosts/traypublisher/api/plugin.py
+++ b/server_addon/traypublisher/client/ayon_traypublisher/api/plugin.py
@@ -22,7 +22,7 @@ from .pipeline import (
 )
 
 REVIEW_EXTENSIONS = set(IMAGE_EXTENSIONS) | set(VIDEO_EXTENSIONS)
-SHARED_DATA_KEY = "openpype.traypublisher.instances"
+SHARED_DATA_KEY = "ayon.traypublisher.instances"
 
 
 class HiddenTrayPublishCreator(HiddenCreator):
diff --git a/client/ayon_core/hosts/traypublisher/batch_parsing.py b/server_addon/traypublisher/client/ayon_traypublisher/batch_parsing.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/batch_parsing.py
rename to server_addon/traypublisher/client/ayon_traypublisher/batch_parsing.py
diff --git a/client/ayon_core/hosts/traypublisher/csv_publish.py b/server_addon/traypublisher/client/ayon_traypublisher/csv_publish.py
similarity index 97%
rename from client/ayon_core/hosts/traypublisher/csv_publish.py
rename to server_addon/traypublisher/client/ayon_traypublisher/csv_publish.py
index 2762172936..b7906c5706 100644
--- a/client/ayon_core/hosts/traypublisher/csv_publish.py
+++ b/server_addon/traypublisher/client/ayon_traypublisher/csv_publish.py
@@ -6,7 +6,7 @@ from ayon_core.lib.attribute_definitions import FileDefItem
 from ayon_core.pipeline import install_host
 from ayon_core.pipeline.create import CreateContext
 
-from ayon_core.hosts.traypublisher.api import TrayPublisherHost
+from ayon_traypublisher.api import TrayPublisherHost
 
 
 def csvpublish(
diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_colorspace_look.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_colorspace_look.py
similarity index 97%
rename from client/ayon_core/hosts/traypublisher/plugins/create/create_colorspace_look.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_colorspace_look.py
index da05afe86b..901bd758ba 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/create/create_colorspace_look.py
+++ b/server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_colorspace_look.py
@@ -15,13 +15,13 @@ from ayon_core.pipeline import (
     CreatorError
 )
 from ayon_core.pipeline import colorspace
-from ayon_core.hosts.traypublisher.api.plugin import TrayPublishCreator
+from ayon_traypublisher.api.plugin import TrayPublishCreator
 
 
 class CreateColorspaceLook(TrayPublishCreator):
     """Creates colorspace look files."""
 
-    identifier = "io.openpype.creators.traypublisher.colorspace_look"
+    identifier = "io.ayon.creators.traypublisher.colorspace_look"
     label = "Colorspace Look"
     product_type = "ociolook"
     description = "Publishes color space look file."
diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_csv_ingest.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_csv_ingest.py
similarity index 99%
rename from client/ayon_core/hosts/traypublisher/plugins/create/create_csv_ingest.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_csv_ingest.py
index 8143e8b45b..5a5deeada8 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/create/create_csv_ingest.py
+++ b/server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_csv_ingest.py
@@ -13,9 +13,7 @@ from ayon_core.lib.transcoding import (
     VIDEO_EXTENSIONS, IMAGE_EXTENSIONS
 )
 from ayon_core.pipeline.create import CreatorError
-from ayon_core.hosts.traypublisher.api.plugin import (
-    TrayPublishCreator
-)
+from ayon_traypublisher.api.plugin import TrayPublishCreator
 
 
 class IngestCSV(TrayPublishCreator):
diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_editorial.py
similarity index 99%
rename from client/ayon_core/hosts/traypublisher/plugins/create/create_editorial.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_editorial.py
index 4057aee9a6..a2f6f211f5 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial.py
+++ b/server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_editorial.py
@@ -4,11 +4,11 @@ from copy import deepcopy
 import ayon_api
 import opentimelineio as otio
 
-from ayon_core.hosts.traypublisher.api.plugin import (
+from ayon_traypublisher.api.plugin import (
     TrayPublishCreator,
     HiddenTrayPublishCreator
 )
-from ayon_core.hosts.traypublisher.api.editorial import (
+from ayon_traypublisher.api.editorial import (
     ShotMetadataSolver
 )
 from ayon_core.pipeline import CreatedInstance
diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial_package.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_editorial_package.py
similarity index 97%
rename from client/ayon_core/hosts/traypublisher/plugins/create/create_editorial_package.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_editorial_package.py
index 82b109be28..5f0a84be4a 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial_package.py
+++ b/server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_editorial_package.py
@@ -9,7 +9,7 @@ from ayon_core.lib.attribute_definitions import (
     BoolDef,
     TextDef,
 )
-from ayon_core.hosts.traypublisher.api.plugin import TrayPublishCreator
+from ayon_traypublisher.api.plugin import TrayPublishCreator
 
 
 class EditorialPackageCreator(TrayPublishCreator):
diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_from_settings.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_from_settings.py
similarity index 88%
rename from client/ayon_core/hosts/traypublisher/plugins/create/create_from_settings.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_from_settings.py
index fe7ba4c4a4..13cf92ab10 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/create/create_from_settings.py
+++ b/server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_from_settings.py
@@ -6,7 +6,7 @@ log = Logger.get_logger(__name__)
 
 
 def initialize():
-    from ayon_core.hosts.traypublisher.api.plugin import SettingsCreator
+    from ayon_traypublisher.api.plugin import SettingsCreator
 
     project_name = os.environ["AYON_PROJECT_NAME"]
     project_settings = get_project_settings(project_name)
diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_movie_batch.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_movie_batch.py
similarity index 97%
rename from client/ayon_core/hosts/traypublisher/plugins/create/create_movie_batch.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_movie_batch.py
index 546408b4d6..77b9b0df0a 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/create/create_movie_batch.py
+++ b/server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_movie_batch.py
@@ -17,8 +17,8 @@ from ayon_core.pipeline.create import (
     TaskNotSetError,
 )
 
-from ayon_core.hosts.traypublisher.api.plugin import TrayPublishCreator
-from ayon_core.hosts.traypublisher.batch_parsing import (
+from ayon_traypublisher.api.plugin import TrayPublishCreator
+from ayon_traypublisher.batch_parsing import (
     get_folder_entity_from_filename
 )
 
diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_online.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_online.py
similarity index 96%
rename from client/ayon_core/hosts/traypublisher/plugins/create/create_online.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_online.py
index f48037701e..135a11c0c6 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/create/create_online.py
+++ b/server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_online.py
@@ -14,13 +14,13 @@ from ayon_core.pipeline import (
     CreatedInstance,
     CreatorError
 )
-from ayon_core.hosts.traypublisher.api.plugin import TrayPublishCreator
+from ayon_traypublisher.api.plugin import TrayPublishCreator
 
 
 class OnlineCreator(TrayPublishCreator):
     """Creates instance from file and retains its original name."""
 
-    identifier = "io.openpype.creators.traypublisher.online"
+    identifier = "io.ayon.creators.traypublisher.online"
     label = "Online"
     product_type = "online"
     description = "Publish file retaining its original file name"
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_app_name.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_app_name.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_app_name.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_app_name.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_clip_instances.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_clip_instances.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_clip_instances.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_clip_instances.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_colorspace_look.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_colorspace_look.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_colorspace_look.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_colorspace_look.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_csv_ingest_instance_data.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_csv_ingest_instance_data.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_csv_ingest_instance_data.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_csv_ingest_instance_data.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_editorial_instances.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_editorial_instances.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_editorial_instances.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_editorial_instances.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_editorial_package.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_editorial_package.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_editorial_package.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_editorial_package.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_editorial_reviewable.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_editorial_reviewable.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_editorial_reviewable.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_editorial_reviewable.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_explicit_colorspace.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_explicit_colorspace.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_explicit_colorspace.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_explicit_colorspace.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_frame_data_from_folder_entity.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_frame_data_from_folder_entity.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_frame_data_from_folder_entity.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_frame_data_from_folder_entity.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_movie_batch.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_movie_batch.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_movie_batch.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_movie_batch.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_online_file.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_online_file.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_online_file.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_online_file.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_review_frames.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_review_frames.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_review_frames.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_review_frames.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_sequence_frame_data.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_sequence_frame_data.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_sequence_frame_data.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_sequence_frame_data.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_shot_instances.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_shot_instances.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_shot_instances.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_shot_instances.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_simple_instances.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_simple_instances.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_simple_instances.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_simple_instances.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_source.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_source.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/collect_source.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_source.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/extract_colorspace_look.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/extract_colorspace_look.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/extract_colorspace_look.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/extract_colorspace_look.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/extract_csv_file.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/extract_csv_file.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/extract_csv_file.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/extract_csv_file.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/extract_editorial_pckg.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/extract_editorial_pckg.py
diff --git a/client/ayon_core/plugins/publish/extract_trim_video_audio.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/extract_trim_video_audio.py
similarity index 100%
rename from client/ayon_core/plugins/publish/extract_trim_video_audio.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/extract_trim_video_audio.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/help/validate_existing_version.xml b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/help/validate_existing_version.xml
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/help/validate_existing_version.xml
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/help/validate_existing_version.xml
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/help/validate_frame_ranges.xml b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/help/validate_frame_ranges.xml
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/help/validate_frame_ranges.xml
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/help/validate_frame_ranges.xml
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_colorspace.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_colorspace.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/validate_colorspace.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_colorspace.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_colorspace_look.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_colorspace_look.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/validate_colorspace_look.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_colorspace_look.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_editorial_package.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_editorial_package.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/validate_editorial_package.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_editorial_package.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_existing_version.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_existing_version.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/validate_existing_version.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_existing_version.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_filepaths.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_filepaths.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/validate_filepaths.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_filepaths.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_frame_ranges.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_frame_ranges.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/validate_frame_ranges.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_frame_ranges.py
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_online_file.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_online_file.py
similarity index 100%
rename from client/ayon_core/hosts/traypublisher/plugins/publish/validate_online_file.py
rename to server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_online_file.py
diff --git a/client/ayon_core/tools/traypublisher/__init__.py b/server_addon/traypublisher/client/ayon_traypublisher/ui/__init__.py
similarity index 100%
rename from client/ayon_core/tools/traypublisher/__init__.py
rename to server_addon/traypublisher/client/ayon_traypublisher/ui/__init__.py
diff --git a/client/ayon_core/tools/traypublisher/window.py b/server_addon/traypublisher/client/ayon_traypublisher/ui/window.py
similarity index 99%
rename from client/ayon_core/tools/traypublisher/window.py
rename to server_addon/traypublisher/client/ayon_traypublisher/ui/window.py
index 4700e20531..288dac8529 100644
--- a/client/ayon_core/tools/traypublisher/window.py
+++ b/server_addon/traypublisher/client/ayon_traypublisher/ui/window.py
@@ -13,7 +13,6 @@ import qtawesome
 
 from ayon_core.lib import AYONSettingsRegistry, is_running_from_build
 from ayon_core.pipeline import install_host
-from ayon_core.hosts.traypublisher.api import TrayPublisherHost
 from ayon_core.tools.publisher.control_qt import QtPublisherController
 from ayon_core.tools.publisher.window import PublisherWindow
 from ayon_core.tools.common_models import ProjectsModel
@@ -24,6 +23,7 @@ from ayon_core.tools.utils import (
     ProjectSortFilterProxy,
     PROJECT_NAME_ROLE,
 )
+from ayon_traypublisher.api import TrayPublisherHost
 
 
 class TrayPublisherRegistry(AYONSettingsRegistry):
diff --git a/server_addon/traypublisher/package.py b/server_addon/traypublisher/package.py
index c138a2296d..ea04835b45 100644
--- a/server_addon/traypublisher/package.py
+++ b/server_addon/traypublisher/package.py
@@ -1,3 +1,10 @@
 name = "traypublisher"
 title = "TrayPublisher"
-version = "0.1.5"
+version = "0.2.0"
+
+client_dir = "ayon_traypublisher"
+
+ayon_required_addons = {
+    "core": ">0.3.2",
+}
+ayon_compatible_addons = {}
diff --git a/client/ayon_core/hosts/tvpaint/__init__.py b/server_addon/tvpaint/client/ayon_tvpaint/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/__init__.py
rename to server_addon/tvpaint/client/ayon_tvpaint/__init__.py
diff --git a/client/ayon_core/hosts/tvpaint/addon.py b/server_addon/tvpaint/client/ayon_tvpaint/addon.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/addon.py
rename to server_addon/tvpaint/client/ayon_tvpaint/addon.py
diff --git a/client/ayon_core/hosts/tvpaint/api/__init__.py b/server_addon/tvpaint/client/ayon_tvpaint/api/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/api/__init__.py
rename to server_addon/tvpaint/client/ayon_tvpaint/api/__init__.py
diff --git a/client/ayon_core/hosts/tvpaint/api/communication_server.py b/server_addon/tvpaint/client/ayon_tvpaint/api/communication_server.py
similarity index 99%
rename from client/ayon_core/hosts/tvpaint/api/communication_server.py
rename to server_addon/tvpaint/client/ayon_tvpaint/api/communication_server.py
index d185bdf685..7ccb49f07e 100644
--- a/client/ayon_core/hosts/tvpaint/api/communication_server.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/api/communication_server.py
@@ -22,7 +22,7 @@ from aiohttp_json_rpc.protocol import (
 from aiohttp_json_rpc.exceptions import RpcError
 
 from ayon_core.lib import emit_event
-from ayon_core.hosts.tvpaint.tvpaint_plugin import get_plugin_files_path
+from ayon_tvpaint.tvpaint_plugin import get_plugin_files_path
 
 log = logging.getLogger(__name__)
 log.setLevel(logging.DEBUG)
diff --git a/client/ayon_core/hosts/tvpaint/api/launch_script.py b/server_addon/tvpaint/client/ayon_tvpaint/api/launch_script.py
similarity index 98%
rename from client/ayon_core/hosts/tvpaint/api/launch_script.py
rename to server_addon/tvpaint/client/ayon_tvpaint/api/launch_script.py
index bcc92d8b6d..1e23e95572 100644
--- a/client/ayon_core/hosts/tvpaint/api/launch_script.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/api/launch_script.py
@@ -10,7 +10,7 @@ from qtpy import QtWidgets, QtCore, QtGui
 
 from ayon_core import style
 from ayon_core.pipeline import install_host
-from ayon_core.hosts.tvpaint.api import (
+from ayon_tvpaint.api import (
     TVPaintHost,
     CommunicationWrapper,
 )
diff --git a/client/ayon_core/hosts/tvpaint/api/lib.py b/server_addon/tvpaint/client/ayon_tvpaint/api/lib.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/api/lib.py
rename to server_addon/tvpaint/client/ayon_tvpaint/api/lib.py
diff --git a/client/ayon_core/hosts/tvpaint/api/pipeline.py b/server_addon/tvpaint/client/ayon_tvpaint/api/pipeline.py
similarity index 99%
rename from client/ayon_core/hosts/tvpaint/api/pipeline.py
rename to server_addon/tvpaint/client/ayon_tvpaint/api/pipeline.py
index 6f5c4d49d4..5ec6355138 100644
--- a/client/ayon_core/hosts/tvpaint/api/pipeline.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/api/pipeline.py
@@ -7,8 +7,9 @@ import requests
 import ayon_api
 import pyblish.api
 
+from ayon_tvpaint import TVPAINT_ROOT_DIR
+
 from ayon_core.host import HostBase, IWorkfileHost, ILoadHost, IPublishHost
-from ayon_core.hosts.tvpaint import TVPAINT_ROOT_DIR
 from ayon_core.settings import get_current_project_settings
 from ayon_core.lib import register_event_callback
 from ayon_core.pipeline import (
diff --git a/client/ayon_core/hosts/tvpaint/api/plugin.py b/server_addon/tvpaint/client/ayon_tvpaint/api/plugin.py
similarity index 97%
rename from client/ayon_core/hosts/tvpaint/api/plugin.py
rename to server_addon/tvpaint/client/ayon_tvpaint/api/plugin.py
index e715b959f4..9dd6ae530a 100644
--- a/client/ayon_core/hosts/tvpaint/api/plugin.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/api/plugin.py
@@ -12,7 +12,7 @@ from ayon_core.pipeline.create.creator_plugins import cache_and_get_instances
 from .lib import get_layers_data
 
 
-SHARED_DATA_KEY = "openpype.tvpaint.instances"
+SHARED_DATA_KEY = "ayon.tvpaint.instances"
 
 
 class TVPaintCreatorCommon:
@@ -89,6 +89,8 @@ class TVPaintCreatorCommon:
 
 
 class TVPaintCreator(Creator, TVPaintCreatorCommon):
+    settings_category = "tvpaint"
+
     def collect_instances(self):
         self._collect_create_instances()
 
@@ -140,6 +142,8 @@ class TVPaintCreator(Creator, TVPaintCreatorCommon):
 
 
 class TVPaintAutoCreator(AutoCreator, TVPaintCreatorCommon):
+    settings_category = "tvpaint"
+
     def collect_instances(self):
         self._collect_create_instances()
 
@@ -152,6 +156,7 @@ class TVPaintAutoCreator(AutoCreator, TVPaintCreatorCommon):
 
 class Loader(LoaderPlugin):
     hosts = ["tvpaint"]
+    settings_category = "tvpaint"
 
     @staticmethod
     def get_members_from_container(container):
diff --git a/client/ayon_core/hosts/tvpaint/hooks/pre_launch_args.py b/server_addon/tvpaint/client/ayon_tvpaint/hooks/pre_launch_args.py
similarity index 95%
rename from client/ayon_core/hosts/tvpaint/hooks/pre_launch_args.py
rename to server_addon/tvpaint/client/ayon_tvpaint/hooks/pre_launch_args.py
index 691b81e089..8ee91aa0e7 100644
--- a/client/ayon_core/hosts/tvpaint/hooks/pre_launch_args.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/hooks/pre_launch_args.py
@@ -37,6 +37,6 @@ class TvpaintPrelaunchHook(PreLaunchHook):
             self.launch_context.launch_args.extend(remainders)
 
     def launch_script_path(self):
-        from ayon_core.hosts.tvpaint import get_launch_script_path
+        from ayon_tvpaint import get_launch_script_path
 
         return get_launch_script_path()
diff --git a/client/ayon_core/hosts/tvpaint/lib.py b/server_addon/tvpaint/client/ayon_tvpaint/lib.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/lib.py
rename to server_addon/tvpaint/client/ayon_tvpaint/lib.py
diff --git a/client/ayon_core/hosts/tvpaint/plugins/create/convert_legacy.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/convert_legacy.py
similarity index 97%
rename from client/ayon_core/hosts/tvpaint/plugins/create/convert_legacy.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/create/convert_legacy.py
index 34fe0ce8f4..e79a6565e8 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/create/convert_legacy.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/convert_legacy.py
@@ -4,8 +4,8 @@ from ayon_core.pipeline.create.creator_plugins import (
     ProductConvertorPlugin,
     cache_and_get_instances,
 )
-from ayon_core.hosts.tvpaint.api.plugin import SHARED_DATA_KEY
-from ayon_core.hosts.tvpaint.api.lib import get_groups_data
+from ayon_tvpaint.api.plugin import SHARED_DATA_KEY
+from ayon_tvpaint.api.lib import get_groups_data
 
 
 class TVPaintLegacyConverted(ProductConvertorPlugin):
diff --git a/client/ayon_core/hosts/tvpaint/plugins/create/create_render.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_render.py
similarity index 99%
rename from client/ayon_core/hosts/tvpaint/plugins/create/create_render.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_render.py
index dc9c2466e0..2286a4417a 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/create/create_render.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_render.py
@@ -52,11 +52,11 @@ from ayon_core.pipeline.create import (
     CreatedInstance,
     CreatorError,
 )
-from ayon_core.hosts.tvpaint.api.plugin import (
+from ayon_tvpaint.api.plugin import (
     TVPaintCreator,
     TVPaintAutoCreator,
 )
-from ayon_core.hosts.tvpaint.api.lib import (
+from ayon_tvpaint.api.lib import (
     get_layers_data,
     get_groups_data,
     execute_george_through_file,
diff --git a/client/ayon_core/hosts/tvpaint/plugins/create/create_review.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_review.py
similarity index 97%
rename from client/ayon_core/hosts/tvpaint/plugins/create/create_review.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_review.py
index acb4f0f8d6..6068ffa1d8 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/create/create_review.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_review.py
@@ -1,7 +1,7 @@
 import ayon_api
 
 from ayon_core.pipeline import CreatedInstance
-from ayon_core.hosts.tvpaint.api.plugin import TVPaintAutoCreator
+from ayon_tvpaint.api.plugin import TVPaintAutoCreator
 
 
 class TVPaintReviewCreator(TVPaintAutoCreator):
diff --git a/client/ayon_core/hosts/tvpaint/plugins/create/create_workfile.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_workfile.py
similarity index 97%
rename from client/ayon_core/hosts/tvpaint/plugins/create/create_workfile.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_workfile.py
index f21f41439e..b08f731869 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/create/create_workfile.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/create/create_workfile.py
@@ -1,7 +1,7 @@
 import ayon_api
 
 from ayon_core.pipeline import CreatedInstance
-from ayon_core.hosts.tvpaint.api.plugin import TVPaintAutoCreator
+from ayon_tvpaint.api.plugin import TVPaintAutoCreator
 
 
 class TVPaintWorkfileCreator(TVPaintAutoCreator):
diff --git a/client/ayon_core/hosts/tvpaint/plugins/load/load_image.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_image.py
similarity index 95%
rename from client/ayon_core/hosts/tvpaint/plugins/load/load_image.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_image.py
index aad8f92d26..de61992d3f 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/load/load_image.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_image.py
@@ -1,6 +1,6 @@
 from ayon_core.lib.attribute_definitions import BoolDef
-from ayon_core.hosts.tvpaint.api import plugin
-from ayon_core.hosts.tvpaint.api.lib import execute_george_through_file
+from ayon_tvpaint.api import plugin
+from ayon_tvpaint.api.lib import execute_george_through_file
 
 
 class ImportImage(plugin.Loader):
diff --git a/client/ayon_core/hosts/tvpaint/plugins/load/load_reference_image.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_reference_image.py
similarity index 98%
rename from client/ayon_core/hosts/tvpaint/plugins/load/load_reference_image.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_reference_image.py
index a7fcb9f4a4..ce08aa9cd9 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/load/load_reference_image.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_reference_image.py
@@ -2,12 +2,12 @@ import collections
 
 from ayon_core.lib.attribute_definitions import BoolDef
 from ayon_core.pipeline import registered_host
-from ayon_core.hosts.tvpaint.api import plugin
-from ayon_core.hosts.tvpaint.api.lib import (
+from ayon_tvpaint.api import plugin
+from ayon_tvpaint.api.lib import (
     get_layers_data,
     execute_george_through_file,
 )
-from ayon_core.hosts.tvpaint.api.pipeline import (
+from ayon_tvpaint.api.pipeline import (
     write_workfile_metadata,
     SECTION_NAME_CONTAINERS,
     containerise,
diff --git a/client/ayon_core/hosts/tvpaint/plugins/load/load_sound.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_sound.py
similarity index 97%
rename from client/ayon_core/hosts/tvpaint/plugins/load/load_sound.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_sound.py
index 7e8c8022d6..086afba079 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/load/load_sound.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_sound.py
@@ -1,7 +1,7 @@
 import os
 import tempfile
-from ayon_core.hosts.tvpaint.api import plugin
-from ayon_core.hosts.tvpaint.api.lib import (
+from ayon_tvpaint.api import plugin
+from ayon_tvpaint.api.lib import (
     execute_george_through_file,
 )
 
diff --git a/client/ayon_core/hosts/tvpaint/plugins/load/load_workfile.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_workfile.py
similarity index 96%
rename from client/ayon_core/hosts/tvpaint/plugins/load/load_workfile.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_workfile.py
index 07c2d91533..045e22f188 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/load/load_workfile.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_workfile.py
@@ -10,11 +10,11 @@ from ayon_core.pipeline.workfile import (
     get_last_workfile_with_version,
 )
 from ayon_core.pipeline.template_data import get_template_data_with_names
-from ayon_core.hosts.tvpaint.api import plugin
-from ayon_core.hosts.tvpaint.api.lib import (
+from ayon_tvpaint.api import plugin
+from ayon_tvpaint.api.lib import (
     execute_george_through_file,
 )
-from ayon_core.hosts.tvpaint.api.pipeline import (
+from ayon_tvpaint.api.pipeline import (
     get_current_workfile_context,
 )
 from ayon_core.pipeline.version_start import get_versioning_start
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/collect_instance_frames.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/collect_instance_frames.py
similarity index 97%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/collect_instance_frames.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/collect_instance_frames.py
index 5f134a0cd0..a9e69166d7 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/collect_instance_frames.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/collect_instance_frames.py
@@ -14,6 +14,8 @@ class CollectOutputFrameRange(pyblish.api.InstancePlugin):
     hosts = ["tvpaint"]
     families = ["review", "render"]
 
+    settings_category = "tvpaint"
+
     def process(self, instance):
         folder_entity = instance.data.get("folderEntity")
         if not folder_entity:
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/collect_render_instances.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/collect_render_instances.py
similarity index 99%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/collect_render_instances.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/collect_render_instances.py
index 596d257f22..00af624700 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/collect_render_instances.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/collect_render_instances.py
@@ -9,6 +9,7 @@ class CollectRenderInstances(pyblish.api.InstancePlugin):
     hosts = ["tvpaint"]
     families = ["render", "review"]
 
+    settings_category = "tvpaint"
     ignore_render_pass_transparency = False
 
     def process(self, instance):
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/collect_workfile.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/collect_workfile.py
similarity index 96%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/collect_workfile.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/collect_workfile.py
index a9e9db3872..27de086a46 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/collect_workfile.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/collect_workfile.py
@@ -9,6 +9,8 @@ class CollectWorkfile(pyblish.api.InstancePlugin):
     hosts = ["tvpaint"]
     families = ["workfile"]
 
+    settings_category = "tvpaint"
+
     def process(self, instance):
         context = instance.context
         current_file = context.data["currentFile"]
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/collect_workfile_data.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/collect_workfile_data.py
similarity index 98%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/collect_workfile_data.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/collect_workfile_data.py
index 3155773bda..a34a718ff5 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/collect_workfile_data.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/collect_workfile_data.py
@@ -4,13 +4,13 @@ import tempfile
 
 import pyblish.api
 
-from ayon_core.hosts.tvpaint.api.lib import (
+from ayon_tvpaint.api.lib import (
     execute_george,
     execute_george_through_file,
     get_layers_data,
     get_groups_data,
 )
-from ayon_core.hosts.tvpaint.api.pipeline import (
+from ayon_tvpaint.api.pipeline import (
     SECTION_NAME_CONTEXT,
     SECTION_NAME_INSTANCES,
     SECTION_NAME_CONTAINERS,
@@ -58,6 +58,8 @@ class CollectWorkfileData(pyblish.api.ContextPlugin):
     hosts = ["tvpaint"]
     actions = [ResetTVPaintWorkfileMetadata]
 
+    settings_category = "tvpaint"
+
     def process(self, context):
         current_project_id = execute_george("tv_projectcurrentid")
         execute_george("tv_projectselect {}".format(current_project_id))
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/extract_convert_to_exr.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/extract_convert_to_exr.py
similarity index 98%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/extract_convert_to_exr.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/extract_convert_to_exr.py
index d1bc68ef35..020ebc1a89 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/extract_convert_to_exr.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/extract_convert_to_exr.py
@@ -23,6 +23,8 @@ class ExtractConvertToEXR(pyblish.api.InstancePlugin):
     hosts = ["tvpaint"]
     families = ["render"]
 
+    settings_category = "tvpaint"
+
     enabled = False
 
     # Replace source PNG files or just add
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/extract_sequence.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/extract_sequence.py
similarity index 99%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/extract_sequence.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/extract_sequence.py
index fe5e148b7b..86c20c6528 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/extract_sequence.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/extract_sequence.py
@@ -10,13 +10,13 @@ from ayon_core.pipeline.publish import (
     KnownPublishError,
     get_publish_instance_families,
 )
-from ayon_core.hosts.tvpaint.api.lib import (
+from ayon_tvpaint.api.lib import (
     execute_george,
     execute_george_through_file,
     get_layers_pre_post_behavior,
     get_layers_exposure_frames,
 )
-from ayon_core.hosts.tvpaint.lib import (
+from ayon_tvpaint.lib import (
     calculate_layers_extraction_data,
     get_frame_filename_template,
     fill_reference_frames,
@@ -31,6 +31,8 @@ class ExtractSequence(pyblish.api.InstancePlugin):
     hosts = ["tvpaint"]
     families = ["review", "render"]
 
+    settings_category = "tvpaint"
+
     # Modifiable with settings
     review_bg = [255, 255, 255, 1.0]
 
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_asset_name.xml b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_asset_name.xml
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_asset_name.xml
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_asset_name.xml
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_duplicated_layer_names.xml b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_duplicated_layer_names.xml
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_duplicated_layer_names.xml
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_duplicated_layer_names.xml
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_layers_visibility.xml b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_layers_visibility.xml
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_layers_visibility.xml
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_layers_visibility.xml
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_marks.xml b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_marks.xml
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_marks.xml
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_marks.xml
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_missing_layer_names.xml b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_missing_layer_names.xml
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_missing_layer_names.xml
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_missing_layer_names.xml
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_render_layer_group.xml b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_render_layer_group.xml
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_render_layer_group.xml
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_render_layer_group.xml
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_render_pass_group.xml b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_render_pass_group.xml
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_render_pass_group.xml
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_render_pass_group.xml
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_scene_settings.xml b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_scene_settings.xml
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_scene_settings.xml
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_scene_settings.xml
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_start_frame.xml b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_start_frame.xml
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_start_frame.xml
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_start_frame.xml
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_workfile_metadata.xml b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_workfile_metadata.xml
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_workfile_metadata.xml
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_workfile_metadata.xml
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_workfile_project_name.xml b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_workfile_project_name.xml
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_workfile_project_name.xml
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/help/validate_workfile_project_name.xml
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/increment_workfile_version.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/increment_workfile_version.py
similarity index 95%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/increment_workfile_version.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/increment_workfile_version.py
index 5dd6110bc7..601d276b97 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/increment_workfile_version.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/increment_workfile_version.py
@@ -12,6 +12,8 @@ class IncrementWorkfileVersion(pyblish.api.ContextPlugin):
     optional = True
     hosts = ["tvpaint"]
 
+    settings_category = "tvpaint"
+
     def process(self, context):
 
         assert all(result["success"] for result in context.data["results"]), (
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_asset_name.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_asset_name.py
similarity index 96%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/validate_asset_name.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_asset_name.py
index 764c090720..8763c005dc 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_asset_name.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_asset_name.py
@@ -3,7 +3,7 @@ from ayon_core.pipeline import (
     PublishXmlValidationError,
     OptionalPyblishPluginMixin,
 )
-from ayon_core.hosts.tvpaint.api.pipeline import (
+from ayon_tvpaint.api.pipeline import (
     list_instances,
     write_instances,
 )
@@ -48,6 +48,8 @@ class ValidateAssetName(
     hosts = ["tvpaint"]
     actions = [FixFolderPaths]
 
+    settings_category = "tvpaint"
+
     def process(self, context):
         if not self.is_active(context.data):
             return
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_duplicated_layer_names.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_duplicated_layer_names.py
similarity index 98%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/validate_duplicated_layer_names.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_duplicated_layer_names.py
index aab0557bdd..be4dc0f123 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_duplicated_layer_names.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_duplicated_layer_names.py
@@ -9,6 +9,8 @@ class ValidateLayersGroup(pyblish.api.InstancePlugin):
     order = pyblish.api.ValidatorOrder
     families = ["renderPass"]
 
+    settings_category = "tvpaint"
+
     def process(self, instance):
         # Prepare layers
         layers_by_name = instance.context.data["layersByName"]
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_layers_visibility.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_layers_visibility.py
similarity index 97%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/validate_layers_visibility.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_layers_visibility.py
index 1bcdf7baa1..f58b8a6973 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_layers_visibility.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_layers_visibility.py
@@ -10,6 +10,8 @@ class ValidateLayersVisiblity(pyblish.api.InstancePlugin):
     order = pyblish.api.ValidatorOrder
     families = ["review", "render"]
 
+    settings_category = "tvpaint"
+
     def process(self, instance):
         layers = instance.data.get("layers")
         # Instance have empty layers
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_marks.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_marks.py
similarity index 97%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/validate_marks.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_marks.py
index 6bfbe840bb..0911beb4e8 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_marks.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_marks.py
@@ -5,7 +5,7 @@ from ayon_core.pipeline import (
     PublishXmlValidationError,
     OptionalPyblishPluginMixin,
 )
-from ayon_core.hosts.tvpaint.api.lib import execute_george
+from ayon_tvpaint.api.lib import execute_george
 
 
 class ValidateMarksRepair(pyblish.api.Action):
@@ -41,6 +41,8 @@ class ValidateMarks(
     optional = True
     actions = [ValidateMarksRepair]
 
+    settings_category = "tvpaint"
+
     @staticmethod
     def get_expected_data(context):
         scene_mark_in = context.data["sceneMarkIn"]
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_missing_layer_names.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_missing_layer_names.py
similarity index 98%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/validate_missing_layer_names.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_missing_layer_names.py
index 3fc80f6e78..f340d3c10d 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_missing_layer_names.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_missing_layer_names.py
@@ -9,6 +9,8 @@ class ValidateMissingLayers(pyblish.api.InstancePlugin):
     order = pyblish.api.ValidatorOrder
     families = ["renderPass"]
 
+    settings_category = "tvpaint"
+
     def process(self, instance):
         # Prepare layers
         layers_by_name = instance.context.data["layersByName"]
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_render_layer_group.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_render_layer_group.py
similarity index 98%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/validate_render_layer_group.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_render_layer_group.py
index 0e97a01de2..b20ea3cac6 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_render_layer_group.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_render_layer_group.py
@@ -12,6 +12,8 @@ class ValidateRenderLayerGroups(pyblish.api.ContextPlugin):
     label = "Validate Render Layers Group"
     order = pyblish.api.ValidatorOrder + 0.1
 
+    settings_category = "tvpaint"
+
     def process(self, context):
         # Prepare layers
         render_layers_by_group_id = collections.defaultdict(list)
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_render_pass_group.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_render_pass_group.py
similarity index 98%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/validate_render_pass_group.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_render_pass_group.py
index 874af38dd4..3d00fd031f 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_render_pass_group.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_render_pass_group.py
@@ -13,6 +13,8 @@ class ValidateLayersGroup(pyblish.api.InstancePlugin):
     order = pyblish.api.ValidatorOrder + 0.1
     families = ["renderPass"]
 
+    settings_category = "tvpaint"
+
     def process(self, instance):
         # Prepare layers
         layers_data = instance.context.data["layersData"]
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_scene_settings.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_scene_settings.py
similarity index 98%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/validate_scene_settings.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_scene_settings.py
index 5e42b5ab2f..8bad5c43c8 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_scene_settings.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_scene_settings.py
@@ -16,6 +16,8 @@ class ValidateProjectSettings(
 
     label = "Validate Scene Settings"
     order = pyblish.api.ValidatorOrder
+
+    settings_category = "tvpaint"
     optional = True
 
     def process(self, context):
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_start_frame.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_start_frame.py
similarity index 92%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/validate_start_frame.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_start_frame.py
index fea64bd6a8..9669acf1b5 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_start_frame.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_start_frame.py
@@ -3,7 +3,7 @@ from ayon_core.pipeline import (
     PublishXmlValidationError,
     OptionalPyblishPluginMixin,
 )
-from ayon_core.hosts.tvpaint.api.lib import execute_george
+from ayon_tvpaint.api.lib import execute_george
 
 
 class RepairStartFrame(pyblish.api.Action):
@@ -27,6 +27,8 @@ class ValidateStartFrame(
     order = pyblish.api.ValidatorOrder
     hosts = ["tvpaint"]
     actions = [RepairStartFrame]
+
+    settings_category = "tvpaint"
     optional = True
 
     def process(self, context):
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_workfile_metadata.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_workfile_metadata.py
similarity index 98%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/validate_workfile_metadata.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_workfile_metadata.py
index 1d9954d051..34c02c78ed 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_workfile_metadata.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_workfile_metadata.py
@@ -31,6 +31,8 @@ class ValidateWorkfileMetadata(pyblish.api.ContextPlugin):
 
     actions = [ValidateWorkfileMetadataRepair]
 
+    settings_category = "tvpaint"
+
     required_keys = {"project_name", "folder_path", "task_name"}
 
     def process(self, context):
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_workfile_project_name.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_workfile_project_name.py
similarity index 98%
rename from client/ayon_core/hosts/tvpaint/plugins/publish/validate_workfile_project_name.py
rename to server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_workfile_project_name.py
index 5b42842717..868c7d44fc 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_workfile_project_name.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/publish/validate_workfile_project_name.py
@@ -12,6 +12,8 @@ class ValidateWorkfileProjectName(pyblish.api.ContextPlugin):
     label = "Validate Workfile Project Name"
     order = pyblish.api.ValidatorOrder
 
+    settings_category = "tvpaint"
+
     def process(self, context):
         workfile_context = context.data.get("workfile_context")
         # If workfile context is missing than project is matching to
diff --git a/client/ayon_core/hosts/tvpaint/resources/template.tvpp b/server_addon/tvpaint/client/ayon_tvpaint/resources/template.tvpp
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/resources/template.tvpp
rename to server_addon/tvpaint/client/ayon_tvpaint/resources/template.tvpp
diff --git a/client/ayon_core/hosts/tvpaint/tvpaint_plugin/__init__.py b/server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/tvpaint_plugin/__init__.py
rename to server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/__init__.py
diff --git a/client/ayon_core/hosts/tvpaint/tvpaint_plugin/plugin_code/CMakeLists.txt b/server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/plugin_code/CMakeLists.txt
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/tvpaint_plugin/plugin_code/CMakeLists.txt
rename to server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/plugin_code/CMakeLists.txt
diff --git a/client/ayon_core/hosts/tvpaint/tvpaint_plugin/plugin_code/README.md b/server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/plugin_code/README.md
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/tvpaint_plugin/plugin_code/README.md
rename to server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/plugin_code/README.md
diff --git a/client/ayon_core/hosts/tvpaint/tvpaint_plugin/plugin_code/library.cpp b/server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/plugin_code/library.cpp
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/tvpaint_plugin/plugin_code/library.cpp
rename to server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/plugin_code/library.cpp
diff --git a/client/ayon_core/hosts/tvpaint/tvpaint_plugin/plugin_code/library.def b/server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/plugin_code/library.def
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/tvpaint_plugin/plugin_code/library.def
rename to server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/plugin_code/library.def
diff --git a/client/ayon_core/hosts/tvpaint/tvpaint_plugin/plugin_files/windows_x64/plugin/OpenPypePlugin.dll b/server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/plugin_files/windows_x64/plugin/OpenPypePlugin.dll
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/tvpaint_plugin/plugin_files/windows_x64/plugin/OpenPypePlugin.dll
rename to server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/plugin_files/windows_x64/plugin/OpenPypePlugin.dll
diff --git a/client/ayon_core/hosts/tvpaint/tvpaint_plugin/plugin_files/windows_x86/plugin/OpenPypePlugin.dll b/server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/plugin_files/windows_x86/plugin/OpenPypePlugin.dll
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/tvpaint_plugin/plugin_files/windows_x86/plugin/OpenPypePlugin.dll
rename to server_addon/tvpaint/client/ayon_tvpaint/tvpaint_plugin/plugin_files/windows_x86/plugin/OpenPypePlugin.dll
diff --git a/client/ayon_core/hosts/tvpaint/worker/__init__.py b/server_addon/tvpaint/client/ayon_tvpaint/worker/__init__.py
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/worker/__init__.py
rename to server_addon/tvpaint/client/ayon_tvpaint/worker/__init__.py
diff --git a/client/ayon_core/hosts/tvpaint/worker/init_file.tvpp b/server_addon/tvpaint/client/ayon_tvpaint/worker/init_file.tvpp
similarity index 100%
rename from client/ayon_core/hosts/tvpaint/worker/init_file.tvpp
rename to server_addon/tvpaint/client/ayon_tvpaint/worker/init_file.tvpp
diff --git a/client/ayon_core/hosts/tvpaint/worker/worker.py b/server_addon/tvpaint/client/ayon_tvpaint/worker/worker.py
similarity index 97%
rename from client/ayon_core/hosts/tvpaint/worker/worker.py
rename to server_addon/tvpaint/client/ayon_tvpaint/worker/worker.py
index 3d9b1ef2b8..aa79fd442c 100644
--- a/client/ayon_core/hosts/tvpaint/worker/worker.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/worker/worker.py
@@ -5,11 +5,11 @@ import tempfile
 import shutil
 import asyncio
 
-from ayon_core.hosts.tvpaint.api.communication_server import (
+from ayon_tvpaint.api.communication_server import (
     BaseCommunicator,
     CommunicationWrapper
 )
-from openpype_modules.job_queue.job_workers import WorkerJobsConnection
+from ayon_core.modules.job_queue.job_workers import WorkerJobsConnection
 
 from .worker_job import ProcessTVPaintCommands
 
diff --git a/client/ayon_core/hosts/tvpaint/worker/worker_job.py b/server_addon/tvpaint/client/ayon_tvpaint/worker/worker_job.py
similarity index 99%
rename from client/ayon_core/hosts/tvpaint/worker/worker_job.py
rename to server_addon/tvpaint/client/ayon_tvpaint/worker/worker_job.py
index f111ed369a..db91010c47 100644
--- a/client/ayon_core/hosts/tvpaint/worker/worker_job.py
+++ b/server_addon/tvpaint/client/ayon_tvpaint/worker/worker_job.py
@@ -256,7 +256,7 @@ class CollectSceneData(BaseCommand):
     name = "collect_scene_data"
 
     def execute(self):
-        from ayon_core.hosts.tvpaint.api.lib import (
+        from ayon_tvpaint.api.lib import (
             get_layers_data,
             get_groups_data,
             get_layers_pre_post_behavior,
diff --git a/server_addon/tvpaint/package.py b/server_addon/tvpaint/package.py
index 2be3164f4a..3ab35f727e 100644
--- a/server_addon/tvpaint/package.py
+++ b/server_addon/tvpaint/package.py
@@ -1,3 +1,9 @@
 name = "tvpaint"
 title = "TVPaint"
-version = "0.1.2"
+version = "0.2.0"
+client_dir = "ayon_tvpaint"
+
+ayon_required_addons = {
+    "core": ">0.3.2",
+}
+ayon_compatible_addons = {}