diff --git a/openpype/client/server/conversion_utils.py b/openpype/client/server/conversion_utils.py
index 51af99e722..e8d3c4cbe4 100644
--- a/openpype/client/server/conversion_utils.py
+++ b/openpype/client/server/conversion_utils.py
@@ -606,7 +606,7 @@ def convert_v4_version_to_v3(version):
             output_data[dst_key] = version[src_key]
 
     if "createdAt" in version:
-        created_at = arrow.get(version["createdAt"])
+        created_at = arrow.get(version["createdAt"]).to("local")
         output_data["time"] = created_at.strftime("%Y%m%dT%H%M%SZ")
 
     output["data"] = output_data
diff --git a/openpype/hosts/aftereffects/plugins/publish/extract_local_render.py b/openpype/hosts/aftereffects/plugins/publish/extract_local_render.py
index bdb48e11f8..b44e986d83 100644
--- a/openpype/hosts/aftereffects/plugins/publish/extract_local_render.py
+++ b/openpype/hosts/aftereffects/plugins/publish/extract_local_render.py
@@ -60,8 +60,9 @@ class ExtractLocalRender(publish.Extractor):
             first_repre = not representations
             if instance.data["review"] and first_repre:
                 repre_data["tags"] = ["review"]
-                thumbnail_path = os.path.join(staging_dir, files[0])
-                instance.data["thumbnailSource"] = thumbnail_path
+                # TODO return back when Extract from source same as regular
+                # thumbnail_path = os.path.join(staging_dir, files[0])
+                # instance.data["thumbnailSource"] = thumbnail_path
 
             representations.append(repre_data)
 
diff --git a/openpype/hosts/max/api/preview_animation.py b/openpype/hosts/max/api/preview_animation.py
index 6c7b8eaa80..74579b165f 100644
--- a/openpype/hosts/max/api/preview_animation.py
+++ b/openpype/hosts/max/api/preview_animation.py
@@ -198,8 +198,8 @@ def _render_preview_animation_max_pre_2024(
             res_width, res_height, filename=filepath
         )
         dib = rt.gw.getViewportDib()
-        dib_width = rt.renderWidth
-        dib_height = rt.renderHeight
+        dib_width = float(dib.width)
+        dib_height = float(dib.height)
         # aspect ratio
         viewportRatio = dib_width / dib_height
         renderRatio = float(res_width / res_height)
diff --git a/openpype/hosts/max/plugins/publish/validate_resolution_setting.py b/openpype/hosts/max/plugins/publish/validate_resolution_setting.py
index 7d91a7b991..1c4b05c556 100644
--- a/openpype/hosts/max/plugins/publish/validate_resolution_setting.py
+++ b/openpype/hosts/max/plugins/publish/validate_resolution_setting.py
@@ -1,9 +1,12 @@
 import pyblish.api
+from pymxs import runtime as rt
 from openpype.pipeline import (
-    PublishValidationError,
     OptionalPyblishPluginMixin
 )
-from pymxs import runtime as rt
+from openpype.pipeline.publish import (
+    RepairAction,
+    PublishValidationError
+)
 from openpype.hosts.max.api.lib import reset_scene_resolution
 
 
