diff --git a/openpype/hosts/aftereffects/api/__init__.py b/openpype/hosts/aftereffects/api/__init__.py
index 2ad1255d27..a7137ba8fb 100644
--- a/openpype/hosts/aftereffects/api/__init__.py
+++ b/openpype/hosts/aftereffects/api/__init__.py
@@ -10,30 +10,15 @@ from .launch_logic import (
 )
 
 from .pipeline import (
+    AfterEffectsHost,
     ls,
-    get_asset_settings,
-    install,
-    uninstall,
-    list_instances,
-    remove_instance,
-    containerise,
-    get_context_data,
-    update_context_data,
-    get_context_title
-)
-
-from .workio import (
-    file_extensions,
-    has_unsaved_changes,
-    save_file,
-    open_file,
-    current_file,
-    work_root,
+    containerise
 )
 
 from .lib import (
     maintained_selection,
-    get_extension_manifest_path
+    get_extension_manifest_path,
+    get_asset_settings
 )
 
 from .plugin import (
@@ -48,26 +33,12 @@ __all__ = [
 
     # pipeline
     "ls",
-    "get_asset_settings",
-    "install",
-    "uninstall",
-    "list_instances",
-    "remove_instance",
     "containerise",
-    "get_context_data",
-    "update_context_data",
-    "get_context_title",
-
-    "file_extensions",
-    "has_unsaved_changes",
-    "save_file",
-    "open_file",
-    "current_file",
-    "work_root",
 
     # lib
     "maintained_selection",
     "get_extension_manifest_path",
+    "get_asset_settings",
 
     # plugin
     "AfterEffectsLoader"
diff --git a/openpype/hosts/aftereffects/api/extension.zxp b/openpype/hosts/aftereffects/api/extension.zxp
index 0ed799991e..217d06098f 100644
Binary files a/openpype/hosts/aftereffects/api/extension.zxp and b/openpype/hosts/aftereffects/api/extension.zxp differ
diff --git a/openpype/hosts/aftereffects/api/extension/CSXS/manifest.xml b/openpype/hosts/aftereffects/api/extension/CSXS/manifest.xml
index a39f5781bb..f96e80c503 100644
--- a/openpype/hosts/aftereffects/api/extension/CSXS/manifest.xml
+++ b/openpype/hosts/aftereffects/api/extension/CSXS/manifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ExtensionManifest Version="8.0" ExtensionBundleId="com.openpype.AE.panel" ExtensionBundleVersion="1.0.23"
+<ExtensionManifest Version="8.0" ExtensionBundleId="com.openpype.AE.panel" ExtensionBundleVersion="1.0.24"
 		ExtensionBundleName="openpype" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<ExtensionList>
 		<Extension Id="com.openpype.AE.panel" Version="1.0" />
diff --git a/openpype/hosts/aftereffects/api/extension/index.html b/openpype/hosts/aftereffects/api/extension/index.html
index 9e39bf1acc..52a7c4964f 100644
--- a/openpype/hosts/aftereffects/api/extension/index.html
+++ b/openpype/hosts/aftereffects/api/extension/index.html
@@ -38,17 +38,6 @@
             });
     </script>
     
