diff --git a/openpype/plugins/publish/collect_anatomy_context_data.py b/openpype/plugins/publish/collect_anatomy_context_data.py
index 5b955a0592..f121760e27 100644
--- a/openpype/plugins/publish/collect_anatomy_context_data.py
+++ b/openpype/plugins/publish/collect_anatomy_context_data.py
@@ -65,12 +65,19 @@ class CollectAnatomyContextData(pyblish.api.ContextPlugin):
             "username": context.data["user"]
         }
 
-        app_manager = ApplicationManager()
-        app_name = os.environ.get("AVALON_APP_NAME")
-        if app_name:
-            app = app_manager.applications.get(app_name)
-            if app:
-                context_data["app"] = app.host_name
+        # 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")
+        if not host_name:
+            app_manager = ApplicationManager()
+            app_name = os.environ.get("AVALON_APP_NAME")
+            if app_name:
+                app = app_manager.applications.get(app_name)
+                if app:
+                    host_name = app.host_name
+                    os.environ["AVALON_APP"] = host_name
+        context_data["app"] = host_name
 
         datetime_data = context.data.get("datetimeData") or {}
         context_data.update(datetime_data)