@@ -16,6 +19,7 @@ class ValidateResolutionSetting(pyblish.api.InstancePlugin,
     hosts = ["max"]
     label = "Validate Resolution Setting"
     optional = True
+    actions = [RepairAction]
 
     def process(self, instance):
         if not self.is_active(instance.data):
diff --git a/openpype/lib/openpype_version.py b/openpype/lib/openpype_version.py
index 1c8356d5fe..5618eb0c2e 100644
--- a/openpype/lib/openpype_version.py
+++ b/openpype/lib/openpype_version.py
@@ -140,7 +140,7 @@ def is_running_staging():
             latest_version = get_latest_version(local=False, remote=True)
         staging_version = latest_version
 
-    if current_version == production_version:
+    if current_version == staging_version:
         return True
 
     return is_staging_enabled()
diff --git a/openpype/resources/__init__.py b/openpype/resources/__init__.py
index b33d1bf023..c429fb8c3e 100644
--- a/openpype/resources/__init__.py
+++ b/openpype/resources/__init__.py
@@ -1,6 +1,6 @@
 import os
 from openpype import AYON_SERVER_ENABLED
-from openpype.lib.openpype_version import is_running_staging
+from openpype.lib.openpype_version import is_staging_enabled
 
 RESOURCES_DIR = os.path.dirname(os.path.abspath(__file__))
 
@@ -59,7 +59,7 @@ def get_openpype_icon_filepath(staging=None):
         return get_resource("icons", "AYON_icon_dev.png")
 
     if staging is None:
-        staging = is_running_staging()
+        staging = is_staging_enabled()
 
     if staging:
         return get_openpype_staging_icon_filepath()
@@ -68,7 +68,7 @@ def get_openpype_icon_filepath(staging=None):
 
 def get_openpype_splash_filepath(staging=None):
     if staging is None:
-        staging = is_running_staging()
+        staging = is_staging_enabled()
 
     if AYON_SERVER_ENABLED:
         if os.getenv("AYON_USE_DEV") == "1":
diff --git a/openpype/tools/ayon_loader/models/products.py b/openpype/tools/ayon_loader/models/products.py
index daa36aefdc..135f28df97 100644
--- a/openpype/tools/ayon_loader/models/products.py
+++ b/openpype/tools/ayon_loader/models/products.py
@@ -44,7 +44,7 @@ def version_item_from_entity(version):
     # NOTE There is also 'updatedAt', should be used that instead?
     # TODO skip conversion - converting to '%Y%m%dT%H%M%SZ' is because
     #   'PrettyTimeDelegate' expects it
-    created_at = arrow.get(version["createdAt"])
+    created_at = arrow.get(version["createdAt"]).to("local")
     published_time = created_at.strftime("%Y%m%dT%H%M%SZ")
     author = version["author"]
     version_num = version["version"]
diff --git a/openpype/tools/ayon_workfiles/models/workfiles.py b/openpype/tools/ayon_workfiles/models/workfiles.py
index 907b9b5383..d74a8e164d 100644
--- a/openpype/tools/ayon_workfiles/models/workfiles.py
+++ b/openpype/tools/ayon_workfiles/models/workfiles.py
@@ -606,7 +606,7 @@ class PublishWorkfilesModel:
             print("Failed to format workfile path: {}".format(exc))
 
         dirpath, filename = os.path.split(workfile_path)
-        created_at = arrow.get(repre_entity["createdAt"])
+        created_at = arrow.get(repre_entity["createdAt"].to("local"))
         return FileItem(
             dirpath,
             filename,
diff --git a/tests/integration/hosts/aftereffects/test_deadline_publish_in_aftereffects.py b/tests/integration/hosts/aftereffects/test_deadline_publish_in_aftereffects.py
index 30761693a8..1aa612207d 100644
--- a/tests/integration/hosts/aftereffects/test_deadline_publish_in_aftereffects.py
+++ b/tests/integration/hosts/aftereffects/test_deadline_publish_in_aftereffects.py
@@ -60,7 +60,7 @@ class TestDeadlinePublishInAfterEffects(AEDeadlinePublishTestClass):
                                     name="renderTest_taskMain"))
 
         failures.append(
-            DBAssert.count_of_types(dbcon, "representation", 4))
+            DBAssert.count_of_types(dbcon, "representation", 3))
 
         additional_args = {"context.subset": "workfileTest_task",
                            "context.ext": "aep"}
@@ -77,7 +77,7 @@ class TestDeadlinePublishInAfterEffects(AEDeadlinePublishTestClass):
         additional_args = {"context.subset": "renderTest_taskMain",
                            "name": "thumbnail"}
         failures.append(
-            DBAssert.count_of_types(dbcon, "representation", 1,
+            DBAssert.count_of_types(dbcon, "representation", 0,
                                     additional_args=additional_args))
 
         additional_args = {"context.subset": "renderTest_taskMain",
diff --git a/tests/integration/hosts/aftereffects/test_deadline_publish_in_aftereffects_multicomposition.py b/tests/integration/hosts/aftereffects/test_deadline_publish_in_aftereffects_multicomposition.py
index 0e9cd3b00d..4254b951b5 100644
--- a/tests/integration/hosts/aftereffects/test_deadline_publish_in_aftereffects_multicomposition.py
+++ b/tests/integration/hosts/aftereffects/test_deadline_publish_in_aftereffects_multicomposition.py
@@ -71,7 +71,7 @@ class TestDeadlinePublishInAfterEffectsMultiComposition(AEDeadlinePublishTestCla
                                     name="renderTest_taskMain2"))
 
         failures.append(
-            DBAssert.count_of_types(dbcon, "representation", 5))
+            DBAssert.count_of_types(dbcon, "representation", 4))
 
         additional_args = {"context.subset": "workfileTest_task",
                            "context.ext": "aep"}
