diff --git a/client/ayon_deadline/addon.py b/client/ayon_deadline/addon.py
index 87fc2ad665..3af92dffeb 100644
--- a/client/ayon_deadline/addon.py
+++ b/client/ayon_deadline/addon.py
@@ -10,6 +10,9 @@
 from .version import __version__
 
 
+DEADLINE_ADDON_ROOT = os.path.dirname(os.path.abspath(__file__))
+
+
 class DeadlineWebserviceError(Exception):
     """
     Exception to throw when connection to Deadline server fails.
@@ -37,10 +40,18 @@ def initialize(self, studio_settings):
 
     def get_plugin_paths(self):
         """Deadline plugin paths."""
-        current_dir = os.path.dirname(os.path.abspath(__file__))
-        return {
-            "publish": [os.path.join(current_dir, "plugins", "publish")]
-        }
+        # Note: We are not returning `publish` key because we have overridden
+        # `get_publish_plugin_paths` to return paths host-specific. However,
+        # `get_plugin_paths` still needs to be implemented because it's
+        # abstract on the parent class
+        return {}
+    
+    def get_publish_plugin_paths(self, host_name=None):
+        publish_dir = os.path.join(DEADLINE_ADDON_ROOT, "plugins", "publish")
+        paths = [os.path.join(publish_dir, "global")]
+        if host_name:
+            paths.append(os.path.join(publish_dir, host_name))
+        return paths
 
     @staticmethod
     def get_deadline_pools(webservice, auth=None, log=None):
diff --git a/client/ayon_deadline/plugins/publish/submit_aftereffects_deadline.py b/client/ayon_deadline/plugins/publish/aftereffects/submit_aftereffects_deadline.py
similarity index 100%
rename from client/ayon_deadline/plugins/publish/submit_aftereffects_deadline.py
rename to client/ayon_deadline/plugins/publish/aftereffects/submit_aftereffects_deadline.py
diff --git a/client/ayon_deadline/plugins/publish/submit_blender_deadline.py b/client/ayon_deadline/plugins/publish/blender/submit_blender_deadline.py
similarity index 100%
rename from client/ayon_deadline/plugins/publish/submit_blender_deadline.py
rename to client/ayon_deadline/plugins/publish/blender/submit_blender_deadline.py
diff --git a/client/ayon_deadline/plugins/publish/submit_celaction_deadline.py b/client/ayon_deadline/plugins/publish/celaction/submit_celaction_deadline.py
similarity index 100%
rename from client/ayon_deadline/plugins/publish/submit_celaction_deadline.py
rename to client/ayon_deadline/plugins/publish/celaction/submit_celaction_deadline.py
diff --git a/client/ayon_deadline/plugins/publish/submit_fusion_deadline.py b/client/ayon_deadline/plugins/publish/fusion/submit_fusion_deadline.py
similarity index 100%
rename from client/ayon_deadline/plugins/publish/submit_fusion_deadline.py
rename to client/ayon_deadline/plugins/publish/fusion/submit_fusion_deadline.py
diff --git a/client/ayon_deadline/plugins/publish/collect_deadline_server_from_instance.py b/client/ayon_deadline/plugins/publish/global/collect_deadline_server_from_instance.py
similarity index 100%
rename from client/ayon_deadline/plugins/publish/collect_deadline_server_from_instance.py
rename to client/ayon_deadline/plugins/publish/global/collect_deadline_server_from_instance.py
diff --git a/client/ayon_deadline/plugins/publish/collect_default_deadline_server.py b/client/ayon_deadline/plugins/publish/global/collect_default_deadline_server.py
similarity index 100%
rename from client/ayon_deadline/plugins/publish/collect_default_deadline_server.py
rename to client/ayon_deadline/plugins/publish/global/collect_default_deadline_server.py
diff --git a/client/ayon_deadline/plugins/publish/collect_pools.py b/client/ayon_deadline/plugins/publish/global/collect_pools.py
similarity index 100%
rename from client/ayon_deadline/plugins/publish/collect_pools.py
rename to client/ayon_deadline/plugins/publish/global/collect_pools.py
diff --git a/client/ayon_deadline/plugins/publish/collect_user_credentials.py b/client/ayon_deadline/plugins/publish/global/collect_user_credentials.py
similarity index 100%
rename from client/ayon_deadline/plugins/publish/collect_user_credentials.py
rename to client/ayon_deadline/plugins/publish/global/collect_user_credentials.py
diff --git a/client/ayon_deadline/plugins/publish/help/validate_deadline_connection.xml b/client/ayon_deadline/plugins/publish/global/help/validate_deadline_connection.xml
similarity index 100%
rename from client/ayon_deadline/plugins/publish/help/validate_deadline_connection.xml
rename to client/ayon_deadline/plugins/publish/global/help/validate_deadline_connection.xml
diff --git a/client/ayon_deadline/plugins/publish/help/validate_deadline_pools.xml b/client/ayon_deadline/plugins/publish/global/help/validate_deadline_pools.xml
similarity index 100%
rename from client/ayon_deadline/plugins/publish/help/validate_deadline_pools.xml
rename to client/ayon_deadline/plugins/publish/global/help/validate_deadline_pools.xml
diff --git a/client/ayon_deadline/plugins/publish/submit_publish_cache_job.py b/client/ayon_deadline/plugins/publish/global/submit_publish_cache_job.py
similarity index 100%
rename from client/ayon_deadline/plugins/publish/submit_publish_cache_job.py
rename to client/ayon_deadline/plugins/publish/global/submit_publish_cache_job.py
diff --git a/client/ayon_deadline/plugins/publish/submit_publish_job.py b/client/ayon_deadline/plugins/publish/global/submit_publish_job.py
similarity index 100%
rename from client/ayon_deadline/plugins/publish/submit_publish_job.py
rename to client/ayon_deadline/plugins/publish/global/submit_publish_job.py
diff --git a/client/ayon_deadline/plugins/publish/validate_deadline_connection.py b/client/ayon_deadline/plugins/publish/global/validate_deadline_connection.py
similarity index 100%
rename from client/ayon_deadline/plugins/publish/validate_deadline_connection.py
rename to client/ayon_deadline/plugins/publish/global/validate_deadline_connection.py
diff --git a/client/ayon_deadline/plugins/publish/validate_deadline_pools.py b/client/ayon_deadline/plugins/publish/global/validate_deadline_pools.py
similarity index 100%
rename from client/ayon_deadline/plugins/publish/validate_deadline_pools.py
rename to client/ayon_deadline/plugins/publish/global/validate_deadline_pools.py
diff --git a/client/ayon_deadline/plugins/publish/validate_expected_and_rendered_files.py b/client/ayon_deadline/plugins/publish/global/validate_expected_and_rendered_files.py
similarity index 100%
rename from client/ayon_deadline/plugins/publish/validate_expected_and_rendered_files.py
rename to client/ayon_deadline/plugins/publish/global/validate_expected_and_rendered_files.py
diff --git a/client/ayon_deadline/plugins/publish/submit_harmony_deadline.py b/client/ayon_deadline/plugins/publish/harmony/submit_harmony_deadline.py
similarity index 100%
rename from client/ayon_deadline/plugins/publish/submit_harmony_deadline.py
rename to client/ayon_deadline/plugins/publish/harmony/submit_harmony_deadline.py
diff --git a/client/ayon_deadline/plugins/publish/submit_houdini_cache_deadline.py b/client/ayon_deadline/plugins/publish/houdini/submit_houdini_cache_deadline.py
similarity index 100%
rename from client/ayon_deadline/plugins/publish/submit_houdini_cache_deadline.py
rename to client/ayon_deadline/plugins/publish/houdini/submit_houdini_cache_deadline.py
diff --git a/client/ayon_deadline/plugins/publish/submit_houdini_render_deadline.py b/client/ayon_deadline/plugins/publish/houdini/submit_houdini_render_deadline.py
similarity index 99%
rename from client/ayon_deadline/plugins/publish/submit_houdini_render_deadline.py
rename to client/ayon_deadline/plugins/publish/houdini/submit_houdini_render_deadline.py
index 1b76ee2e5e..fd2827482a 100644
--- a/client/ayon_deadline/plugins/publish/submit_houdini_render_deadline.py
+++ b/client/ayon_deadline/plugins/publish/houdini/submit_houdini_render_deadline.py
@@ -399,8 +399,10 @@ def _get_husk_standalone_plugin_info(self, instance, hou_major_minor):
 
 
 class HoudiniSubmitDeadlineUsdRender(HoudiniSubmitDeadline):
+    label = "Submit Render to Deadline (USD)"
+    families = ["usdrender"]
+
     # Do not use published workfile paths for USD Render ROP because the
     # Export Job doesn't seem to occur using the published path either, so
     # output paths then do not match the actual rendered paths
     use_published = False
-    families = ["usdrender"]
diff --git a/client/ayon_deadline/plugins/publish/submit_max_deadline.py b/client/ayon_deadline/plugins/publish/max/submit_max_deadline.py
similarity index 100%
rename from client/ayon_deadline/plugins/publish/submit_max_deadline.py
rename to client/ayon_deadline/plugins/publish/max/submit_max_deadline.py
diff --git a/client/ayon_deadline/plugins/publish/submit_maya_deadline.py b/client/ayon_deadline/plugins/publish/maya/submit_maya_deadline.py
similarity index 100%
rename from client/ayon_deadline/plugins/publish/submit_maya_deadline.py
rename to client/ayon_deadline/plugins/publish/maya/submit_maya_deadline.py
diff --git a/client/ayon_deadline/plugins/publish/submit_nuke_deadline.py b/client/ayon_deadline/plugins/publish/nuke/submit_nuke_deadline.py
similarity index 100%
rename from client/ayon_deadline/plugins/publish/submit_nuke_deadline.py
rename to client/ayon_deadline/plugins/publish/nuke/submit_nuke_deadline.py