-    <script type=text/javascript>
-            $(function() {
-              $("a#creator-button").bind("click", function() {
-                RPC.call('AfterEffects.creator_route').then(function (data) {
-                }, function (error) {
-                    alert(error);
-                });
-              });
-            });
-    </script>
-    
     <script type=text/javascript>
             $(function() {
               $("a#loader-button").bind("click", function() {
@@ -82,17 +71,6 @@
             });
     </script>
     
-    <script type=text/javascript>
-            $(function() {
-              $("a#subsetmanager-button").bind("click", function() {
-                RPC.call('AfterEffects.subsetmanager_route').then(function (data) {
-                }, function (error) {
-                    alert(error);
-                });
-              });
-            });
-    </script> 
-    
     <script type=text/javascript>
             $(function() {
               $("a#experimental-button").bind("click", function() {
@@ -113,11 +91,9 @@
         
         <div>                
             <div></div><a href=# id=workfiles-button><button class="hostFontSize">Workfiles...</button></a></div>
-            <div> <a href=# id=creator-button><button class="hostFontSize">Create...</button></a></div>
             <div><a href=# id=loader-button><button class="hostFontSize">Load...</button></a></div>
             <div><a href=# id=publish-button><button class="hostFontSize">Publish...</button></a></div>
             <div><a href=# id=sceneinventory-button><button class="hostFontSize">Manage...</button></a></div>
-            <div><a href=# id=subsetmanager-button><button class="hostFontSize">Subset Manager...</button></a></div>
             <div><a href=# id=experimental-button><button class="hostFontSize">Experimental Tools...</button></a></div>
         </div>   
         
diff --git a/openpype/hosts/aftereffects/api/launch_logic.py b/openpype/hosts/aftereffects/api/launch_logic.py
index 9c8513fe8c..9dcaebd5b9 100644
--- a/openpype/hosts/aftereffects/api/launch_logic.py
+++ b/openpype/hosts/aftereffects/api/launch_logic.py
@@ -284,9 +284,6 @@ class AfterEffectsRoute(WebSocketRoute):
         return await self.socket.call('aftereffects.read')
 
     # panel routes for tools
-    async def creator_route(self):
-        self._tool_route("creator")
-
     async def workfiles_route(self):
         self._tool_route("workfiles")
 
@@ -294,14 +291,11 @@ class AfterEffectsRoute(WebSocketRoute):
         self._tool_route("loader")
 
     async def publish_route(self):
-        self._tool_route("publish")
+        self._tool_route("publisher")
 
     async def sceneinventory_route(self):
         self._tool_route("sceneinventory")
 
-    async def subsetmanager_route(self):
-        self._tool_route("subsetmanager")
-
     async def experimental_tools_route(self):
         self._tool_route("experimental_tools")
 
diff --git a/openpype/hosts/aftereffects/api/lib.py b/openpype/hosts/aftereffects/api/lib.py
index 8cdf9c407e..18b45a3ee0 100644
--- a/openpype/hosts/aftereffects/api/lib.py
+++ b/openpype/hosts/aftereffects/api/lib.py
@@ -26,9 +26,10 @@ def safe_excepthook(*args):
 def main(*subprocess_args):
     sys.excepthook = safe_excepthook
 
-    from openpype.hosts.aftereffects import api
+    from openpype.hosts.aftereffects.api import AfterEffectsHost
 
-    install_host(api)
+    host = AfterEffectsHost()
+    install_host(host)
 
     os.environ["OPENPYPE_LOG_NO_COLORS"] = "False"
     app = QtWidgets.QApplication([])
@@ -133,3 +134,32 @@ def get_background_layers(file_url):
                                                layer.get("filename")).
                                   replace("\\", "/"))
     return layers
+
+
+def get_asset_settings(asset_doc):
+    """Get settings on current asset from database.
+
+    Returns:
+        dict: Scene data.
+
+    """
+    asset_data = asset_doc["data"]
+    fps = asset_data.get("fps")
+    frame_start = asset_data.get("frameStart")
+    frame_end = asset_data.get("frameEnd")
+    handle_start = asset_data.get("handleStart")
+    handle_end = asset_data.get("handleEnd")
+    resolution_width = asset_data.get("resolutionWidth")
+    resolution_height = asset_data.get("resolutionHeight")
+    duration = (frame_end - frame_start + 1) + handle_start + handle_end
+
+    return {
+        "fps": fps,
+        "frameStart": frame_start,
+        "frameEnd": frame_end,
+        "handleStart": handle_start,
+        "handleEnd": handle_end,
+        "resolutionWidth": resolution_width,
+        "resolutionHeight": resolution_height,
+        "duration": duration
+    }
diff --git a/openpype/hosts/aftereffects/api/pipeline.py b/openpype/hosts/aftereffects/api/pipeline.py
index 7026fe3f05..3f18347d44 100644
--- a/openpype/hosts/aftereffects/api/pipeline.py
+++ b/openpype/hosts/aftereffects/api/pipeline.py
@@ -1,5 +1,4 @@
 import os
-
 from Qt import QtWidgets
 
 import pyblish.api
@@ -16,6 +15,13 @@ from openpype.pipeline import (
 from openpype.pipeline.load import any_outdated_containers
 import openpype.hosts.aftereffects
 
+from openpype.host import (
+    HostBase,
+    IWorkfileHost,
+    ILoadHost,
+    IPublishHost
+)
+
 from .launch_logic import get_stub, ConnectionNotEstablishedYet
 
 log = Logger.get_logger(__name__)
@@ -30,27 +36,142 @@ LOAD_PATH = os.path.join(PLUGINS_DIR, "load")
 CREATE_PATH = os.path.join(PLUGINS_DIR, "create")
 
 
-def install():
-    print("Installing Pype config...")
+class AfterEffectsHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost):
+    name = "aftereffects"
 
-    pyblish.api.register_host("aftereffects")
-    pyblish.api.register_plugin_path(PUBLISH_PATH)
+    def __init__(self):
+        self._stub = None
+        super(AfterEffectsHost, self).__init__()
 
-    register_loader_plugin_path(LOAD_PATH)
-    register_creator_plugin_path(CREATE_PATH)
-    log.info(PUBLISH_PATH)
+    @property
+    def stub(self):
+        """
+            Handle pulling stub from PS to run operations on host
+        Returns:
+            (AEServerStub) or None
+        """
+        if self._stub:
+            return self._stub
 
-    pyblish.api.register_callback(
-        "instanceToggled", on_pyblish_instance_toggled
-    )
+        try:
+            stub = get_stub()  # only after Photoshop is up
+        except ConnectionNotEstablishedYet:
+            print("Not connected yet, ignoring")
+            return
 
-    register_event_callback("application.launched", application_launch)
+        if not stub.get_active_document_name():
+            return
 
+        self._stub = stub
+        return self._stub
 
-def uninstall():
-    pyblish.api.deregister_plugin_path(PUBLISH_PATH)
-    deregister_loader_plugin_path(LOAD_PATH)
-    deregister_creator_plugin_path(CREATE_PATH)
+    def install(self):
+        print("Installing Pype config...")
+
+        pyblish.api.register_host("aftereffects")
+        pyblish.api.register_plugin_path(PUBLISH_PATH)
+
+        register_loader_plugin_path(LOAD_PATH)
+        register_creator_plugin_path(CREATE_PATH)
+        log.info(PUBLISH_PATH)
+
+        pyblish.api.register_callback(
+            "instanceToggled", on_pyblish_instance_toggled
+        )
+
+        register_event_callback("application.launched", application_launch)
+
+    def get_workfile_extensions(self):
+        return [".aep"]
+
+    def save_workfile(self, dst_path=None):
+        self.stub.saveAs(dst_path, True)
+
+    def open_workfile(self, filepath):
+        self.stub.open(filepath)
+
+        return True
+
+    def get_current_workfile(self):
+        try:
+            full_name = get_stub().get_active_document_full_name()
+            if full_name and full_name != "null":
+                return os.path.normpath(full_name).replace("\\", "/")
+        except ValueError:
+            print("Nothing opened")
+            pass
+
+        return None
+
+    def get_containers(self):
+        return ls()
+
+    def get_context_data(self):
+        meta = self.stub.get_metadata()
+        for item in meta:
+            if item.get("id") == "publish_context":
+                item.pop("id")
+                return item
+
+        return {}
+
+    def update_context_data(self, data, changes):
+        item = data
+        item["id"] = "publish_context"
+        self.stub.imprint(item["id"], item)
+
+    # created instances section
+    def list_instances(self):
+        """List all created instances from current workfile which
+        will be published.
+
+        Pulls from File > File Info
+
+        For SubsetManager
+
+        Returns:
+            (list) of dictionaries matching instances format
+        """
+        stub = self.stub
+        if not stub:
+            return []
+
+        instances = []
+        layers_meta = stub.get_metadata()
+
+        for instance in layers_meta:
+            if instance.get("id") == "pyblish.avalon.instance":
+                instances.append(instance)
+        return instances
+
+    def remove_instance(self, instance):
+        """Remove instance from current workfile metadata.
+
+        Updates metadata of current file in File > File Info and removes
+        icon highlight on group layer.
+
+        For SubsetManager
+
+        Args:
+            instance (dict): instance representation from subsetmanager model
+        """
+        stub = self.stub
+
+        if not stub:
+            return
+
+        inst_id = instance.get("instance_id") or instance.get("uuid")  # legacy
+        if not inst_id:
+            log.warning("No instance identifier for {}".format(instance))
+            return
+
+        stub.remove_instance(inst_id)
+
+        if instance.get("members"):
+            item = stub.get_item(instance["members"][0])
+            if item:
+                stub.rename_item(item.id,
+                                 item.name.replace(stub.PUBLISH_ICON, ''))
 
 
 def application_launch():
@@ -63,35 +184,6 @@ def on_pyblish_instance_toggled(instance, old_value, new_value):
     instance[0].Visible = new_value
 
 
-def get_asset_settings(asset_doc):
-    """Get settings on current asset from database.
-
-    Returns:
-        dict: Scene data.
-
-    """
-    asset_data = asset_doc["data"]
-    fps = asset_data.get("fps")
-    frame_start = asset_data.get("frameStart")
-    frame_end = asset_data.get("frameEnd")
-    handle_start = asset_data.get("handleStart")
-    handle_end = asset_data.get("handleEnd")
-    resolution_width = asset_data.get("resolutionWidth")
-    resolution_height = asset_data.get("resolutionHeight")
-    duration = (frame_end - frame_start + 1) + handle_start + handle_end
-
-    return {
-        "fps": fps,
-        "frameStart": frame_start,
-        "frameEnd": frame_end,
-        "handleStart": handle_start,
-        "handleEnd": handle_end,
-        "resolutionWidth": resolution_width,
-        "resolutionHeight": resolution_height,
-        "duration": duration
-    }
-
-
 def ls():
     """Yields containers from active AfterEffects document.
 
@@ -191,102 +283,17 @@ def containerise(name,
     return comp
 
 
-# created instances section
-def list_instances():
-    """
-        List all created instances from current workfile which
-        will be published.
+def cache_and_get_instances(creator):
+    """Cache instances in shared data.
 
-        Pulls from File > File Info
-
-        For SubsetManager
-
-        Returns:
-            (list) of dictionaries matching instances format
-    """
-    stub = _get_stub()
-    if not stub:
-        return []
-
-    instances = []
-    layers_meta = stub.get_metadata()
-
-    for instance in layers_meta:
-        if instance.get("id") == "pyblish.avalon.instance":
-            instances.append(instance)
-    return instances
-
-
-def remove_instance(instance):
-    """
-        Remove instance from current workfile metadata.
-
-        Updates metadata of current file in File > File Info and removes
-        icon highlight on group layer.
-
-        For SubsetManager
-
-        Args:
-            instance (dict): instance representation from subsetmanager model
-    """
-    stub = _get_stub()
-
-    if not stub:
-        return
-
-    inst_id = instance.get("instance_id") or instance.get("uuid")  # legacy
-    if not inst_id:
-        log.warning("No instance identifier for {}".format(instance))
-        return
-
-    stub.remove_instance(inst_id)
-
-    if instance.get("members"):
-        item = stub.get_item(instance["members"][0])
-        if item:
-            stub.rename_item(item.id,
-                             item.name.replace(stub.PUBLISH_ICON, ''))
-
-
-# new publisher section
-def get_context_data():
-    meta = _get_stub().get_metadata()
-    for item in meta:
-        if item.get("id") == "publish_context":
-            item.pop("id")
-            return item
-
-    return {}
-
-
-def update_context_data(data, changes):
-    item = data
-    item["id"] = "publish_context"
-    _get_stub().imprint(item["id"], item)
-
-
-def get_context_title():
-    """Returns title for Creator window"""
-
-    project_name = legacy_io.Session["AVALON_PROJECT"]
-    asset_name = legacy_io.Session["AVALON_ASSET"]
-    task_name = legacy_io.Session["AVALON_TASK"]
-    return "{}/{}/{}".format(project_name, asset_name, task_name)
-
-
-def _get_stub():
-    """
-        Handle pulling stub from PS to run operations on host
+    Storing all instances as a list as legacy instances might be still present.
+    Args:
+        creator (Creator): Plugin which would like to get instances from host.
     Returns:
-        (AEServerStub) or None
+        List[]: list of all instances stored in metadata
     """
-    try:
-        stub = get_stub()  # only after Photoshop is up
-    except ConnectionNotEstablishedYet:
-        print("Not connected yet, ignoring")
-        return
-
-    if not stub.get_active_document_name():
-        return
-
-    return stub
+    shared_key = "openpype.photoshop.instances"
+    if shared_key not in creator.collection_shared_data:
+        creator.collection_shared_data[shared_key] = \
+            creator.host.list_instances()
+    return creator.collection_shared_data[shared_key]
diff --git a/openpype/hosts/aftereffects/api/workio.py b/openpype/hosts/aftereffects/api/workio.py
deleted file mode 100644
index 18b40af5dc..0000000000
--- a/openpype/hosts/aftereffects/api/workio.py
+++ /dev/null
@@ -1,53 +0,0 @@
-"""Host API required Work Files tool"""
-import os
-
-from .launch_logic import get_stub
-
-
-def file_extensions():
-    return [".aep"]
-
-
-def has_unsaved_changes():
-    if _active_document():
-        return not get_stub().is_saved()
-
-    return False
-
-
-def save_file(filepath):
-    get_stub().saveAs(filepath, True)
-
-
-def open_file(filepath):
-    get_stub().open(filepath)
-
-    return True
-
-
-def current_file():
-    try:
-        full_name = get_stub().get_active_document_full_name()
-        if full_name and full_name != "null":
-            return os.path.normpath(full_name).replace("\\", "/")
-    except ValueError:
-        print("Nothing opened")
-        pass
-
-    return None
-
-
-def work_root(session):
-    return os.path.normpath(session["AVALON_WORKDIR"]).replace("\\", "/")
-
-
-def _active_document():
-    # TODO merge with current_file - even in extension
-    document_name = None
-    try:
-        document_name = get_stub().get_active_document_name()
-    except ValueError:
-        print("Nothing opened")
-        pass
-
-    return document_name
diff --git a/openpype/hosts/aftereffects/plugins/create/create_legacy_local_render.py b/openpype/hosts/aftereffects/plugins/create/create_legacy_local_render.py
deleted file mode 100644
index 04413acbcf..0000000000
--- a/openpype/hosts/aftereffects/plugins/create/create_legacy_local_render.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from openpype.hosts.aftereffects.plugins.create import create_legacy_render
-
-
-class CreateLocalRender(create_legacy_render.CreateRender):
-    """ Creator to render locally.
-
-        Created only after default render on farm. So family 'render.local' is
-        used for backward compatibility.
-    """
-
-    name = "renderDefault"
-    label = "Render Locally"
-    family = "renderLocal"
diff --git a/openpype/hosts/aftereffects/plugins/create/create_legacy_render.py b/openpype/hosts/aftereffects/plugins/create/create_legacy_render.py
deleted file mode 100644
index e4fbb47a33..0000000000
--- a/openpype/hosts/aftereffects/plugins/create/create_legacy_render.py
+++ /dev/null
@@ -1,62 +0,0 @@
-from openpype.pipeline import create
-from openpype.pipeline import CreatorError
-from openpype.hosts.aftereffects.api import (
-    get_stub,
-    list_instances
-)
-
-
-class CreateRender(create.LegacyCreator):
-    """Render folder for publish.
-
-        Creates subsets in format 'familyTaskSubsetname',
-        eg 'renderCompositingMain'.
-
-        Create only single instance from composition at a time.
-    """
-
-    name = "renderDefault"
-    label = "Render on Farm"
-    family = "render"
-    defaults = ["Main"]
-
-    def process(self):
-        stub = get_stub()  # only after After Effects is up
-        items = []
-        if (self.options or {}).get("useSelection"):
-            items = stub.get_selected_items(
-                comps=True, folders=False, footages=False
-            )
-        if len(items) > 1:
-            raise CreatorError(
-                "Please select only single composition at time."
-            )
-
-        if not items:
-            raise CreatorError((
-                "Nothing to create. Select composition "
-                "if 'useSelection' or create at least "
-                "one composition."
-            ))
-
-        existing_subsets = [
-            instance['subset'].lower()
-            for instance in list_instances()
-        ]
-
-        item = items.pop()
-        if self.name.lower() in existing_subsets:
-            txt = "Instance with name \"{}\" already exists.".format(self.name)
-            raise CreatorError(txt)
-
-        self.data["members"] = [item.id]
-        self.data["uuid"] = item.id  # for SubsetManager
-        self.data["subset"] = (
-            self.data["subset"]
-            .replace(stub.PUBLISH_ICON, '')
-            .replace(stub.LOADED_ICON, '')
-        )
-
-        stub.imprint(item, self.data)
-        stub.set_label_color(item.id, 14)  # Cyan options 0 - 16
-        stub.rename_item(item.id, stub.PUBLISH_ICON + self.data["subset"])
diff --git a/openpype/hosts/aftereffects/plugins/create/create_render.py b/openpype/hosts/aftereffects/plugins/create/create_render.py
index 1019709dd6..65a4bc4500 100644
--- a/openpype/hosts/aftereffects/plugins/create/create_render.py
+++ b/openpype/hosts/aftereffects/plugins/create/create_render.py
@@ -7,6 +7,7 @@ from openpype.pipeline import (
     CreatorError,
     legacy_io,
 )
+from openpype.hosts.aftereffects.api.pipeline import cache_and_get_instances
 
 
 class RenderCreator(Creator):
@@ -28,7 +29,7 @@ class RenderCreator(Creator):
         return resources.get_openpype_splash_filepath()
 
     def collect_instances(self):
-        for instance_data in api.list_instances():
+        for instance_data in cache_and_get_instances(self):
             # legacy instances have family=='render' or 'renderLocal', use them
             creator_id = (instance_data.get("creator_identifier") or
                           instance_data.get("family", '').replace("Local", ''))
@@ -46,7 +47,7 @@ class RenderCreator(Creator):
 
     def remove_instances(self, instances):
         for instance in instances:
-            api.remove_instance(instance)
+            self.host.remove_instance(instance)
             self._remove_instance_from_context(instance)
 
     def create(self, subset_name, data, pre_create_data):
diff --git a/openpype/hosts/aftereffects/plugins/create/workfile_creator.py b/openpype/hosts/aftereffects/plugins/create/workfile_creator.py
index f82d15b3c9..c698af896b 100644
--- a/openpype/hosts/aftereffects/plugins/create/workfile_creator.py
+++ b/openpype/hosts/aftereffects/plugins/create/workfile_creator.py
@@ -5,6 +5,7 @@ from openpype.pipeline import (
     CreatedInstance,
     legacy_io,
 )
+from openpype.hosts.aftereffects.api.pipeline import cache_and_get_instances
 
 
 class AEWorkfileCreator(AutoCreator):
@@ -17,7 +18,7 @@ class AEWorkfileCreator(AutoCreator):
         return []
 
     def collect_instances(self):
-        for instance_data in api.list_instances():
+        for instance_data in cache_and_get_instances(self):
             creator_id = instance_data.get("creator_identifier")
             if creator_id == self.identifier:
                 subset_name = instance_data["subset"]
@@ -55,7 +56,7 @@ class AEWorkfileCreator(AutoCreator):
             }
             data.update(self.get_dynamic_data(
                 self.default_variant, task_name, asset_doc,
-                project_name, host_name
+                project_name, host_name, None
             ))
 
             new_instance = CreatedInstance(
diff --git a/openpype/hosts/aftereffects/plugins/publish/help/validate_instance_asset.xml b/openpype/hosts/aftereffects/plugins/publish/help/validate_instance_asset.xml
index 13f03a9b9a..edf62a5141 100644
--- a/openpype/hosts/aftereffects/plugins/publish/help/validate_instance_asset.xml
+++ b/openpype/hosts/aftereffects/plugins/publish/help/validate_instance_asset.xml
@@ -9,7 +9,7 @@ Context of the given subset doesn't match your current scene.
 
 ### How to repair?
 
-You can fix this with "repair" button on the right.
+You can fix this with "repair" button on the right and refresh Publish at the bottom right.
 </description>
 <detail>
 ### __Detailed Info__ (optional)
diff --git a/openpype/hosts/traypublisher/api/plugin.py b/openpype/hosts/traypublisher/api/plugin.py
index 555041d389..6b95379cf2 100644
--- a/openpype/hosts/traypublisher/api/plugin.py
+++ b/openpype/hosts/traypublisher/api/plugin.py
@@ -1,49 +1,32 @@
 from openpype.lib.attribute_definitions import FileDef
+from openpype.lib.transcoding import IMAGE_EXTENSIONS, VIDEO_EXTENSIONS
 from openpype.pipeline.create import (
     Creator,
     HiddenCreator,
-    CreatedInstance
+    CreatedInstance,
+    cache_and_get_instances,
 )
-
 from .pipeline import (
     list_instances,
     update_instances,
     remove_instances,
     HostContext,
 )
-from openpype.lib.transcoding import IMAGE_EXTENSIONS, VIDEO_EXTENSIONS
 
-
-REVIEW_EXTENSIONS = IMAGE_EXTENSIONS + VIDEO_EXTENSIONS
-
-
-def _cache_and_get_instances(creator):
-    """Cache instances in shared data.
-
-    Args:
-        creator (Creator): Plugin which would like to get instances from host.
-
-    Returns:
-        List[Dict[str, Any]]: Cached instances list from host implementation.
-    """
-
-    shared_key = "openpype.traypublisher.instances"
-    if shared_key not in creator.collection_shared_data:
-        creator.collection_shared_data[shared_key] = list_instances()
-    return creator.collection_shared_data[shared_key]
+REVIEW_EXTENSIONS = set(IMAGE_EXTENSIONS) | set(VIDEO_EXTENSIONS)
+SHARED_DATA_KEY = "openpype.traypublisher.instances"
 
 
 class HiddenTrayPublishCreator(HiddenCreator):
     host_name = "traypublisher"
 
     def collect_instances(self):
-        for instance_data in _cache_and_get_instances(self):
-            creator_id = instance_data.get("creator_identifier")
-            if creator_id == self.identifier:
-                instance = CreatedInstance.from_existing(
-                    instance_data, self
-                )
-                self._add_instance_to_context(instance)
+        instances_by_identifier = cache_and_get_instances(
+            self, SHARED_DATA_KEY, list_instances
+        )
+        for instance_data in instances_by_identifier[self.identifier]:
+            instance = CreatedInstance.from_existing(instance_data, self)
+            self._add_instance_to_context(instance)
 
     def update_instances(self, update_list):
         update_instances(update_list)
@@ -74,13 +57,12 @@ class TrayPublishCreator(Creator):
     host_name = "traypublisher"
 
     def collect_instances(self):
-        for instance_data in _cache_and_get_instances(self):
-            creator_id = instance_data.get("creator_identifier")
-            if creator_id == self.identifier:
-                instance = CreatedInstance.from_existing(
-                    instance_data, self
-                )
-                self._add_instance_to_context(instance)
+        instances_by_identifier = cache_and_get_instances(
+            self, SHARED_DATA_KEY, list_instances
+        )
+        for instance_data in instances_by_identifier[self.identifier]:
+            instance = CreatedInstance.from_existing(instance_data, self)
+            self._add_instance_to_context(instance)
 
     def update_instances(self, update_list):
         update_instances(update_list)
diff --git a/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py b/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py
index 61b95cf06d..9b35c9502d 100644
--- a/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py
+++ b/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py
@@ -7,7 +7,12 @@ import json
 import platform
 import uuid
 import re
-from Deadline.Scripting import RepositoryUtils, FileUtils, DirectoryUtils
+from Deadline.Scripting import (
+    RepositoryUtils,
+    FileUtils,
+    DirectoryUtils,
+    ProcessUtils,
+)
 
 
 def get_openpype_version_from_path(path, build=True):
@@ -162,9 +167,8 @@ def inject_openpype_environment(deadlinePlugin):
         print(">>> Temporary path: {}".format(export_url))
 
         args = [
-            exe,
             "--headless",
-            'extractenvironments',
+            "extractenvironments",
             export_url
         ]
 
@@ -188,15 +192,18 @@ def inject_openpype_environment(deadlinePlugin):
         if not os.environ.get("OPENPYPE_MONGO"):
             print(">>> Missing OPENPYPE_MONGO env var, process won't work")
 
-        env = os.environ
-        env["OPENPYPE_HEADLESS_MODE"] = "1"
-        env["AVALON_TIMEOUT"] = "5000"
+        os.environ["AVALON_TIMEOUT"] = "5000"
 
-        print(">>> Executing: {}".format(" ".join(args)))
-        std_output = subprocess.check_output(args,
-                                             cwd=os.path.dirname(exe),
-                                             env=env)
-        print(">>> Process result {}".format(std_output))
+        args_str = subprocess.list2cmdline(args)
+        print(">>> Executing: {} {}".format(exe, args_str))
+        process = ProcessUtils.SpawnProcess(
+            exe, args_str, os.path.dirname(exe)
+        )
+        ProcessUtils.WaitForExit(process, -1)
+        if process.ExitCode != 0:
+            raise RuntimeError(
+                "Failed to run OpenPype process to extract environments."
+            )
 
         print(">>> Loading file ...")
         with open(export_url) as fp:
diff --git a/openpype/pipeline/create/__init__.py b/openpype/pipeline/create/__init__.py
index 4b91951a08..9e858151fd 100644
--- a/openpype/pipeline/create/__init__.py
+++ b/openpype/pipeline/create/__init__.py
@@ -24,6 +24,8 @@ from .creator_plugins import (
     deregister_creator_plugin,
     register_creator_plugin_path,
     deregister_creator_plugin_path,
+
+    cache_and_get_instances,
 )
 
 from .context import (
diff --git a/openpype/pipeline/create/creator_plugins.py b/openpype/pipeline/create/creator_plugins.py
index c69abb8861..0f9c346966 100644
--- a/openpype/pipeline/create/creator_plugins.py
+++ b/openpype/pipeline/create/creator_plugins.py
@@ -1,5 +1,6 @@
 import os
 import copy
+import collections
 
 from abc import (
     ABCMeta,
@@ -660,3 +661,34 @@ def deregister_creator_plugin_path(path):
     deregister_plugin_path(BaseCreator, path)
     deregister_plugin_path(LegacyCreator, path)
     deregister_plugin_path(SubsetConvertorPlugin, path)
+
+
+def cache_and_get_instances(creator, shared_key, list_instances_func):
+    """Common approach to cache instances in shared data.
+
+    This is helper function which does not handle cases when a 'shared_key' is
+    used for different list instances functions. The same approach of caching
+    instances into 'collection_shared_data' is not required but is so common
+    we've decided to unify it to some degree.
+
+    Function 'list_instances_func' is called only if 'shared_key' is not
+    available in 'collection_shared_data' on creator.
+
+    Args:
+        creator (Creator): Plugin which would like to get instance data.
+        shared_key (str): Key under which output of function will be stored.
+        list_instances_func (Function): Function that will return instance data
+            if data were not yet stored under 'shared_key'.
+
+    Returns:
+        Dict[str, Dict[str, Any]]: Cached instances by creator identifier from
+            result of passed function.
+    """
+
+    if shared_key not in creator.collection_shared_data:
+        value = collections.defaultdict(list)
+        for instance in list_instances_func():
+            identifier = instance.get("creator_identifier")
+            value[identifier].append(instance)
+        creator.collection_shared_data[shared_key] = value
+    return creator.collection_shared_data[shared_key]
diff --git a/openpype/tools/loader/widgets.py b/openpype/tools/loader/widgets.py
index d37ce500e0..826c7110da 100644
--- a/openpype/tools/loader/widgets.py
+++ b/openpype/tools/loader/widgets.py
@@ -515,7 +515,7 @@ class SubsetWidget(QtWidgets.QWidget):
         if not one_item_selected:
             # Filter loaders from first subset by intersected combinations
             for repre, loader in first_loaders:
-                if (repre["name"], loader) not in found_combinations:
+                if (repre["name"].lower(), loader) not in found_combinations:
                     continue
 
                 loaders.append((repre, loader))
diff --git a/openpype/tools/publisher/window.py b/openpype/tools/publisher/window.py
index a3387043b8..d8a69bbeb0 100644
--- a/openpype/tools/publisher/window.py
+++ b/openpype/tools/publisher/window.py
@@ -225,6 +225,12 @@ class PublisherWindow(QtWidgets.QDialog):
         # Floating publish frame
         publish_frame = PublishFrame(controller, self.footer_border, self)
 
+        # Timer started on show -> connected to timer counter
+        # - helps to deffer on show logic by 3 event loops
+        show_timer = QtCore.QTimer()
+        show_timer.setInterval(1)
+        show_timer.timeout.connect(self._on_show_timer)
+
         errors_dialog_message_timer = QtCore.QTimer()
         errors_dialog_message_timer.setInterval(100)
         errors_dialog_message_timer.timeout.connect(
@@ -329,7 +335,6 @@ class PublisherWindow(QtWidgets.QDialog):
         #   forin init
         self._reset_on_first_show = reset_on_show
         self._reset_on_show = True
-        self._restart_timer = None
         self._publish_frame_visible = None
 
         self._error_messages_to_show = collections.deque()
@@ -337,6 +342,9 @@ class PublisherWindow(QtWidgets.QDialog):
 
         self._set_publish_visibility(False)
 
+        self._show_timer = show_timer
+        self._show_counter = 0
+
     @property
     def controller(self):
         return self._controller
@@ -347,17 +355,7 @@ class PublisherWindow(QtWidgets.QDialog):
             self._first_show = False
             self._on_first_show()
 
-        if not self._reset_on_show:
-            return
-
-        self._reset_on_show = False
-        # Detach showing - give OS chance to draw the window
-        timer = QtCore.QTimer()
-        timer.setSingleShot(True)
-        timer.setInterval(1)
-        timer.timeout.connect(self._on_show_restart_timer)
-        self._restart_timer = timer
-        timer.start()
+        self._show_timer.start()
 
     def resizeEvent(self, event):
         super(PublisherWindow, self).resizeEvent(event)
@@ -374,11 +372,21 @@ class PublisherWindow(QtWidgets.QDialog):
         self.setStyleSheet(style.load_stylesheet())
         self._reset_on_show = self._reset_on_first_show
 
-    def _on_show_restart_timer(self):
-        """Callback for '_restart_timer' timer."""
+    def _on_show_timer(self):
+        # Add 1 to counter until hits 2
+        if self._show_counter < 3:
+            self._show_counter += 1
+            return
 
-        self._restart_timer = None
-        self.reset()
+        # Stop the timer
+        self._show_timer.stop()
+        # Reset counter when done for next show event
+        self._show_counter = 0
+
+        # Reset if requested
+        if self._reset_on_show:
+            self._reset_on_show = False
+            self.reset()
 
     def closeEvent(self, event):
         self.save_changes()
diff --git a/openpype/version.py b/openpype/version.py
index 442c5f033b..46bb4b1cd0 100644
--- a/openpype/version.py
+++ b/openpype/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.14.7-nightly.1"
+__version__ = "3.14.7-nightly.2"
diff --git a/website/docs/artist_hosts_aftereffects.md b/website/docs/artist_hosts_aftereffects.md
index a9660bd13c..d235cf44f0 100644
--- a/website/docs/artist_hosts_aftereffects.md
+++ b/website/docs/artist_hosts_aftereffects.md
@@ -38,34 +38,67 @@ In AfterEffects you'll find the tools in the `OpenPype` extension:
 
 You can show the extension panel by going to `Window` > `Extensions` > `OpenPype`.
 
-### Create
-
-When you have created an composition you want to publish, you will need to tag existing composition. To do this open the `Creator` through the extensions `Create` button.
-
-![Creator](assets/aftereffects_creator.png)
-
 Because of current rendering limitations, it is expected that only single composition will be marked for publishing!
 
-After Creator is successfully triggered on selected composition, it will be marked with an icon and its color
-will be changed.
-
-![Highlights](assets/aftereffects_creator_after.png)
-
 ### Publish
 
+When you are ready to share some work, you will need to publish it. This is done by opening the `Publisher` through the `Publish...` button.
+
+There is always instance for workfile created automatically (see 'workfileCompositing' item in `Subsets to publish` column.) This allows to publish (and therefore backup)
+workfile which is used to produce another publishable elements (as `image` and `review` items).
+
+Main publishable item in AfterEffects will be of `render` family. Result of this item (instance) is picture sequence that could be a final delivery product or loaded and used in another DCCs.
+
+First select existing composition and then press `Create >>>` in middle column of `Publisher`.
+
+After this process you should have something like this:
+
+![Highlights](assets/aftereffects_publish_instance.png)
+
+Name of publishable instance (eg. subset name) could be configured with a template in `project_settings/global/tools/creator/subset_name_profiles`.
+(This must be configured by admin who has access to Openpype Settings.)
+
+Trash icon under the list of instances allows to delete any selected `render` instance.
+
+Workfile instance will be automatically recreated though. If you do not want to publish it, use pill toggle on the instance item.
+
+If you would like to modify publishable instance, click on `Publish` tab at the top. This would allow you to change name of publishable
+instances, disable them from publishing, change their task etc.
+
+Publisher allows publishing into different context, just click on any instance, update `Variant`, `Asset` or `Task` in the form in the middle and don't forget to click on the 'Confirm' button.
+
 #### RenderQueue
 
 AE's Render Queue is required for publishing locally or on a farm. Artist needs to configure expected result format (extension, resolution) in the Render Queue in an Output module. Currently its expected to have only single render item and single output module in the Render Queue.
 
 AE might throw some warning windows during publishing locally, so please pay attention to them in a case publishing seems to be stuck in a `Extract Local Render`.
 
-When you are ready to share your work, you will need to publish it. This is done by opening the `Publish` by clicking the corresponding button in the OpenPype Panel.
+#### Repair Validation Issues
 
-![Publish](assets/aftereffects_publish.png) 
+If you would like to run validation rules set by your Studio, click on funnel icon at the bottom right. This will run through all
+enabled instances, you could see more information after clicking on `Details` tab.
 
-This tool will run through checks to make sure the contents you are publishing is correct. Hit the "Play" button to start publishing.
+If there is some issue in validator phase, you will receive something like this:
+![Validation error](assets/aftereffects_publish_failed.png)
 
-You may encounter issues with publishing which will be indicated with red squares. If these issues are within the validation section, then you can fix the issue. If there are issues outside of validation section, please let the OpenPype team know. For More details have a look at the general [Publish](artist_tools.md#publisher) documentation.
+All validators will give some description about what the issue is. You can inspect this by clicking on items in the left column.
+
+If there is an option of automatic repair, there will be `Repair` button on the right. In other case you need to fix the issue manually.
+(By deleting and recreating instance, changing workfile setting etc.)
+
+#### Render instance options
+
+There are currently 2 options of `render` item:
+- Render of farm - allows offload rendering and publishing to Deadline - requires Deadline module being enabled
+- Validate Scene Settings - enables validation plugin which controls setting in DB (or asset control system like Ftrak) and scene itself
+
+![Configuration of render instance](assets/aftereffects_render_instance.png)
+
+#### Buttons on the bottom right are for:
+- `Refresh publishing` - set publishing process to starting position - useful if previous publish failed, or you changed configuration of a publish
+- `Stop/pause publishing` - if you would like to pause publishing process at any time
+- `Validate` - if you would like to run only collecting and validating phases (nothing will be published yet)
+- `Publish` - standard way how to kick off full publishing process
 
 ### Load
 
@@ -102,12 +135,19 @@ You can switch to a previous version of the image or update to the latest.
 ![Loader](assets/photoshop_manage_switch.gif)
 ![Loader](assets/photoshop_manage_update.gif)
 
-### Subset Manager
+#### Support help
+If you would like to ask for help admin or support, you could use any of the three options on the `Note` button on bottom left:
+- `Go to details` - switches into a more detailed list of published instances and plugins.
+- `Copy report` - stash full publishing log to a clipboard
+- `Export report` - save log into a file for sending it via mail or any communication tool
 
-![subset_manager](assets/tools_subset_manager.png)
+If you are able to fix the workfile yourself, use the first button on the right to set the UI to initial state before publish. (Click the `Publish` button to start again.)
 
-All created compositions will be shown in a simple list. If user decides, that this composition shouldn't be
-published after all, right click on that item in the list and select 'Remove instance'
+#### Legacy instances
 
-Removing composition directly in the AE would result to worfile contain phantom metadata which could result in
-errors during publishing!
\ No newline at end of file
+All screenshots from Publish are from updated dialog, before publishing was being done by regular `Pyblish` tool.
+New publishing process should be backward compatible, eg. if you have a workfile with instances created in the previous publishing approach, they will be translated automatically and
+could be used right away.
+
+If you hit on unexpected behaviour with old instances, contact support first, then you could try to delete and recreate instances from scratch.
+Nuclear option is to purge workfile metadata in `Window > Metadata > Basic > Label`. This is only for most determined daredevils though!
\ No newline at end of file
diff --git a/website/docs/assets/aftereffects_publish_failed.png b/website/docs/assets/aftereffects_publish_failed.png
new file mode 100644
index 0000000000..5821fcbb31
Binary files /dev/null and b/website/docs/assets/aftereffects_publish_failed.png differ
diff --git a/website/docs/assets/aftereffects_publish_instance.png b/website/docs/assets/aftereffects_publish_instance.png
new file mode 100644
index 0000000000..7ce7f194b9
Binary files /dev/null and b/website/docs/assets/aftereffects_publish_instance.png differ
diff --git a/website/docs/assets/aftereffects_render_instance.png b/website/docs/assets/aftereffects_render_instance.png
new file mode 100644
index 0000000000..b9be8b3f5d
Binary files /dev/null and b/website/docs/assets/aftereffects_render_instance.png differ