From 4bb4113ac120a0f72938b6b13c8ca2a8d36f4c82 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakub@orbi.tools>
Date: Wed, 19 May 2021 16:03:37 +0200
Subject: [PATCH 1/2] Celaction: wrong avalon app

---
 pype/hosts/celaction/cli.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pype/hosts/celaction/cli.py b/pype/hosts/celaction/cli.py
index 42f7a1a3856..7813cec3f47 100644
--- a/pype/hosts/celaction/cli.py
+++ b/pype/hosts/celaction/cli.py
@@ -75,7 +75,7 @@ def _prepare_publish_environments():
     env["AVALON_WORKDIR"] = os.getenv("AVALON_WORKDIR")
     env["AVALON_HIERARCHY"] = hierarchy
     env["AVALON_PROJECTCODE"] = project_doc["data"].get("code", "")
-    env["AVALON_APP"] = f"hosts.{publish_host}"
+    env["AVALON_APP"] = publish_host
     env["AVALON_APP_NAME"] = "celaction_local"
 
     env["PYBLISH_HOSTS"] = publish_host

From b2e23135deb80d534f01992544244e3f919090f7 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakub@orbi.tools>
Date: Wed, 19 May 2021 16:04:00 +0200
Subject: [PATCH 2/2] Celaction: also label with families

---
 .../celaction/publish/collect_celaction_instances.py   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pype/plugins/celaction/publish/collect_celaction_instances.py b/pype/plugins/celaction/publish/collect_celaction_instances.py
index d3d1d264c06..cb8de136a2a 100644
--- a/pype/plugins/celaction/publish/collect_celaction_instances.py
+++ b/pype/plugins/celaction/publish/collect_celaction_instances.py
@@ -46,13 +46,14 @@ def process(self, context):
         subset = family + task.capitalize()
         # Create instance
         instance = context.create_instance(subset)
+        families = [family, "ftrack"]
 
         # creating instance data
         instance.data.update({
-            "subset": subset,
+            "subset": "{} {}".format(subset, families),
             "label": scene_file,
             "family": family,
-            "families": [family, "ftrack"],
+            "families": families,
             "representations": list()
         })
 
@@ -77,12 +78,13 @@ def process(self, context):
         instance = context.create_instance(name=subset)
         # getting instance state
         instance.data["publish"] = True
+        families = [family]
 
         # add assetEntity data into instance
         instance.data.update({
-            "label": "{} - farm".format(subset),
+            "label": "{} {}".format(subset, families),
             "family": family,
-            "families": [family],
+            "families": families,
             "subset": subset
         })