diff --git a/openpype/hosts/max/api/lib_renderproducts.py b/openpype/hosts/max/api/lib_renderproducts.py
index 19c1048496..ba1ffc3a5e 100644
--- a/openpype/hosts/max/api/lib_renderproducts.py
+++ b/openpype/hosts/max/api/lib_renderproducts.py
@@ -70,7 +70,7 @@ class RenderProducts(object):
 
         return rgba_render_list, render_elem_list
 
-    def get_aov(self):
+    def get_aovs(self):
         folder = rt.maxFilePath
         folder = folder.replace("\\", "/")
         setting = self._project_settings
@@ -177,6 +177,8 @@ class RenderProducts(object):
 
         render_elem = rt.maxOps.GetCurRenderElementMgr()
         render_elem_num = render_elem.NumRenderElements()
+        if render_elem_num < 1:
+            return
         # get render elements from the renders
         for i in range(render_elem_num):
             renderlayer_name = render_elem.GetRenderElement(i)
diff --git a/openpype/hosts/max/plugins/publish/collect_render.py b/openpype/hosts/max/plugins/publish/collect_render.py
index 652c2e1d2c..c4a44a5b11 100644
--- a/openpype/hosts/max/plugins/publish/collect_render.py
+++ b/openpype/hosts/max/plugins/publish/collect_render.py
@@ -45,23 +45,8 @@ class CollectRender(pyblish.api.InstancePlugin):
         }
 
         folder = folder.replace("\\", "/")
-        if aov_list:
-            if renderer in [
-                "ART_Renderer",
-                "V_Ray_6_Hotfix_3",
-                "V_Ray_GPU_6_Hotfix_3"
-                "Redshift_Renderer",
-                "Default_Scanline_Renderer",
-                "Quicksilver_Hardware_Renderer",
-            ]:
-
-                render_element = RenderProducts().get_aov()
-                files_by_aov.update(render_element)
-                self.log.debug(files_by_aov)
-
-            if renderer == "Arnold":
-                aovs = RenderProducts().get_aovs()
-                files_by_aov.update(aovs)
+        aovs = RenderProducts().get_aovs()
+        files_by_aov.update(aovs)
 
         if "expectedFiles" not in instance.data:
             instance.data["expectedFiles"] = list()
diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py
index 7133cff058..68eb0a437d 100644
--- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py
+++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py
@@ -348,7 +348,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
         self.log.info("Submitting Deadline job ...")
 
         url = "{}/api/jobs".format(self.deadline_url)
-        response = requests.post(url, json=payload, timeout=10, verify=False)
+        response = requests.post(url, json=payload, timeout=10)
         if not response.ok:
             raise Exception(response.text)