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/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 = {