diff --git a/openpype/hosts/aftereffects/plugins/publish/collect_render.py b/openpype/hosts/aftereffects/plugins/publish/collect_render.py
index 2a4b773681..3e44acd7e9 100644
--- a/openpype/hosts/aftereffects/plugins/publish/collect_render.py
+++ b/openpype/hosts/aftereffects/plugins/publish/collect_render.py
@@ -25,7 +25,7 @@ class AERenderInstance(RenderInstance):
 
 class CollectAERender(abstract_collect_render.AbstractCollectRender):
 
-    order = pyblish.api.CollectorOrder + 0.498
+    order = pyblish.api.CollectorOrder + 0.400
     label = "Collect After Effects Render Layers"
     hosts = ["aftereffects"]
 
diff --git a/openpype/hosts/maya/plugins/create/create_render.py b/openpype/hosts/maya/plugins/create/create_render.py
index 1e3fc3f0ae..70e6aee9b4 100644
--- a/openpype/hosts/maya/plugins/create/create_render.py
+++ b/openpype/hosts/maya/plugins/create/create_render.py
@@ -4,8 +4,6 @@ import os
 import json
 import appdirs
 import requests
-import six
-import sys
 
 from maya import cmds
 import maya.app.renderSetup.model.renderSetup as renderSetup
@@ -14,6 +12,7 @@ from openpype.hosts.maya.api import (
     lib,
     plugin
 )
