diff --git a/server_addon/houdini/client/ayon_houdini/api/pipeline.py b/server_addon/houdini/client/ayon_houdini/api/pipeline.py
index 6af4993d25..22a15605c7 100644
--- a/server_addon/houdini/client/ayon_houdini/api/pipeline.py
+++ b/server_addon/houdini/client/ayon_houdini/api/pipeline.py
@@ -6,7 +6,7 @@ import logging
 import hou  # noqa
 
 from ayon_core.host import HostBase, IWorkfileHost, ILoadHost, IPublishHost
-
+from ayon_core.tools.utils import host_tools
 import pyblish.api
 
 from ayon_core.pipeline import (
@@ -23,6 +23,7 @@ from ayon_houdini.api import lib, shelves, creator_node_shelves
 from ayon_core.lib import (
     register_event_callback,
     emit_event,
+    env_value_to_bool,
 )
 
 
@@ -85,10 +86,9 @@ class HoudiniHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost):
             # initialization during start up delays Houdini UI by minutes
             # making it extremely slow to launch.
             hdefereval.executeDeferred(shelves.generate_shelves)
-
-        if not IS_HEADLESS:
-            import hdefereval # noqa, hdefereval is only available in ui mode
             hdefereval.executeDeferred(creator_node_shelves.install)
+            if env_value_to_bool("AYON_WORKFILE_TOOL_ON_START"):
+                hdefereval.executeDeferred(lambda: host_tools.show_workfiles(parent=hou.qt.mainWindow()))
 
     def workfile_has_unsaved_changes(self):
         return hou.hipFile.hasUnsavedChanges()
diff --git a/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_frames.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_frames.py
index 5b85023123..01dd5fdf05 100644
--- a/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_frames.py
+++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_frames.py
@@ -15,8 +15,8 @@ class CollectFrames(plugin.HoudiniInstancePlugin):
     # this plugin runs after CollectRopFrameRange
     order = pyblish.api.CollectorOrder + 0.1
     label = "Collect Frames"
-    families = ["vdbcache", "imagesequence", "ass",
-                "redshiftproxy", "review", "pointcache"]
+    families = ["camera", "vdbcache", "imagesequence", "ass",
+                "redshiftproxy", "review", "pointcache", "fbx"]
 
     def process(self, instance):
 
@@ -59,7 +59,10 @@ class CollectFrames(plugin.HoudiniInstancePlugin):
 
         # todo: `frames` currently conflicts with "explicit frames" for a
         #       for a custom frame list. So this should be refactored.
-        instance.data.update({"frames": result})
+        instance.data.update({
+            "frames": result,
+            "stagingDir": os.path.dirname(output)
+        })
 
     @staticmethod
     def create_file_list(match, start_frame, end_frame):