@@ -89,7 +89,7 @@ class TestDeadlinePublishInAfterEffectsMultiComposition(AEDeadlinePublishTestCla
         additional_args = {"context.subset": "renderTest_taskMain",
                            "name": "thumbnail"}
         failures.append(
-            DBAssert.count_of_types(dbcon, "representation", 1,
+            DBAssert.count_of_types(dbcon, "representation", 0,
                                     additional_args=additional_args))
 
         additional_args = {"context.subset": "renderTest_taskMain",
diff --git a/tests/integration/hosts/aftereffects/test_publish_in_aftereffects.py b/tests/integration/hosts/aftereffects/test_publish_in_aftereffects.py
index 2e4f343a5a..f13043d8bb 100644
--- a/tests/integration/hosts/aftereffects/test_publish_in_aftereffects.py
+++ b/tests/integration/hosts/aftereffects/test_publish_in_aftereffects.py
@@ -58,7 +58,7 @@ class TestPublishInAfterEffects(AELocalPublishTestClass):
                                     name="renderTest_taskMain"))
 
         failures.append(
-            DBAssert.count_of_types(dbcon, "representation", 4))
+            DBAssert.count_of_types(dbcon, "representation", 3))
 
         additional_args = {"context.subset": "workfileTest_task",
                            "context.ext": "aep"}
@@ -75,7 +75,7 @@ class TestPublishInAfterEffects(AELocalPublishTestClass):
         additional_args = {"context.subset": "renderTest_taskMain",
                            "name": "thumbnail"}
         failures.append(
-            DBAssert.count_of_types(dbcon, "representation", 1,
+            DBAssert.count_of_types(dbcon, "representation", 0,
                                     additional_args=additional_args))
 
         additional_args = {"context.subset": "renderTest_taskMain",
diff --git a/tests/integration/hosts/aftereffects/test_publish_in_aftereffects_legacy.py b/tests/integration/hosts/aftereffects/test_publish_in_aftereffects_legacy.py
index a62036e4a7..b99db24e75 100644
--- a/tests/integration/hosts/aftereffects/test_publish_in_aftereffects_legacy.py
+++ b/tests/integration/hosts/aftereffects/test_publish_in_aftereffects_legacy.py
@@ -60,7 +60,7 @@ class TestPublishInAfterEffects(AELocalPublishTestClass):
                                     name="renderTest_taskMain"))
 
         failures.append(
-            DBAssert.count_of_types(dbcon, "representation", 4))
+            DBAssert.count_of_types(dbcon, "representation", 2))
 
         additional_args = {"context.subset": "workfileTest_task",
                            "context.ext": "aep"}