+from openpype.lib import requests_get
 from openpype.api import (
     get_system_settings,
     get_project_settings,
@@ -118,6 +117,8 @@ class CreateRender(plugin.Creator):
         except KeyError:
             self.aov_separator = "_"
 
+        manager = ModulesManager()
+        self.deadline_module = manager.modules_by_name["deadline"]
         try:
             default_servers = deadline_settings["deadline_urls"]
             project_servers = (
@@ -134,10 +135,8 @@ class CreateRender(plugin.Creator):
 
         except AttributeError:
             # Handle situation were we had only one url for deadline.
-            manager = ModulesManager()
-            deadline_module = manager.modules_by_name["deadline"]
             # get default deadline webservice url from deadline module
-            self.deadline_servers = deadline_module.deadline_urls
+            self.deadline_servers = self.deadline_module.deadline_urls
 
     def process(self):
         """Entry point."""
@@ -206,48 +205,31 @@ class CreateRender(plugin.Creator):
     def _deadline_webservice_changed(self):
         """Refresh Deadline server dependent options."""
         # get selected server
-        from maya import cmds
         webservice = self.deadline_servers[
             self.server_aliases[
                 cmds.getAttr("{}.deadlineServers".format(self.instance))
             ]
         ]
-        pools = self._get_deadline_pools(webservice)
+        pools = self.deadline_module.get_deadline_pools(webservice, self.log)
         cmds.deleteAttr("{}.primaryPool".format(self.instance))
         cmds.deleteAttr("{}.secondaryPool".format(self.instance))
+
+        pool_setting = (self._project_settings["deadline"]
+                                              ["publish"]
+                                              ["CollectDeadlinePools"])
+
+        primary_pool = pool_setting["primary_pool"]
+        sorted_pools = self._set_default_pool(list(pools), primary_pool)
         cmds.addAttr(self.instance, longName="primaryPool",
                      attributeType="enum",
-                     enumName=":".join(pools))
-        cmds.addAttr(self.instance, longName="secondaryPool",
+                     enumName=":".join(sorted_pools))
+
+        pools = ["-"] + pools
+        secondary_pool = pool_setting["secondary_pool"]
+        sorted_pools = self._set_default_pool(list(pools), secondary_pool)
+        cmds.addAttr("{}.secondaryPool".format(self.instance),
                      attributeType="enum",
-                     enumName=":".join(["-"] + pools))
-
-    def _get_deadline_pools(self, webservice):
-        # type: (str) -> list
-        """Get pools from Deadline.
-        Args:
-            webservice (str): Server url.
-        Returns:
-            list: Pools.
-        Throws:
-            RuntimeError: If deadline webservice is unreachable.
-
-        """
-        argument = "{}/api/pools?NamesOnly=true".format(webservice)
-        try:
-            response = self._requests_get(argument)
-        except requests.exceptions.ConnectionError as exc:
-            msg = 'Cannot connect to deadline web service'
-            self.log.error(msg)
-            six.reraise(
-                RuntimeError,
-                RuntimeError('{} - {}'.format(msg, exc)),
-                sys.exc_info()[2])
-        if not response.ok:
-            self.log.warning("No pools retrieved")
-            return []
-
-        return response.json()
+                     enumName=":".join(sorted_pools))
 
     def _create_render_settings(self):
         """Create instance settings."""
@@ -296,7 +278,8 @@ class CreateRender(plugin.Creator):
                 # use first one for initial list of pools.
                 deadline_url = next(iter(self.deadline_servers.values()))
 
-            pool_names = self._get_deadline_pools(deadline_url)
+            pool_names = self.deadline_module.get_deadline_pools(deadline_url,
+                                                                 self.log)
             maya_submit_dl = self._project_settings.get(
                 "deadline", {}).get(
                 "publish", {}).get(
@@ -327,12 +310,27 @@ class CreateRender(plugin.Creator):
                 self.log.info("  - pool: {}".format(pool["name"]))
                 pool_names.append(pool["name"])
 
-        self.data["primaryPool"] = pool_names
+        pool_setting = (self._project_settings["deadline"]
+                                              ["publish"]
+                                              ["CollectDeadlinePools"])
+        primary_pool = pool_setting["primary_pool"]
+        self.data["primaryPool"] = self._set_default_pool(pool_names,
+                                                          primary_pool)
         # We add a string "-" to allow the user to not
         # set any secondary pools
-        self.data["secondaryPool"] = ["-"] + pool_names
+        pool_names = ["-"] + pool_names
+        secondary_pool = pool_setting["secondary_pool"]
+        self.data["secondaryPool"] = self._set_default_pool(pool_names,
+                                                            secondary_pool)
         self.options = {"useSelection": False}  # Force no content
 
+    def _set_default_pool(self, pool_names, pool_value):
+        """Reorder pool names, default should come first"""
+        if pool_value and pool_value in pool_names:
+            pool_names.remove(pool_value)
+            pool_names = [pool_value] + pool_names
+        return pool_names
+
     def _load_credentials(self):
         """Load Muster credentials.
 
@@ -367,7 +365,7 @@ class CreateRender(plugin.Creator):
         """
         params = {"authToken": self._token}
         api_entry = "/api/pools/list"
-        response = self._requests_get(self.MUSTER_REST_URL + api_entry,
+        response = requests_get(self.MUSTER_REST_URL + api_entry,
                                       params=params)
         if response.status_code != 200:
             if response.status_code == 401:
@@ -393,45 +391,11 @@ class CreateRender(plugin.Creator):
         api_url = "{}/muster/show_login".format(
             os.environ["OPENPYPE_WEBSERVER_URL"])
         self.log.debug(api_url)
-        login_response = self._requests_get(api_url, timeout=1)
+        login_response = requests_get(api_url, timeout=1)
         if login_response.status_code != 200:
             self.log.error("Cannot show login form to Muster")
             raise Exception("Cannot show login form to Muster")
 
-    def _requests_post(self, *args, **kwargs):
-        """Wrap request post method.
-
-        Disabling SSL certificate validation if ``DONT_VERIFY_SSL`` environment
-        variable is found. This is useful when Deadline or Muster server are
-        running with self-signed certificates and their certificate is not
-        added to trusted certificates on client machines.
-
-        Warning:
-            Disabling SSL certificate validation is defeating one line
-            of defense SSL is providing and it is not recommended.
-
-        """
-        if "verify" not in kwargs:
-            kwargs["verify"] = not os.getenv("OPENPYPE_DONT_VERIFY_SSL", True)
-        return requests.post(*args, **kwargs)
-
-    def _requests_get(self, *args, **kwargs):
-        """Wrap request get method.
-
-        Disabling SSL certificate validation if ``DONT_VERIFY_SSL`` environment
-        variable is found. This is useful when Deadline or Muster server are
-        running with self-signed certificates and their certificate is not
-        added to trusted certificates on client machines.
-
-        Warning:
-            Disabling SSL certificate validation is defeating one line
-            of defense SSL is providing and it is not recommended.
-
-        """
-        if "verify" not in kwargs:
-            kwargs["verify"] = not os.getenv("OPENPYPE_DONT_VERIFY_SSL", True)
-        return requests.get(*args, **kwargs)
-
     def _set_default_renderer_settings(self, renderer):
         """Set basic settings based on renderer.
 
diff --git a/openpype/hosts/maya/plugins/create/create_vrayscene.py b/openpype/hosts/maya/plugins/create/create_vrayscene.py
index 38cf5818a6..45c4b7e443 100644
--- a/openpype/hosts/maya/plugins/create/create_vrayscene.py
+++ b/openpype/hosts/maya/plugins/create/create_vrayscene.py
@@ -4,8 +4,6 @@ import os
 import json
 import appdirs
 import requests
-import six
-import sys
 
 from maya import cmds
 import maya.app.renderSetup.model.renderSetup as renderSetup
@@ -19,6 +17,7 @@ from openpype.api import (
     get_project_settings
 )
 
+from openpype.lib import requests_get
 from openpype.pipeline import (
     CreatorError,
     legacy_io,
@@ -41,6 +40,10 @@ class CreateVRayScene(plugin.Creator):
         self._rs = renderSetup.instance()
         self.data["exportOnFarm"] = False
         deadline_settings = get_system_settings()["modules"]["deadline"]
+
+        manager = ModulesManager()
+        self.deadline_module = manager.modules_by_name["deadline"]
+
         if not deadline_settings["enabled"]:
             self.deadline_servers = {}
             return
@@ -63,10 +66,8 @@ class CreateVRayScene(plugin.Creator):
 
         except AttributeError:
             # Handle situation were we had only one url for deadline.
-            manager = ModulesManager()
-            deadline_module = manager.modules_by_name["deadline"]
             # get default deadline webservice url from deadline module
-            self.deadline_servers = deadline_module.deadline_urls
+            self.deadline_servers = self.deadline_module.deadline_urls
 
     def process(self):
         """Entry point."""
@@ -129,7 +130,7 @@ class CreateVRayScene(plugin.Creator):
                 cmds.getAttr("{}.deadlineServers".format(self.instance))
             ]
         ]
-        pools = self._get_deadline_pools(webservice)
+        pools = self.deadline_module.get_deadline_pools(webservice)
         cmds.deleteAttr("{}.primaryPool".format(self.instance))
         cmds.deleteAttr("{}.secondaryPool".format(self.instance))
         cmds.addAttr(self.instance, longName="primaryPool",
@@ -139,33 +140,6 @@ class CreateVRayScene(plugin.Creator):
                      attributeType="enum",
                      enumName=":".join(["-"] + pools))
 
-    def _get_deadline_pools(self, webservice):
-        # type: (str) -> list
-        """Get pools from Deadline.
-        Args:
-            webservice (str): Server url.
-        Returns:
-            list: Pools.
-        Throws:
-            RuntimeError: If deadline webservice is unreachable.
-
-        """
-        argument = "{}/api/pools?NamesOnly=true".format(webservice)
-        try:
-            response = self._requests_get(argument)
-        except requests.exceptions.ConnectionError as exc:
-            msg = 'Cannot connect to deadline web service'
-            self.log.error(msg)
-            six.reraise(
-                CreatorError,
-                CreatorError('{} - {}'.format(msg, exc)),
-                sys.exc_info()[2])
-        if not response.ok:
-            self.log.warning("No pools retrieved")
-            return []
-
-        return response.json()
-
     def _create_vray_instance_settings(self):
         # get pools
         pools = []
@@ -196,7 +170,7 @@ class CreateVRayScene(plugin.Creator):
                     for k in self.deadline_servers.keys()
                 ][0]
 
-            pool_names = self._get_deadline_pools(deadline_url)
+            pool_names = self.deadline_module.get_deadline_pools(deadline_url)
 
         if muster_enabled:
             self.log.info(">>> Loading Muster credentials ...")
@@ -260,8 +234,8 @@ class CreateVRayScene(plugin.Creator):
         """
         params = {"authToken": self._token}
         api_entry = "/api/pools/list"
-        response = self._requests_get(self.MUSTER_REST_URL + api_entry,
-                                      params=params)
+        response = requests_get(self.MUSTER_REST_URL + api_entry,
+                                params=params)
         if response.status_code != 200:
             if response.status_code == 401:
                 self.log.warning("Authentication token expired.")
@@ -286,45 +260,7 @@ class CreateVRayScene(plugin.Creator):
         api_url = "{}/muster/show_login".format(
             os.environ["OPENPYPE_WEBSERVER_URL"])
         self.log.debug(api_url)
-        login_response = self._requests_get(api_url, timeout=1)
+        login_response = requests_get(api_url, timeout=1)
         if login_response.status_code != 200:
             self.log.error("Cannot show login form to Muster")
             raise CreatorError("Cannot show login form to Muster")
-
-    def _requests_post(self, *args, **kwargs):
-        """Wrap request post method.
-
-        Disabling SSL certificate validation if ``DONT_VERIFY_SSL`` environment
-        variable is found. This is useful when Deadline or Muster server are
-        running with self-signed certificates and their certificate is not
-        added to trusted certificates on client machines.
-
-        Warning:
-            Disabling SSL certificate validation is defeating one line
-            of defense SSL is providing and it is not recommended.
-
-        """
-        if "verify" not in kwargs:
-            kwargs["verify"] = (
-                False if os.getenv("OPENPYPE_DONT_VERIFY_SSL", True) else True
-            )  # noqa
-        return requests.post(*args, **kwargs)
-
-    def _requests_get(self, *args, **kwargs):
-        """Wrap request get method.
-
-        Disabling SSL certificate validation if ``DONT_VERIFY_SSL`` environment
-        variable is found. This is useful when Deadline or Muster server are
-        running with self-signed certificates and their certificate is not
-        added to trusted certificates on client machines.
-
-        Warning:
-            Disabling SSL certificate validation is defeating one line
-            of defense SSL is providing and it is not recommended.
-
-        """
-        if "verify" not in kwargs:
-            kwargs["verify"] = (
-                False if os.getenv("OPENPYPE_DONT_VERIFY_SSL", True) else True
-            )  # noqa
-        return requests.get(*args, **kwargs)
diff --git a/openpype/hosts/maya/plugins/publish/collect_render.py b/openpype/hosts/maya/plugins/publish/collect_render.py
index 2ce7c02737..9f1a377c11 100644
--- a/openpype/hosts/maya/plugins/publish/collect_render.py
+++ b/openpype/hosts/maya/plugins/publish/collect_render.py
@@ -386,6 +386,12 @@ class CollectMayaRender(pyblish.api.ContextPlugin):
             overrides = self.parse_options(str(render_globals))
             data.update(**overrides)
 
+            # get string values for pools
+            primary_pool = overrides["renderGlobals"]["Pool"]
+            secondary_pool = overrides["renderGlobals"].get("SecondaryPool")
+            data["primaryPool"] = primary_pool
+            data["secondaryPool"] = secondary_pool
+
             # Define nice label
             label = "{0} ({1})".format(expected_layer_name, data["asset"])
             label += "  [{0}-{1}]".format(
diff --git a/openpype/hosts/maya/plugins/publish/submit_maya_muster.py b/openpype/hosts/maya/plugins/publish/submit_maya_muster.py
index 3ce9ec714c..43a01fe542 100644
--- a/openpype/hosts/maya/plugins/publish/submit_maya_muster.py
+++ b/openpype/hosts/maya/plugins/publish/submit_maya_muster.py
@@ -4,11 +4,11 @@ import getpass
 import platform
 
 import appdirs
-import requests
 
 from maya import cmds
 
 import pyblish.api
+from openpype.lib import requests_post
 from openpype.hosts.maya.api import lib
 from openpype.pipeline import legacy_io
 from openpype.api import get_system_settings
@@ -183,7 +183,7 @@ class MayaSubmitMuster(pyblish.api.InstancePlugin):
             "select": "name"
         }
         api_entry = '/api/templates/list'
-        response = self._requests_post(
+        response = requests_post(
             self.MUSTER_REST_URL + api_entry, params=params)
         if response.status_code != 200:
             self.log.error(
@@ -234,7 +234,7 @@ class MayaSubmitMuster(pyblish.api.InstancePlugin):
             "name": "submit"
         }
         api_entry = '/api/queue/actions'
-        response = self._requests_post(
+        response = requests_post(
             self.MUSTER_REST_URL + api_entry, params=params, json=payload)
 
         if response.status_code != 200:
@@ -548,16 +548,3 @@ class MayaSubmitMuster(pyblish.api.InstancePlugin):
                 % (value, int(value))
             )
 
-    def _requests_post(self, *args, **kwargs):
-        """ Wrapper for requests, disabling SSL certificate validation if
-            DONT_VERIFY_SSL environment variable is found. This is useful when
-            Deadline or Muster server are running with self-signed certificates
-            and their certificate is not added to trusted certificates on
-            client machines.
-
-            WARNING: disabling SSL certificate validation is defeating one line
-            of defense SSL is providing and it is not recommended.
-        """
-        if 'verify' not in kwargs:
-            kwargs['verify'] = False if os.getenv("OPENPYPE_DONT_VERIFY_SSL", True) else True  # noqa
-        return requests.post(*args, **kwargs)
diff --git a/openpype/hosts/maya/plugins/publish/validate_muster_connection.py b/openpype/hosts/maya/plugins/publish/validate_muster_connection.py
index af32c82f97..6dc7bd3bc4 100644
--- a/openpype/hosts/maya/plugins/publish/validate_muster_connection.py
+++ b/openpype/hosts/maya/plugins/publish/validate_muster_connection.py
@@ -2,9 +2,9 @@ import os
 import json
 
 import appdirs
-import requests
 
 import pyblish.api
+from openpype.lib import requests_get
 from openpype.plugin import contextplugin_should_run
 import openpype.hosts.maya.api.action
 
@@ -51,7 +51,7 @@ class ValidateMusterConnection(pyblish.api.ContextPlugin):
             'authToken': self._token
         }
         api_entry = '/api/pools/list'
-        response = self._requests_get(
+        response = requests_get(
             MUSTER_REST_URL + api_entry, params=params)
         assert response.status_code == 200, "invalid response from server"
         assert response.json()['ResponseData'], "invalid data in response"
@@ -88,35 +88,7 @@ class ValidateMusterConnection(pyblish.api.ContextPlugin):
         api_url = "{}/muster/show_login".format(
             os.environ["OPENPYPE_WEBSERVER_URL"])
         cls.log.debug(api_url)
-        response = cls._requests_get(api_url, timeout=1)
+        response = requests_get(api_url, timeout=1)
         if response.status_code != 200:
             cls.log.error('Cannot show login form to Muster')
             raise Exception('Cannot show login form to Muster')
-
-    def _requests_post(self, *args, **kwargs):
-        """ Wrapper for requests, disabling SSL certificate validation if
-            DONT_VERIFY_SSL environment variable is found. This is useful when
-            Deadline or Muster server are running with self-signed certificates
-            and their certificate is not added to trusted certificates on
-            client machines.
-
-            WARNING: disabling SSL certificate validation is defeating one line
-            of defense SSL is providing and it is not recommended.
-        """
-        if 'verify' not in kwargs:
-            kwargs['verify'] = False if os.getenv("OPENPYPE_DONT_VERIFY_SSL", True) else True  # noqa
-        return requests.post(*args, **kwargs)
-
-    def _requests_get(self, *args, **kwargs):
-        """ Wrapper for requests, disabling SSL certificate validation if
-            DONT_VERIFY_SSL environment variable is found. This is useful when
-            Deadline or Muster server are running with self-signed certificates
-            and their certificate is not added to trusted certificates on
-            client machines.
-
-            WARNING: disabling SSL certificate validation is defeating one line
-            of defense SSL is providing and it is not recommended.
-        """
-        if 'verify' not in kwargs:
-            kwargs['verify'] = False if os.getenv("OPENPYPE_DONT_VERIFY_SSL", True) else True  # noqa
-        return requests.get(*args, **kwargs)
diff --git a/openpype/hosts/nuke/plugins/inventory/select_containers.py b/openpype/hosts/nuke/plugins/inventory/select_containers.py
index d7d5f00b87..4e7a20fb26 100644
--- a/openpype/hosts/nuke/plugins/inventory/select_containers.py
+++ b/openpype/hosts/nuke/plugins/inventory/select_containers.py
@@ -1,5 +1,5 @@
 from openpype.pipeline import InventoryAction
-from openpype.hosts.nuke.api.commands import viewer_update_and_undo_stop
+from openpype.hosts.nuke.api.command import viewer_update_and_undo_stop
 
 
 class SelectContainers(InventoryAction):
diff --git a/openpype/hosts/nuke/plugins/load/load_backdrop.py b/openpype/hosts/nuke/plugins/load/load_backdrop.py
index 91f1c80b2a..143fdf1f30 100644
--- a/openpype/hosts/nuke/plugins/load/load_backdrop.py
+++ b/openpype/hosts/nuke/plugins/load/load_backdrop.py
@@ -14,7 +14,7 @@ from openpype.hosts.nuke.api.lib import (
     get_avalon_knob_data,
     set_avalon_knob_data
 )
-from openpype.hosts.nuke.api.commands import viewer_update_and_undo_stop
+from openpype.hosts.nuke.api.command import viewer_update_and_undo_stop
 from openpype.hosts.nuke.api import containerise, update_container
 
 
diff --git a/openpype/lib/__init__.py b/openpype/lib/__init__.py
index e8b6d18f4e..b57e469f5b 100644
--- a/openpype/lib/__init__.py
+++ b/openpype/lib/__init__.py
@@ -221,6 +221,12 @@ from .openpype_version import (
     is_current_version_higher_than_expected
 )
 
+
+from .connections import (
+    requests_get,
+    requests_post
+)
+
 terminal = Terminal
 
 __all__ = [
@@ -390,4 +396,7 @@ __all__ = [
     "is_running_from_build",
     "is_running_staging",
     "is_current_version_studio_latest",
+
+    "requests_get",
+    "requests_post"
 ]
diff --git a/openpype/lib/connections.py b/openpype/lib/connections.py
new file mode 100644
index 0000000000..91b745a4c1
--- /dev/null
+++ b/openpype/lib/connections.py
@@ -0,0 +1,38 @@
+import requests
+import os
+
+
+def requests_post(*args, **kwargs):
+    """Wrap request post method.
+
+    Disabling SSL certificate validation if ``DONT_VERIFY_SSL`` environment
+    variable is found. This is useful when Deadline or Muster server are
+    running with self-signed certificates and their certificate is not
+    added to trusted certificates on client machines.
+
+    Warning:
+        Disabling SSL certificate validation is defeating one line
+        of defense SSL is providing and it is not recommended.
+
+    """
+    if "verify" not in kwargs:
+        kwargs["verify"] = not os.getenv("OPENPYPE_DONT_VERIFY_SSL", True)
+    return requests.post(*args, **kwargs)
+
+
+def requests_get(*args, **kwargs):
+    """Wrap request get method.
+
+    Disabling SSL certificate validation if ``DONT_VERIFY_SSL`` environment
+    variable is found. This is useful when Deadline or Muster server are
+    running with self-signed certificates and their certificate is not
+    added to trusted certificates on client machines.
+
+    Warning:
+        Disabling SSL certificate validation is defeating one line
+        of defense SSL is providing and it is not recommended.
+
+    """
+    if "verify" not in kwargs:
+        kwargs["verify"] = not os.getenv("OPENPYPE_DONT_VERIFY_SSL", True)
+    return requests.get(*args, **kwargs)
diff --git a/openpype/modules/clockify/launcher_actions/ClockifyStart.py b/openpype/modules/clockify/launcher_actions/ClockifyStart.py
index db51964eb7..6428d5e7aa 100644
--- a/openpype/modules/clockify/launcher_actions/ClockifyStart.py
+++ b/openpype/modules/clockify/launcher_actions/ClockifyStart.py
@@ -1,12 +1,14 @@
-from avalon import api, io
+from avalon import io
+
 from openpype.api import Logger
+from openpype.pipeline import LauncherAction
 from openpype_modules.clockify.clockify_api import ClockifyAPI
 
 
-log = Logger().get_logger(__name__)
+log = Logger.get_logger(__name__)
 
 
-class ClockifyStart(api.Action):
+class ClockifyStart(LauncherAction):
 
     name = "clockify_start_timer"
     label = "Clockify - Start Timer"
diff --git a/openpype/modules/clockify/launcher_actions/ClockifySync.py b/openpype/modules/clockify/launcher_actions/ClockifySync.py
index 02982d373a..3c81e2766c 100644
--- a/openpype/modules/clockify/launcher_actions/ClockifySync.py
+++ b/openpype/modules/clockify/launcher_actions/ClockifySync.py
@@ -1,10 +1,13 @@
-from avalon import api, io
+from avalon import io
+
 from openpype_modules.clockify.clockify_api import ClockifyAPI
 from openpype.api import Logger
-log = Logger().get_logger(__name__)
+from openpype.pipeline import LauncherAction
+
+log = Logger.get_logger(__name__)
 
 
-class ClockifySync(api.Action):
+class ClockifySync(LauncherAction):
 
     name = "sync_to_clockify"
     label = "Sync to Clockify"
diff --git a/openpype/modules/deadline/deadline_module.py b/openpype/modules/deadline/deadline_module.py
index 1a179e9aaf..c30db75188 100644
--- a/openpype/modules/deadline/deadline_module.py
+++ b/openpype/modules/deadline/deadline_module.py
@@ -1,8 +1,19 @@
 import os
+import requests
+import six
+import sys
+
+from openpype.lib import requests_get, PypeLogger
 from openpype.modules import OpenPypeModule
 from openpype_interfaces import IPluginPaths
 
 
+class DeadlineWebserviceError(Exception):
+    """
+    Exception to throw when connection to Deadline server fails.
+    """
+
+
 class DeadlineModule(OpenPypeModule, IPluginPaths):
     name = "deadline"
 
@@ -32,3 +43,35 @@ class DeadlineModule(OpenPypeModule, IPluginPaths):
         return {
             "publish": [os.path.join(current_dir, "plugins", "publish")]
         }
+
+    @staticmethod
+    def get_deadline_pools(webservice, log=None):
+        # type: (str) -> list
+        """Get pools from Deadline.
+        Args:
+            webservice (str): Server url.
+            log (Logger)
+        Returns:
+            list: Pools.
+        Throws:
+            RuntimeError: If deadline webservice is unreachable.
+
+        """
+        if not log:
+            log = PypeLogger.get_logger(__name__)
+
+        argument = "{}/api/pools?NamesOnly=true".format(webservice)
+        try:
+            response = requests_get(argument)
+        except requests.exceptions.ConnectionError as exc:
+            msg = 'Cannot connect to DL web service {}'.format(webservice)
+            log.error(msg)
+            six.reraise(
+                DeadlineWebserviceError,
+                DeadlineWebserviceError('{} - {}'.format(msg, exc)),
+                sys.exc_info()[2])
+        if not response.ok:
+            log.warning("No pools retrieved")
+            return []
+
+        return response.json()
diff --git a/openpype/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py b/openpype/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
index 1bc4eaa067..a7035cd99f 100644
--- a/openpype/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
+++ b/openpype/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
@@ -11,7 +11,7 @@ import pyblish.api
 class CollectDeadlineServerFromInstance(pyblish.api.InstancePlugin):
     """Collect Deadline Webservice URL from instance."""
 
-    order = pyblish.api.CollectorOrder + 0.02
+    order = pyblish.api.CollectorOrder + 0.415
     label = "Deadline Webservice from the Instance"
     families = ["rendering"]
 
diff --git a/openpype/modules/deadline/plugins/publish/collect_default_deadline_server.py b/openpype/modules/deadline/plugins/publish/collect_default_deadline_server.py
index fc056342a8..e6ad6a9aa1 100644
--- a/openpype/modules/deadline/plugins/publish/collect_default_deadline_server.py
+++ b/openpype/modules/deadline/plugins/publish/collect_default_deadline_server.py
@@ -6,7 +6,7 @@ import pyblish.api
 class CollectDefaultDeadlineServer(pyblish.api.ContextPlugin):
     """Collect default Deadline Webservice URL."""
 
-    order = pyblish.api.CollectorOrder + 0.01
+    order = pyblish.api.CollectorOrder + 0.410
     label = "Default Deadline Webservice"
 
     pass_mongo_url = False
diff --git a/openpype/modules/deadline/plugins/publish/collect_pools.py b/openpype/modules/deadline/plugins/publish/collect_pools.py
new file mode 100644
index 0000000000..48130848d5
--- /dev/null
+++ b/openpype/modules/deadline/plugins/publish/collect_pools.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+"""Collect Deadline pools. Choose default one from Settings
+
+"""
+import pyblish.api
+
+
+class CollectDeadlinePools(pyblish.api.InstancePlugin):
+    """Collect pools from instance if present, from Setting otherwise."""
+
+    order = pyblish.api.CollectorOrder + 0.420
+    label = "Collect Deadline Pools"
+    families = ["rendering", "render.farm", "renderFarm", "renderlayer"]
+
+    primary_pool = None
+    secondary_pool = None
+
+    def process(self, instance):
+        if not instance.data.get("primaryPool"):
+            instance.data["primaryPool"] = self.primary_pool or "none"
+
+        if not instance.data.get("secondaryPool"):
+            instance.data["secondaryPool"] = self.secondary_pool or "none"
diff --git a/openpype/modules/deadline/plugins/publish/help/validate_deadline_pools.xml b/openpype/modules/deadline/plugins/publish/help/validate_deadline_pools.xml
new file mode 100644
index 0000000000..0e7d72910e
--- /dev/null
+++ b/openpype/modules/deadline/plugins/publish/help/validate_deadline_pools.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+    <error id="main">
+        <title>Scene setting</title>
+        <description>
+            ## Invalid Deadline pools found
+
+            Configured pools don't match what is set in Deadline.
+
+            {invalid_value_str}
+
+            ### How to repair?
+
+            If your instance had deadline pools set on creation, remove or
+            change them.
+
+        In other cases inform admin to change them in Settings.
+
+        Available deadline pools {pools_str}.
+        </description>
+        <detail>
+            ### __Detailed Info__
+
+            This error is shown when deadline pool is not on Deadline anymore. It
+            could happen in case of republish old workfile which was created with
+            previous deadline pools,
+            or someone changed pools on Deadline side, but didn't modify Openpype
+            Settings.
+        </detail>
+    </error>
+</root>
\ No newline at end of file
diff --git a/openpype/modules/deadline/plugins/publish/submit_aftereffects_deadline.py b/openpype/modules/deadline/plugins/publish/submit_aftereffects_deadline.py
index ba79e1ed4d..b6584f239e 100644
--- a/openpype/modules/deadline/plugins/publish/submit_aftereffects_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_aftereffects_deadline.py
@@ -36,8 +36,6 @@ class AfterEffectsSubmitDeadline(
 
     priority = 50
     chunk_size = 1000000
-    primary_pool = None
-    secondary_pool = None
     group = None
     department = None
     multiprocess = True
@@ -61,8 +59,8 @@ class AfterEffectsSubmitDeadline(
             dln_job_info.Frames = frame_range
 
         dln_job_info.Priority = self.priority
-        dln_job_info.Pool = self.primary_pool
-        dln_job_info.SecondaryPool = self.secondary_pool
+        dln_job_info.Pool = self._instance.data.get("primaryPool")
+        dln_job_info.SecondaryPool = self._instance.data.get("secondaryPool")
         dln_job_info.Group = self.group
         dln_job_info.Department = self.department
         dln_job_info.ChunkSize = self.chunk_size
diff --git a/openpype/modules/deadline/plugins/publish/submit_harmony_deadline.py b/openpype/modules/deadline/plugins/publish/submit_harmony_deadline.py
index dda7f7f3aa..912f0f4026 100644
--- a/openpype/modules/deadline/plugins/publish/submit_harmony_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_harmony_deadline.py
@@ -241,8 +241,6 @@ class HarmonySubmitDeadline(
 
     optional = True
     use_published = False
-    primary_pool = ""
-    secondary_pool = ""
     priority = 50
     chunk_size = 1000000
     group = "none"
@@ -259,8 +257,8 @@ class HarmonySubmitDeadline(
         # for now, get those from presets. Later on it should be
         # configurable in Harmony UI directly.
         job_info.Priority = self.priority
-        job_info.Pool = self.primary_pool
-        job_info.SecondaryPool = self.secondary_pool
+        job_info.Pool = self._instance.data.get("primaryPool")
+        job_info.SecondaryPool = self._instance.data.get("secondaryPool")
         job_info.ChunkSize = self.chunk_size
         job_info.BatchName = os.path.basename(self._instance.data["source"])
         job_info.Department = self.department
diff --git a/openpype/modules/deadline/plugins/publish/submit_houdini_render_deadline.py b/openpype/modules/deadline/plugins/publish/submit_houdini_render_deadline.py
index b94ad24397..aca88c7440 100644
--- a/openpype/modules/deadline/plugins/publish/submit_houdini_render_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_houdini_render_deadline.py
@@ -5,7 +5,7 @@ import getpass
 import requests
 import pyblish.api
 
-import hou
+# import hou  ???
 
 from openpype.pipeline import legacy_io
 
@@ -71,7 +71,8 @@ class HoudiniSubmitRenderDeadline(pyblish.api.InstancePlugin):
                 "UserName": deadline_user,
 
                 "Plugin": "Houdini",
-                "Pool": "houdini_redshift",  # todo: remove hardcoded pool
+                "Pool": instance.data.get("primaryPool"),
+                "secondaryPool": instance.data.get("secondaryPool"),
                 "Frames": frames,
 
                 "ChunkSize": instance.data.get("chunkSize", 10),
diff --git a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
index 37bdaede1c..819e8fb585 100644
--- a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
@@ -34,6 +34,7 @@ from maya import cmds
 
 import pyblish.api
 
+from openpype.lib import requests_post
 from openpype.hosts.maya.api import lib
 from openpype.pipeline import legacy_io
 
@@ -700,7 +701,7 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
             tiles_count = instance.data.get("tilesX") * instance.data.get("tilesY")  # noqa: E501
 
             for tile_job in frame_payloads:
-                response = self._requests_post(url, json=tile_job)
+                response = requests_post(url, json=tile_job)
                 if not response.ok:
                     raise Exception(response.text)
 
@@ -763,7 +764,7 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
                     job_idx, len(assembly_payloads)
                 ))
                 self.log.debug(json.dumps(ass_job, indent=4, sort_keys=True))
-                response = self._requests_post(url, json=ass_job)
+                response = requests_post(url, json=ass_job)
                 if not response.ok:
                     raise Exception(response.text)
 
@@ -781,7 +782,7 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
 
             # E.g. http://192.168.0.1:8082/api/jobs
             url = "{}/api/jobs".format(self.deadline_url)
-            response = self._requests_post(url, json=payload)
+            response = requests_post(url, json=payload)
             if not response.ok:
                 raise Exception(response.text)
             instance.data["deadlineSubmissionJob"] = response.json()
@@ -989,7 +990,7 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
             self.log.info("Submitting ass export job.")
 
         url = "{}/api/jobs".format(self.deadline_url)
-        response = self._requests_post(url, json=payload)
+        response = requests_post(url, json=payload)
         if not response.ok:
             self.log.error("Submition failed!")
             self.log.error(response.status_code)
@@ -1013,44 +1014,6 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
                 % (value, int(value))
             )
 
-    def _requests_post(self, *args, **kwargs):
-        """Wrap request post method.
-
-        Disabling SSL certificate validation if ``DONT_VERIFY_SSL`` environment
-        variable is found. This is useful when Deadline or Muster server are
-        running with self-signed certificates and their certificate is not
-        added to trusted certificates on client machines.
-
-        Warning:
-            Disabling SSL certificate validation is defeating one line
-            of defense SSL is providing and it is not recommended.
-
-        """
-        if 'verify' not in kwargs:
-            kwargs['verify'] = not os.getenv("OPENPYPE_DONT_VERIFY_SSL", True)
-        # add 10sec timeout before bailing out
-        kwargs['timeout'] = 10
-        return requests.post(*args, **kwargs)
-
-    def _requests_get(self, *args, **kwargs):
-        """Wrap request get method.
-
-        Disabling SSL certificate validation if ``DONT_VERIFY_SSL`` environment
-        variable is found. This is useful when Deadline or Muster server are
-        running with self-signed certificates and their certificate is not
-        added to trusted certificates on client machines.
-
-        Warning:
-            Disabling SSL certificate validation is defeating one line
-            of defense SSL is providing and it is not recommended.
-
-        """
-        if 'verify' not in kwargs:
-            kwargs['verify'] = not os.getenv("OPENPYPE_DONT_VERIFY_SSL", True)
-        # add 10sec timeout before bailing out
-        kwargs['timeout'] = 10
-        return requests.get(*args, **kwargs)
-
     def format_vray_output_filename(self, filename, template, dir=False):
         """Format the expected output file of the Export job.
 
diff --git a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py
index 942d442c25..ed0041b153 100644
--- a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py
@@ -28,8 +28,6 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin):
     priority = 50
     chunk_size = 1
     concurrent_tasks = 1
-    primary_pool = ""
-    secondary_pool = ""
     group = ""
     department = ""
     limit_groups = {}
@@ -187,8 +185,8 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin):
 
                 "Department": self.department,
 
-                "Pool": self.primary_pool,
-                "SecondaryPool": self.secondary_pool,
+                "Pool": instance.data.get("primaryPool"),
+                "SecondaryPool": instance.data.get("secondaryPool"),
                 "Group": self.group,
 
                 "Plugin": "Nuke",
diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py
index 78e05d80fc..4b5c2a1d5d 100644
--- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py
+++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py
@@ -15,6 +15,7 @@ from openpype.pipeline import (
     get_representation_path,
     legacy_io,
 )
+from openpype.pipeline.farm.patterning import match_aov_pattern
 
 
 def get_resources(version, extension=None):
@@ -108,7 +109,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
     families = ["render.farm", "prerender.farm",
                 "renderlayer", "imagesequence", "vrayscene"]
 
-    aov_filter = {"maya": [r".*(?:[\._-])*([Bb]eauty)(?:[\.|_])*.*"],
+    aov_filter = {"maya": [r".*([Bb]eauty).*"],
                   "aftereffects": [r".*"],  # for everything from AE
                   "harmony": [r".*"],  # for everything from AE
                   "celaction": [r".*"]}
@@ -130,7 +131,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
         "OPENPYPE_PUBLISH_JOB"
     ]
 
-    # custom deadline atributes
+    # custom deadline attributes
     deadline_department = ""
     deadline_pool = ""
     deadline_pool_secondary = ""
@@ -260,8 +261,8 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
                 "Priority": priority,
 
                 "Group": self.deadline_group,
-                "Pool": self.deadline_pool,
-                "SecondaryPool": self.deadline_pool_secondary,
+                "Pool": instance.data.get("primaryPool"),
+                "SecondaryPool": instance.data.get("secondaryPool"),
 
                 "OutputDirectory0": output_dir
             },
@@ -450,12 +451,15 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
             app = os.environ.get("AVALON_APP", "")
 
             preview = False
-            if app in self.aov_filter.keys():
-                for aov_pattern in self.aov_filter[app]:
-                    if re.match(aov_pattern, aov):
-                        preview = True
-                        break
 
+            if isinstance(col, list):
+                render_file_name = os.path.basename(col[0])
+            else:
+                render_file_name = os.path.basename(col)
+            aov_patterns = self.aov_filter
+            preview = match_aov_pattern(app, aov_patterns, render_file_name)
+
+            # toggle preview on if multipart is on
             if instance_data.get("multipartExr"):
                 preview = True
 
@@ -533,22 +537,17 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
             #   should be review made.
             # - "review" tag is never added when is set to 'False'
             if instance["useSequenceForReview"]:
-                # if filtered aov name is found in filename, toggle it for
-                # preview video rendering
-                for app in self.aov_filter.keys():
-                    if os.environ.get("AVALON_APP", "") == app:
-                        # iteratre all aov filters
-                        for aov in self.aov_filter[app]:
-                            if re.match(
-                                aov,
-                                list(collection)[0]
-                            ):
-                                preview = True
-                                break
-
                 # toggle preview on if multipart is on
                 if instance.get("multipartExr", False):
                     preview = True
+                else:
+                    render_file_name = list(collection)[0]
+                    host_name = os.environ.get("AVALON_APP", "")
+                    # if filtered aov name is found in filename, toggle it for
+                    # preview video rendering
+                    preview = match_aov_pattern(
+                        host_name, self.aov_filter, render_file_name
+                    )
 
             staging = os.path.dirname(list(collection)[0])
             success, rootless_staging_dir = (
diff --git a/openpype/modules/deadline/plugins/publish/validate_deadline_pools.py b/openpype/modules/deadline/plugins/publish/validate_deadline_pools.py
new file mode 100644
index 0000000000..78eed17c98
--- /dev/null
+++ b/openpype/modules/deadline/plugins/publish/validate_deadline_pools.py
@@ -0,0 +1,48 @@
+import pyblish.api
+
+from openpype.pipeline import (
+    PublishXmlValidationError,
+    OptionalPyblishPluginMixin
+)
+from openpype.modules.deadline.deadline_module import DeadlineModule
+
+
+class ValidateDeadlinePools(OptionalPyblishPluginMixin,
+                            pyblish.api.InstancePlugin):
+    """Validate primaryPool and secondaryPool on instance.
+
+    Values are on instance based on value insertion when Creating instance or
+    by Settings in CollectDeadlinePools.
+    """
+
+    label = "Validate Deadline Pools"
+    order = pyblish.api.ValidatorOrder
+    families = ["rendering", "render.farm", "renderFarm", "renderlayer"]
+    optional = True
+
+    def process(self, instance):
+        # get default deadline webservice url from deadline module
+        deadline_url = instance.context.data["defaultDeadline"]
+        self.log.info("deadline_url::{}".format(deadline_url))
+        pools = DeadlineModule.get_deadline_pools(deadline_url, log=self.log)
+        self.log.info("pools::{}".format(pools))
+
+        formatting_data = {
+            "pools_str": ",".join(pools)
+        }
+
+        primary_pool = instance.data.get("primaryPool")
+        if primary_pool and primary_pool not in pools:
+            msg = "Configured primary '{}' not present on Deadline".format(
+                instance.data["primaryPool"])
+            formatting_data["invalid_value_str"] = msg
+            raise PublishXmlValidationError(self, msg,
+                                            formatting_data=formatting_data)
+
+        secondary_pool = instance.data.get("secondaryPool")
+        if secondary_pool and secondary_pool not in pools:
+            msg = "Configured secondary '{}' not present on Deadline".format(
+                instance.data["secondaryPool"])
+            formatting_data["invalid_value_str"] = msg
+            raise PublishXmlValidationError(self, msg,
+                                            formatting_data=formatting_data)
diff --git a/openpype/pipeline/farm/__init__.py b/openpype/pipeline/farm/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/openpype/pipeline/farm/patterning.py b/openpype/pipeline/farm/patterning.py
new file mode 100644
index 0000000000..1e4b5bf37d
--- /dev/null
+++ b/openpype/pipeline/farm/patterning.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+import re
+
+
+def match_aov_pattern(host_name, aov_patterns, render_file_name):
+    """Matching against a `AOV` pattern in the render files.
+
+    In order to match the AOV name we must compare
+    against the render filename string that we are
+    grabbing the render filename string  from the collection
+    that we have grabbed from `exp_files`.
+
+    Args:
+        app (str): Host name.
+        aov_patterns (dict):  AOV patterns from AOV filters.
+        render_file_name (str): Incoming file name to match against.
+
+    Returns:
+        bool: Review state for rendered file (render_file_name).
+    """
+    aov_pattern = aov_patterns.get(host_name, [])
+    if not aov_pattern:
+        return False
+    return any(re.match(p, render_file_name) for p in aov_pattern)
diff --git a/openpype/scripts/fusion_switch_shot.py b/openpype/scripts/fusion_switch_shot.py
index 85a5821c6e..3ba150902e 100644
--- a/openpype/scripts/fusion_switch_shot.py
+++ b/openpype/scripts/fusion_switch_shot.py
@@ -4,13 +4,16 @@ import sys
 import logging
 
 # Pipeline imports
-from avalon import api, io
-import avalon.fusion
+from avalon import io
+from openpype.hosts.fusion import api
+import openpype.hosts.fusion.api.lib as fusion_lib
 
 # Config imports
-import openpype.lib as pype
-from openpype.pipeline import registered_host
-import openpype.hosts.fusion.lib as fusion_lib
+from openpype.lib import version_up
+from openpype.pipeline import (
+    install_host,
+    registered_host,
+)
 
 from openpype.lib.avalon_context import get_workdir_from_session
 
@@ -80,7 +83,7 @@ def _format_filepath(session):
 
     # Create new unqiue filepath
     if os.path.exists(new_filepath):
-        new_filepath = pype.version_up(new_filepath)
+        new_filepath = version_up(new_filepath)
 
     return new_filepath
 
@@ -103,7 +106,7 @@ def _update_savers(comp, session):
 
     comp.Print("New renders to: %s\n" % renders)
 
-    with avalon.fusion.comp_lock_and_undo_chunk(comp):
+    with api.comp_lock_and_undo_chunk(comp):
         savers = comp.GetToolList(False, "Saver").values()
         for saver in savers:
             filepath = saver.GetAttrs("TOOLST_Clip_Name")[1.0]
@@ -165,12 +168,12 @@ def switch(asset_name, filepath=None, new=True):
     # Get current project
     self._project = io.find_one({
         "type": "project",
-        "name": api.Session["AVALON_PROJECT"]
+        "name": io.Session["AVALON_PROJECT"]
     })
 
     # Go to comp
     if not filepath:
-        current_comp = avalon.fusion.get_current_comp()
+        current_comp = api.get_current_comp()
         assert current_comp is not None, "Could not find current comp"
     else:
         fusion = _get_fusion_instance()
@@ -195,7 +198,7 @@ def switch(asset_name, filepath=None, new=True):
     current_comp.Print(message)
 
     # Build the session to switch to
-    switch_to_session = api.Session.copy()
+    switch_to_session = io.Session.copy()
     switch_to_session["AVALON_ASSET"] = asset['name']
 
     if new:
@@ -204,7 +207,7 @@ def switch(asset_name, filepath=None, new=True):
         # Update savers output based on new session
         _update_savers(current_comp, switch_to_session)
     else:
-        comp_path = pype.version_up(filepath)
+        comp_path = version_up(filepath)
 
     current_comp.Print(comp_path)
 
@@ -235,7 +238,7 @@ if __name__ == '__main__':
 
     args, unknown = parser.parse_args()
 
-    api.install(avalon.fusion)
+    install_host(api)
     switch(args.asset_name, args.file_path)
 
     sys.exit(0)
diff --git a/openpype/scripts/non_python_host_launch.py b/openpype/scripts/non_python_host_launch.py
index 43921f0483..f795af7bb3 100644
--- a/openpype/scripts/non_python_host_launch.py
+++ b/openpype/scripts/non_python_host_launch.py
@@ -15,7 +15,7 @@ CURRENT_FILE = os.path.abspath(__file__)
 def show_error_messagebox(title, message, detail_message=None):
     """Function will show message and process ends after closing it."""
     from Qt import QtWidgets, QtCore
-    from avalon import style
+    from openpype import style
 
     app = QtWidgets.QApplication([])
     app.setStyleSheet(style.load_stylesheet())
diff --git a/openpype/settings/defaults/project_settings/deadline.json b/openpype/settings/defaults/project_settings/deadline.json
index 1ef169e387..f0b2a7e555 100644
--- a/openpype/settings/defaults/project_settings/deadline.json
+++ b/openpype/settings/defaults/project_settings/deadline.json
@@ -4,6 +4,10 @@
         "CollectDefaultDeadlineServer": {
             "pass_mongo_url": false
         },
+        "CollectDeadlinePools": {
+            "primary_pool": "",
+            "secondary_pool": ""
+        },
         "ValidateExpectedFiles": {
             "enabled": true,
             "active": true,
@@ -38,8 +42,6 @@
             "priority": 50,
             "chunk_size": 10,
             "concurrent_tasks": 1,
-            "primary_pool": "",
-            "secondary_pool": "",
             "group": "",
             "department": "",
             "use_gpu": true,
@@ -54,8 +56,6 @@
             "use_published": true,
             "priority": 50,
             "chunk_size": 10000,
-            "primary_pool": "",
-            "secondary_pool": "",
             "group": "",
             "department": ""
         },
@@ -66,8 +66,6 @@
             "use_published": true,
             "priority": 50,
             "chunk_size": 10000,
-            "primary_pool": "",
-            "secondary_pool": "",
             "group": "",
             "department": "",
             "multiprocess": true
@@ -83,7 +81,7 @@
             "skip_integration_repre_list": [],
             "aov_filter": {
                 "maya": [
-                    ".+(?:\\.|_)([Bb]eauty)(?:\\.|_).*"
+                    ".*([Bb]eauty).*"
                 ],
                 "nuke": [
                     ".*"
@@ -100,4 +98,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
index 5bf0a81a4d..cd1741ba8b 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
@@ -30,6 +30,24 @@
                         }
                     ]
                 },
+                {
+                    "type": "dict",
+                    "collapsible": true,
+                    "key": "CollectDeadlinePools",
+                    "label": "Default Deadline Pools",
+                    "children": [
+                        {
+                            "type": "text",
+                            "key": "primary_pool",
+                            "label": "Primary Pool"
+                        },
+                        {
+                            "type": "text",
+                            "key": "secondary_pool",
+                            "label": "Secondary Pool"
+                        }
+                    ]
+                },
                 {
                     "type": "dict",
                     "collapsible": true,
@@ -223,16 +241,6 @@
                         {
                             "type": "splitter"
                         },
-                        {
-                            "type": "text",
-                            "key": "primary_pool",
-                            "label": "Primary Pool"
-                        },
-                        {
-                            "type": "text",
-                            "key": "secondary_pool",
-                            "label": "Secondary Pool"
-                        },
                         {
                             "type": "text",
                             "key": "group",
@@ -313,16 +321,6 @@
                             "key": "chunk_size",
                             "label": "Chunk Size"
                         },
-                        {
-                            "type": "text",
-                            "key": "primary_pool",
-                            "label": "Primary Pool"
-                        },
-                        {
-                            "type": "text",
-                            "key": "secondary_pool",
-                            "label": "Secondary Pool"
-                        },
                         {
                             "type": "text",
                             "key": "group",
@@ -372,16 +370,6 @@
                             "key": "chunk_size",
                             "label": "Chunk Size"
                         },
-                        {
-                            "type": "text",
-                            "key": "primary_pool",
-                            "label": "Primary Pool"
-                        },
-                        {
-                            "type": "text",
-                            "key": "secondary_pool",
-                            "label": "Secondary Pool"
-                        },
                         {
                             "type": "text",
                             "key": "group",
diff --git a/openpype/tools/stdout_broker/window.py b/openpype/tools/stdout_broker/window.py
index a2190e0491..f5720ca05b 100644
--- a/openpype/tools/stdout_broker/window.py
+++ b/openpype/tools/stdout_broker/window.py
@@ -1,7 +1,9 @@
-from avalon import style
-from Qt import QtWidgets, QtCore
-import collections
 import re
+import collections
+
+from Qt import QtWidgets
+
+from openpype import style
 
 
 class ConsoleDialog(QtWidgets.QDialog):