diff --git a/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_alembic.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_alembic.py
deleted file mode 100644
index e82f07284a..0000000000
--- a/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_alembic.py
+++ /dev/null
@@ -1,51 +0,0 @@
-import os
-import hou
-
-import pyblish.api
-
-from ayon_houdini.api import plugin
-from ayon_houdini.api.lib import render_rop
-
-
-class ExtractAlembic(plugin.HoudiniExtractorPlugin):
-
-    order = pyblish.api.ExtractorOrder
-    label = "Extract Alembic"
-    families = ["abc", "camera"]
-    targets = ["local", "remote"]
-
-    def process(self, instance):
-        if instance.data.get("farm"):
-            self.log.debug("Should be processed on farm, skipping.")
-            return
-
-        ropnode = hou.node(instance.data["instance_node"])
-
-        # Get the filename from the filename parameter
-        output = ropnode.evalParm("filename")
-        staging_dir = os.path.dirname(output)
-        instance.data["stagingDir"] = staging_dir
-
-        if instance.data.get("frames"):
-            # list of files
-            files = instance.data["frames"]
-        else:
-            # single file
-            files = os.path.basename(output)
-
-        # We run the render
-        self.log.info("Writing alembic '%s' to '%s'" % (files,
-                                                        staging_dir))
-
-        render_rop(ropnode)
-
-        if "representations" not in instance.data:
-            instance.data["representations"] = []
-
-        representation = {
-            'name': 'abc',
-            'ext': 'abc',
-            'files': files,
-            "stagingDir": staging_dir,
-        }
-        instance.data["representations"].append(representation)
diff --git a/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_ass.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_ass.py
deleted file mode 100644
index a796bbf4b3..0000000000
--- a/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_ass.py
+++ /dev/null
@@ -1,63 +0,0 @@
-import os
-import hou
-
-import pyblish.api
-
-from ayon_houdini.api import plugin
-from ayon_houdini.api.lib import render_rop
-
-
-class ExtractAss(plugin.HoudiniExtractorPlugin):
-
-    order = pyblish.api.ExtractorOrder + 0.1
-    label = "Extract Ass"
-    families = ["ass"]
-    targets = ["local", "remote"]
-
-    def process(self, instance):
-        if instance.data.get("farm"):
-            self.log.debug("Should be processed on farm, skipping.")
-            return
-        ropnode = hou.node(instance.data["instance_node"])
-
-        # Get the filename from the filename parameter
-        # `.evalParm(parameter)` will make sure all tokens are resolved
-        output = ropnode.evalParm("ar_ass_file")
-        staging_dir = os.path.dirname(output)
-        instance.data["stagingDir"] = staging_dir
-        file_name = os.path.basename(output)
-
-        # We run the render
-        self.log.info("Writing ASS '%s' to '%s'" % (file_name, staging_dir))
-
-        render_rop(ropnode)
-
-        # Unfortunately user interrupting the extraction does not raise an
-        # error and thus still continues to the integrator. To capture that
-        # we make sure all files exist
-        files = instance.data["frames"]
-        missing = []
-        for file_name in files:
-            full_path = os.path.normpath(os.path.join(staging_dir, file_name))
-            if not os.path.exists(full_path):
-                missing.append(full_path)
-
-        if missing:
-            raise RuntimeError("Failed to complete Arnold ass extraction. "
-                               "Missing output files: {}".format(missing))
-
-        if "representations" not in instance.data:
-            instance.data["representations"] = []
-
-        # Allow ass.gz extension as well
-        ext = "ass.gz" if file_name.endswith(".ass.gz") else "ass"
-
-        representation = {
-            'name': 'ass',
-            'ext': ext,
-            "files": files,
-            "stagingDir": staging_dir,
-            "frameStart": instance.data["frameStartHandle"],
-            "frameEnd": instance.data["frameEndHandle"],
-        }
-        instance.data["representations"].append(representation)
diff --git a/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_bgeo.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_bgeo.py
deleted file mode 100644
index ab8837065d..0000000000
--- a/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_bgeo.py
+++ /dev/null
@@ -1,51 +0,0 @@
-import os
-import hou
-
-import pyblish.api
-
-from ayon_houdini.api import lib, plugin
-
-
-class ExtractBGEO(plugin.HoudiniExtractorPlugin):
-
-    order = pyblish.api.ExtractorOrder
-    label = "Extract BGEO"
-    families = ["bgeo"]
-
-    def process(self, instance):
-        if instance.data.get("farm"):
-            self.log.debug("Should be processed on farm, skipping.")
-            return
-        ropnode = hou.node(instance.data["instance_node"])
-
-        # Get the filename from the filename parameter
-        output = ropnode.evalParm("sopoutput")
-        staging_dir, file_name = os.path.split(output)
-        instance.data["stagingDir"] = staging_dir
-
-        # We run the render
-        self.log.info("Writing bgeo files '{}' to '{}'.".format(
-            file_name, staging_dir))
-
-        # write files
-        lib.render_rop(ropnode)
-
-        output = instance.data["frames"]
-
-        _, ext = lib.splitext(
-            output[0], allowed_multidot_extensions=[
-                ".ass.gz", ".bgeo.sc", ".bgeo.gz",
-                ".bgeo.lzma", ".bgeo.bz2"])
-
-        if "representations" not in instance.data:
-            instance.data["representations"] = []
-
-        representation = {
-            "name": "bgeo",
-            "ext": ext.lstrip("."),
-            "files": output,
-            "stagingDir": staging_dir,
-            "frameStart": instance.data["frameStartHandle"],
-            "frameEnd": instance.data["frameEndHandle"]
-        }
-        instance.data["representations"].append(representation)
diff --git a/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_composite.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_composite.py
deleted file mode 100644
index cab462aef6..0000000000
--- a/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_composite.py
+++ /dev/null
@@ -1,58 +0,0 @@
-import os
-import hou
-import pyblish.api
-
-from ayon_core.pipeline import publish
-from ayon_houdini.api import plugin
-from ayon_houdini.api.lib import render_rop, splitext
-
-
-class ExtractComposite(plugin.HoudiniExtractorPlugin,
-                       publish.ColormanagedPyblishPluginMixin):
-
-    order = pyblish.api.ExtractorOrder
-    label = "Extract Composite (Image Sequence)"
-    families = ["imagesequence"]
-
-    def process(self, instance):
-
-        ropnode = hou.node(instance.data["instance_node"])
-
-        # Get the filename from the copoutput parameter
-        # `.evalParm(parameter)` will make sure all tokens are resolved
-        output = ropnode.evalParm("copoutput")
-        staging_dir = os.path.dirname(output)
-        instance.data["stagingDir"] = staging_dir
-        file_name = os.path.basename(output)
-
-        self.log.info("Writing comp '%s' to '%s'" % (file_name, staging_dir))
-
-        render_rop(ropnode)
-
-        output = instance.data["frames"]
-        _, ext = splitext(output[0], [])
-        ext = ext.lstrip(".")
-
-        if "representations" not in instance.data:
-            instance.data["representations"] = []
-
-        representation = {
-            "name": ext,
-            "ext": ext,
-            "files": output,
-            "stagingDir": staging_dir,
-            "frameStart": instance.data["frameStartHandle"],
-            "frameEnd": instance.data["frameEndHandle"],
-        }
-
-        if ext.lower() == "exr":
-            # Inject colorspace with 'scene_linear' as that's the
-            # default Houdini working colorspace and all extracted
-            # OpenEXR images should be in that colorspace.
-            # https://www.sidefx.com/docs/houdini/render/linear.html#image-formats
-            self.set_representation_colorspace(
-                representation, instance.context,
-                colorspace="scene_linear"
-            )
-
-        instance.data["representations"].append(representation)
diff --git a/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_fbx.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_fbx.py
deleted file mode 100644
index 49b3fa07ca..0000000000
--- a/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_fbx.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Fbx Extractor for houdini. """
-
-import os
-import hou
-import pyblish.api
-from ayon_houdini.api import plugin
-from ayon_houdini.api.lib import render_rop
-
-
-class ExtractFBX(plugin.HoudiniExtractorPlugin):
-
-    label = "Extract FBX"
-    families = ["fbx"]
-
-    order = pyblish.api.ExtractorOrder + 0.1
-
-    def process(self, instance):
-
-        # get rop node
-        ropnode = hou.node(instance.data.get("instance_node"))
-        output_file = ropnode.evalParm("sopoutput")
-
-        # get staging_dir and file_name
-        staging_dir = os.path.normpath(os.path.dirname(output_file))
-        file_name = os.path.basename(output_file)
-
-        # render rop
-        self.log.debug("Writing FBX '%s' to '%s'", file_name, staging_dir)
-        render_rop(ropnode)
-
-        # prepare representation
-        representation = {
-            "name": "fbx",
-            "ext": "fbx",
-            "files": file_name,
-            "stagingDir": staging_dir
-        }
-
-        # A single frame may also be rendered without start/end frame.
-        if "frameStartHandle" in instance.data and "frameEndHandle" in instance.data:  # noqa
-            representation["frameStart"] = instance.data["frameStartHandle"]
-            representation["frameEnd"] = instance.data["frameEndHandle"]
-
-        # set value type for 'representations' key to list
-        if "representations" not in instance.data:
-            instance.data["representations"] = []
-
-        # update instance data
-        instance.data["stagingDir"] = staging_dir
-        instance.data["representations"].append(representation)
diff --git a/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_opengl.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_opengl.py
deleted file mode 100644
index bee1bf871f..0000000000
--- a/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_opengl.py
+++ /dev/null
@@ -1,69 +0,0 @@
-import os
-import hou
-
-import pyblish.api
-
-from ayon_core.pipeline import publish
-from ayon_houdini.api import plugin
-from ayon_houdini.api.lib import render_rop
-
-
-class ExtractOpenGL(plugin.HoudiniExtractorPlugin,
-                    publish.ColormanagedPyblishPluginMixin):
-
-    order = pyblish.api.ExtractorOrder - 0.01
-    label = "Extract OpenGL"
-    families = ["review"]
-
-    def process(self, instance):
-        ropnode = hou.node(instance.data.get("instance_node"))
-
-        # This plugin is triggered when marking render as reviewable.
-        # Therefore, this plugin will run on over wrong instances.
-        # TODO: Don't run this plugin on wrong instances.
-        # This plugin should run only on review product type
-        # with instance node of opengl type.
-        if ropnode.type().name() != "opengl":
-            self.log.debug("Skipping OpenGl extraction. Rop node {} "
-                           "is not an OpenGl node.".format(ropnode.path()))
-            return
-
-        output = ropnode.evalParm("picture")
-        staging_dir = os.path.normpath(os.path.dirname(output))
-        instance.data["stagingDir"] = staging_dir
-        file_name = os.path.basename(output)
-
-        self.log.info("Extracting '%s' to '%s'" % (file_name,
-                                                   staging_dir))
-
-        render_rop(ropnode)
-
-        output = instance.data["frames"]
-
-        tags = ["review"]
-        if not instance.data.get("keepImages"):
-            tags.append("delete")
-
-        representation = {
-            "name": instance.data["imageFormat"],
-            "ext": instance.data["imageFormat"],
-            "files": output,
-            "stagingDir": staging_dir,
-            "frameStart": instance.data["frameStartHandle"],
-            "frameEnd": instance.data["frameEndHandle"],
-            "tags": tags,
-            "preview": True,
-            "camera_name": instance.data.get("review_camera")
-        }
-
-        if ropnode.evalParm("colorcorrect") == 2:  # OpenColorIO enabled
-            colorspace = ropnode.evalParm("ociocolorspace")
-            # inject colorspace data
-            self.set_representation_colorspace(
-                representation, instance.context,
-                colorspace=colorspace
-            )
-
-        if "representations" not in instance.data:
-            instance.data["representations"] = []
-        instance.data["representations"].append(representation)
diff --git a/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_redshift_proxy.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_redshift_proxy.py
deleted file mode 100644
index 3e8a79df00..0000000000
--- a/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_redshift_proxy.py
+++ /dev/null
@@ -1,52 +0,0 @@
-import os
-import hou
-
-import pyblish.api
-
-from ayon_houdini.api import plugin
-from ayon_houdini.api.lib import render_rop
-
-
-class ExtractRedshiftProxy(plugin.HoudiniExtractorPlugin):
-
-    order = pyblish.api.ExtractorOrder + 0.1
-    label = "Extract Redshift Proxy"
-    families = ["redshiftproxy"]
-    targets = ["local", "remote"]
-
-    def process(self, instance):
-        if instance.data.get("farm"):
-            self.log.debug("Should be processed on farm, skipping.")
-            return
-        ropnode = hou.node(instance.data.get("instance_node"))
-
-        # Get the filename from the filename parameter
-        # `.evalParm(parameter)` will make sure all tokens are resolved
-        output = ropnode.evalParm("RS_archive_file")
-        staging_dir = os.path.normpath(os.path.dirname(output))
-        instance.data["stagingDir"] = staging_dir
-        file_name = os.path.basename(output)
-
-        self.log.info("Writing Redshift Proxy '%s' to '%s'" % (file_name,
-                                                               staging_dir))
-
-        render_rop(ropnode)
-
-        output = instance.data["frames"]
-
-        if "representations" not in instance.data:
-            instance.data["representations"] = []
-
-        representation = {
-            "name": "rs",
-            "ext": "rs",
-            "files": output,
-            "stagingDir": staging_dir,
-        }
-
-        # A single frame may also be rendered without start/end frame.
-        if "frameStartHandle" in instance.data and "frameEndHandle" in instance.data:  # noqa
-            representation["frameStart"] = instance.data["frameStartHandle"]
-            representation["frameEnd"] = instance.data["frameEndHandle"]
-
-        instance.data["representations"].append(representation)
diff --git a/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_rop.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_rop.py
new file mode 100644
index 0000000000..62a38c0b93
--- /dev/null
+++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_rop.py
@@ -0,0 +1,150 @@
+import os
+import hou
+
+import pyblish.api
+
+from ayon_core.pipeline import publish
+from ayon_houdini.api import plugin
+from ayon_houdini.api.lib import render_rop, splitext
+
+
+class ExtractROP(plugin.HoudiniExtractorPlugin):
+    """Generic Extractor for any ROP node."""
+    label = "Extract ROP"
+    order = pyblish.api.ExtractorOrder
+
+    families = ["abc", "camera", "bgeo", "pointcache", "fbx",
+                "vdbcache", "ass", "redshiftproxy", "mantraifd"]
+    targets = ["local", "remote"]
+
+    def process(self, instance: pyblish.api.Instance):
+        if instance.data.get("farm"):
+            self.log.debug("Should be processed on farm, skipping.")
+            return
+
+        rop_node = hou.node(instance.data["instance_node"])
+
+        files = instance.data["frames"]
+        first_file = files[0] if isinstance(files, (list, tuple)) else files
+        _, ext = splitext(
+            first_file, allowed_multidot_extensions=[
+                ".ass.gz", ".bgeo.sc", ".bgeo.gz",
+                ".bgeo.lzma", ".bgeo.bz2"]
+        )
+        ext = ext.lstrip(".")
+
+        self.log.debug(f"Rendering {rop_node.path()} to {first_file}..")
+
+        render_rop(rop_node)
+        self.validate_expected_frames(instance)
+
+        # In some cases representation name is not the the extension
+        # TODO: Preferably we remove this very specific naming
+        product_type = instance.data["productType"]
+        name = {
+            "bgeo": "bgeo",
+            "rs": "rs",
+            "ass": "ass"
+        }.get(product_type, ext)
+
+        representation = {
+            "name": name,
+            "ext": ext,
+            "files": instance.data["frames"],
+            "stagingDir": instance.data["stagingDir"],
+            "frameStart": instance.data["frameStartHandle"],
+            "frameEnd": instance.data["frameEndHandle"],
+        }
+        self.update_representation_data(instance, representation)
+        instance.data.setdefault("representations", []).append(representation)
+
+    def validate_expected_frames(self, instance: pyblish.api.Instance):
+        """
+        Validate all expected files in `instance.data["frames"]` exist in
+        the staging directory.
+        """
+        filenames = instance.data["frames"]
+        staging_dir = instance.data["stagingDir"]
+        if isinstance(filenames, str):
+            # Single frame
+            filenames = [filenames]
+
+        missing_filenames = [
+            filename for filename in filenames
+            if not os.path.isfile(os.path.join(staging_dir, filename))
+        ]
+        if missing_filenames:
+            raise RuntimeError(f"Missing frames: {missing_filenames}")
+
+    def update_representation_data(self,
+                                   instance: pyblish.api.Instance,
+                                   representation: dict):
+        """Allow subclass to override the representation data in-place"""
+        pass
+
+
+class ExtractOpenGL(ExtractROP,
+                    publish.ColormanagedPyblishPluginMixin):
+
+    order = pyblish.api.ExtractorOrder - 0.01
+    label = "Extract OpenGL"
+    families = ["review"]
+
+    def process(self, instance):
+        # This plugin is triggered when marking render as reviewable.
+        # Therefore, this plugin will run over wrong instances.
+        # TODO: Don't run this plugin on wrong instances.
+        # This plugin should run only on review product type
+        # with instance node of opengl type.
+        instance_node = instance.data.get("instance_node")
+        if not instance_node:
+            self.log.debug("Skipping instance without instance node.")
+            return
+
+        rop_node = hou.node(instance_node)
+        if rop_node.type().name() != "opengl":
+            self.log.debug("Skipping OpenGl extraction. Rop node {} "
+                           "is not an OpenGl node.".format(rop_node.path()))
+            return
+
+        super(ExtractOpenGL, self).process(instance)
+
+    def update_representation_data(self,
+                                   instance: pyblish.api.Instance,
+                                   representation: dict):
+        tags = ["review"]
+        if not instance.data.get("keepImages"):
+            tags.append("delete")
+
+        representation.update({
+            # TODO: Avoid this override?
+            "name": instance.data["imageFormat"],
+            "ext": instance.data["imageFormat"],
+
+            "tags": tags,
+            "preview": True,
+            "camera_name": instance.data.get("review_camera")
+        })
+
+
+class ExtractComposite(ExtractROP,
+                       publish.ColormanagedPyblishPluginMixin):
+
+    label = "Extract Composite (Image Sequence)"
+    families = ["imagesequence"]
+
+    def update_representation_data(self,
+                                   instance: pyblish.api.Instance,
+                                   representation: dict):
+
+        if representation["ext"].lower() != "exr":
+            return
+
+        # Inject colorspace with 'scene_linear' as that's the
+        # default Houdini working colorspace and all extracted
+        # OpenEXR images should be in that colorspace.
+        # https://www.sidefx.com/docs/houdini/render/linear.html#image-formats
+        self.set_representation_colorspace(
+            representation, instance.context,
+            colorspace="scene_linear"
+        )
diff --git a/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_vdb_cache.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_vdb_cache.py
deleted file mode 100644
index a944d81e9b..0000000000
--- a/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_vdb_cache.py
+++ /dev/null
@@ -1,46 +0,0 @@
-import os
-import hou
-
-import pyblish.api
-
-from ayon_houdini.api import plugin
-from ayon_houdini.api.lib import render_rop
-
-
-class ExtractVDBCache(plugin.HoudiniExtractorPlugin):
-
-    order = pyblish.api.ExtractorOrder + 0.1
-    label = "Extract VDB Cache"
-    families = ["vdbcache"]
-
-    def process(self, instance):
-        if instance.data.get("farm"):
-            self.log.debug("Should be processed on farm, skipping.")
-            return
-        ropnode = hou.node(instance.data["instance_node"])
-
-        # Get the filename from the filename parameter
-        # `.evalParm(parameter)` will make sure all tokens are resolved
-        sop_output = ropnode.evalParm("sopoutput")
-        staging_dir = os.path.normpath(os.path.dirname(sop_output))
-        instance.data["stagingDir"] = staging_dir
-        file_name = os.path.basename(sop_output)
-
-        self.log.info("Writing VDB '%s' to '%s'" % (file_name, staging_dir))
-
-        render_rop(ropnode)
-
-        output = instance.data["frames"]
-
-        if "representations" not in instance.data:
-            instance.data["representations"] = []
-
-        representation = {
-            "name": "vdb",
-            "ext": "vdb",
-            "files": output,
-            "stagingDir": staging_dir,
-            "frameStart": instance.data["frameStartHandle"],
-            "frameEnd": instance.data["frameEndHandle"],
-        }
-        instance.data["representations"].append(representation)
diff --git a/server_addon/maya/client/ayon_maya/api/lib.py b/server_addon/maya/client/ayon_maya/api/lib.py
index 3b351ec1f0..0242dafc0b 100644
--- a/server_addon/maya/client/ayon_maya/api/lib.py
+++ b/server_addon/maya/client/ayon_maya/api/lib.py
@@ -1733,7 +1733,7 @@ def is_valid_reference_node(reference_node):
     """
     # maya 2022 is missing `isValidReference` so the check needs to be
     # done in different way.
-    if cmds.about(version=True) < 2023:
+    if int(cmds.about(version=True)) < 2023:
         try:
             cmds.referenceQuery(reference_node, filename=True)
             return True
diff --git a/server_addon/maya/client/ayon_maya/version.py b/server_addon/maya/client/ayon_maya/version.py
index 37f9026945..df66e3f399 100644
--- a/server_addon/maya/client/ayon_maya/version.py
+++ b/server_addon/maya/client/ayon_maya/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring AYON addon 'maya' version."""
-__version__ = "0.2.4"
+__version__ = "0.2.5"
diff --git a/server_addon/maya/package.py b/server_addon/maya/package.py
index 17614ed9c1..3dd863a1b3 100644
--- a/server_addon/maya/package.py
+++ b/server_addon/maya/package.py
@@ -1,6 +1,6 @@
 name = "maya"
 title = "Maya"
-version = "0.2.4"
+version = "0.2.5"
 client_dir = "ayon_maya"
 
 ayon_required_addons = {