diff --git a/openpype/hosts/standalonepublisher/plugins/publish/collect_app_name.py b/openpype/hosts/standalonepublisher/plugins/publish/collect_app_name.py
new file mode 100644
index 0000000000..857f3dca20
--- /dev/null
+++ b/openpype/hosts/standalonepublisher/plugins/publish/collect_app_name.py
@@ -0,0 +1,13 @@
+import pyblish.api
+
+
+class CollectSAAppName(pyblish.api.ContextPlugin):
+    """Collect app name and label."""
+
+    label = "Collect App Name/Label"
+    order = pyblish.api.CollectorOrder - 0.5
+    hosts = ["standalonepublisher"]
+
+    def process(self, context):
+        context.data["appName"] = "standalone publisher"
+        context.data["appLabel"] = "Standalone publisher"
diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_app_name.py b/openpype/hosts/traypublisher/plugins/publish/collect_app_name.py
new file mode 100644
index 0000000000..e38d10e70f
--- /dev/null
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_app_name.py
@@ -0,0 +1,13 @@
+import pyblish.api
+
+
+class CollectTrayPublisherAppName(pyblish.api.ContextPlugin):
+    """Collect app name and label."""
+
+    label = "Collect App Name/Label"
+    order = pyblish.api.CollectorOrder - 0.5
+    hosts = ["traypublisher"]
+
+    def process(self, context):
+        context.data["appName"] = "tray publisher"
+        context.data["appLabel"] = "Tray publisher"
diff --git a/openpype/plugins/publish/collect_host_name.py b/openpype/plugins/publish/collect_host_name.py
index b731e3ed26..d64af4d049 100644
--- a/openpype/plugins/publish/collect_host_name.py
+++ b/openpype/plugins/publish/collect_host_name.py
@@ -18,20 +18,30 @@ class CollectHostName(pyblish.api.ContextPlugin):
 
     def process(self, context):
         host_name = context.data.get("hostName")
+        app_name = context.data.get("appName")
+        app_label = context.data.get("appLabel")
         # Don't override value if is already set
-        if host_name:
+        if host_name and app_name and app_label:
             return
 
-        # Use AVALON_APP as first if available it is the same as host name
-        # - only if is not defined use AVALON_APP_NAME (e.g. on Farm) and
-        #   set it back to AVALON_APP env variable
-        host_name = os.environ.get("AVALON_APP")
+        # Use AVALON_APP to get host name if available
         if not host_name:
+            host_name = os.environ.get("AVALON_APP")
+
+        # Use AVALON_APP_NAME to get full app name
+        if not app_name:
             app_name = os.environ.get("AVALON_APP_NAME")
-            if app_name:
-                app_manager = ApplicationManager()
-                app = app_manager.applications.get(app_name)
-                if app:
+
+        # Fill missing values based on app full name
+        if (not host_name or not app_label) and app_name:
+            app_manager = ApplicationManager()
+            app = app_manager.applications.get(app_name)
+            if app:
+                if not host_name:
                     host_name = app.host_name
+                if not app_label:
+                    app_label = app.full_label
 
         context.data["hostName"] = host_name
+        context.data["appName"] = app_name
+        context.data["appLabel"] = app_label