@@ -77,7 +77,7 @@ class TestPublishInAfterEffects(AELocalPublishTestClass):
         additional_args = {"context.subset": "renderTest_taskMain",
                            "name": "thumbnail"}
         failures.append(
-            DBAssert.count_of_types(dbcon, "representation", 1,
+            DBAssert.count_of_types(dbcon, "representation", 0,
                                     additional_args=additional_args))
 
         additional_args = {"context.subset": "renderTest_taskMain",
@@ -89,7 +89,7 @@ class TestPublishInAfterEffects(AELocalPublishTestClass):
         additional_args = {"context.subset": "renderTest_taskMain",
                            "name": "thumbnail"}
         failures.append(
-            DBAssert.count_of_types(dbcon, "representation", 1,
+            DBAssert.count_of_types(dbcon, "representation", 0,
                                     additional_args=additional_args))
 
         additional_args = {"context.subset": "renderTest_taskMain",
diff --git a/tests/integration/hosts/aftereffects/test_publish_in_aftereffects_multiframe.py b/tests/integration/hosts/aftereffects/test_publish_in_aftereffects_multiframe.py
index dcf34844d1..bd9d3e9b50 100644
--- a/tests/integration/hosts/aftereffects/test_publish_in_aftereffects_multiframe.py
+++ b/tests/integration/hosts/aftereffects/test_publish_in_aftereffects_multiframe.py
@@ -45,7 +45,7 @@ class TestPublishInAfterEffects(AELocalPublishTestClass):
                                     name="renderTest_taskMain"))
 
         failures.append(
-            DBAssert.count_of_types(dbcon, "representation", 4))
+            DBAssert.count_of_types(dbcon, "representation", 3))
 
         additional_args = {"context.subset": "workfileTest_task",
                            "context.ext": "aep"}
@@ -62,7 +62,7 @@ class TestPublishInAfterEffects(AELocalPublishTestClass):
         additional_args = {"context.subset": "renderTest_taskMain",
                            "name": "thumbnail"}
         failures.append(
-            DBAssert.count_of_types(dbcon, "representation", 1,
+            DBAssert.count_of_types(dbcon, "representation", 0,
                                     additional_args=additional_args))
 
         additional_args = {"context.subset": "renderTest_taskMain",
diff --git a/tests/integration/hosts/maya/test_deadline_publish_in_maya.py b/tests/integration/hosts/maya/test_deadline_publish_in_maya.py
index 7d2b409db3..79d6c22a26 100644
--- a/tests/integration/hosts/maya/test_deadline_publish_in_maya.py
+++ b/tests/integration/hosts/maya/test_deadline_publish_in_maya.py
@@ -54,7 +54,7 @@ class TestDeadlinePublishInMaya(MayaDeadlinePublishTestClass):
             DBAssert.count_of_types(dbcon, "subset", 1,
                                     name="workfileTest_task"))
 
-        failures.append(DBAssert.count_of_types(dbcon, "representation", 8))
+        failures.append(DBAssert.count_of_types(dbcon, "representation", 7))
 
         # hero included
         additional_args = {"context.subset": "modelMain",
@@ -85,7 +85,7 @@ class TestDeadlinePublishInMaya(MayaDeadlinePublishTestClass):
         additional_args = {"context.subset": "renderTest_taskMain_beauty",
                            "context.ext": "jpg"}
         failures.append(
-            DBAssert.count_of_types(dbcon, "representation", 1,
+            DBAssert.count_of_types(dbcon, "representation", 0,
                                     additional_args=additional_args))
 
         additional_args = {"context.subset": "renderTest_taskMain_beauty",
diff --git a/tests/integration/hosts/maya/test_deadline_publish_in_maya/expected/test_project/test_asset/publish/render/renderTest_taskMain_beauty/v001/test_project_test_asset_renderTest_taskMain_beauty_v001.jpg b/tests/integration/hosts/maya/test_deadline_publish_in_maya/expected/test_project/test_asset/publish/render/renderTest_taskMain_beauty/v001/test_project_test_asset_renderTest_taskMain_beauty_v001.jpg
deleted file mode 100644
index 79ff799e8b..0000000000
Binary files a/tests/integration/hosts/maya/test_deadline_publish_in_maya/expected/test_project/test_asset/publish/render/renderTest_taskMain_beauty/v001/test_project_test_asset_renderTest_taskMain_beauty_v001.jpg and /dev/null differ
diff --git a/tests/integration/hosts/nuke/test_deadline_publish_in_nuke.py b/tests/integration/hosts/nuke/test_deadline_publish_in_nuke.py
index a4026f195b..586078ead6 100644
--- a/tests/integration/hosts/nuke/test_deadline_publish_in_nuke.py
+++ b/tests/integration/hosts/nuke/test_deadline_publish_in_nuke.py
@@ -69,7 +69,7 @@ class TestDeadlinePublishInNuke(NukeDeadlinePublishTestClass):
                                     name="workfileTest_task"))
 
         failures.append(
-            DBAssert.count_of_types(dbcon, "representation", 4))
+            DBAssert.count_of_types(dbcon, "representation", 3))
 
         additional_args = {"context.subset": "workfileTest_task",
                            "context.ext": "nk"}
@@ -86,7 +86,7 @@ class TestDeadlinePublishInNuke(NukeDeadlinePublishTestClass):
         additional_args = {"context.subset": "renderTest_taskMain",
                            "name": "thumbnail"}
         failures.append(
-            DBAssert.count_of_types(dbcon, "representation", 1,
+            DBAssert.count_of_types(dbcon, "representation", 0,
                                     additional_args=additional_args))
 
         additional_args = {"context.subset": "renderTest_taskMain",