diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 655ffe289e..5a0ed1ae1d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,6 +1,6 @@
 name: Bug Report
 description: File a bug report
-title: 'Bug: '
+title: ''
 labels:
   - 'type: bug'
 body:
diff --git a/.github/ISSUE_TEMPLATE/enhancement_request.yml b/.github/ISSUE_TEMPLATE/enhancement_request.yml
index 52b49e0481..da4d0d9319 100644
--- a/.github/ISSUE_TEMPLATE/enhancement_request.yml
+++ b/.github/ISSUE_TEMPLATE/enhancement_request.yml
@@ -1,6 +1,6 @@
 name: Enhancement Request
 description: Create a report to help us enhance a particular feature
-title: "Enhancement: "
+title: ""
 labels:
   - "type: enhancement"
 body:
diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_vray_rop.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_vray_rop.py
index f80ca39f1c..62b7dcdd5d 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/collect_vray_rop.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_vray_rop.py
@@ -67,7 +67,7 @@ class CollectVrayROPRenderProducts(pyblish.api.InstancePlugin):
         beauty_product = self.get_render_product_name(default_prefix)
         render_products.append(beauty_product)
         files_by_aov = {
-            "RGB Color": self.generate_expected_files(instance,
+            "": self.generate_expected_files(instance,
                                                       beauty_product)}
 
         if instance.data.get("RenderElement", True):
@@ -75,7 +75,9 @@ class CollectVrayROPRenderProducts(pyblish.api.InstancePlugin):
             if render_element:
                 for aov, renderpass in render_element.items():
                     render_products.append(renderpass)
-                    files_by_aov[aov] = self.generate_expected_files(instance, renderpass)          # noqa
+                    files_by_aov[aov] = self.generate_expected_files(
+                        instance, renderpass)
+
 
         for product in render_products:
             self.log.debug("Found render product: %s" % product)
diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_instance_in_context.py b/client/ayon_core/hosts/max/plugins/publish/validate_instance_in_context.py
new file mode 100644
index 0000000000..963a601009
--- /dev/null
+++ b/client/ayon_core/hosts/max/plugins/publish/validate_instance_in_context.py
@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+"""Validate if instance context is the same as current context."""
+import pyblish.api
+from ayon_core.pipeline.publish import (
+    RepairAction,
+    ValidateContentsOrder,
+    PublishValidationError,
+    OptionalPyblishPluginMixin
+)
+from ayon_core.hosts.max.api.action import SelectInvalidAction
+from pymxs import runtime as rt
+
+
+class ValidateInstanceInContext(pyblish.api.InstancePlugin,
+                                OptionalPyblishPluginMixin):
+    """Validator to check if instance context match current context.
+
+    When working in per-shot style you always publish data in context of
+    current context (shot). This validator checks if this is so. It is optional
+    so it can be disabled when needed.
+
+    Action on this validator will select invalid instances.
+    """
+    order = ValidateContentsOrder
+    label = "Instance in same Context"
+    optional = True
+    hosts = ["max"]
+    actions = [SelectInvalidAction, RepairAction]
+
+    def process(self, instance):
+        if not self.is_active(instance.data):
+            return
+
+        folderPath = instance.data.get("folderPath")
+        task = instance.data.get("task")
+        context = self.get_context(instance)
+        if (folderPath, task) != context:
+            context_label = "{} > {}".format(*context)
+            instance_label = "{} > {}".format(folderPath, task)
+            message = (
+                "Instance '{}' publishes to different context than current "
+                "context: {}. Current context: {}".format(
+                    instance.name, instance_label, context_label
+                )
+            )
+            raise PublishValidationError(
+                message=message,
+                description=(
+                    "## Publishing to a different context data\n"
+                    "There are publish instances present which are publishing "
+                    "into a different folder path or task than your current context.\n\n"
+                    "Usually this is not what you want but there can be cases "
+                    "where you might want to publish into another context or "
+                    "shot. If that's the case you can disable the validation "
+                    "on the instance to ignore it."
+                )
+            )
+
+    @classmethod
+    def get_invalid(cls, instance):
+        invalid = []
+        folderPath = instance.data.get("folderPath")
+        task = instance.data.get("task")
+        context = cls.get_context(instance)
+        if (folderPath, task) != context:
+            invalid.append(rt.getNodeByName(instance.name))
+        return invalid
+
+    @classmethod
+    def repair(cls, instance):
+        context_asset = instance.context.data["folderPath"]
+        context_task = instance.context.data["task"]
+        instance_node = rt.getNodeByName(instance.data.get(
+            "instance_node", ""))
+        if not instance_node:
+            return
+        rt.SetUserProp(instance_node, "folderPath", context_asset)
+        rt.SetUserProp(instance_node, "task", context_task)
+
+    @staticmethod
+    def get_context(instance):
+        """Return asset, task from publishing context data"""
+        context = instance.context
+        return context.data["folderPath"], context.data["task"]
diff --git a/server_addon/max/server/settings/publishers.py b/server_addon/max/server/settings/publishers.py
index 6ea6a887d1..729b8aa006 100644
--- a/server_addon/max/server/settings/publishers.py
+++ b/server_addon/max/server/settings/publishers.py
@@ -65,10 +65,14 @@ class BasicValidateModel(BaseSettingsModel):
 
 
 class PublishersModel(BaseSettingsModel):
+    ValidateInstanceInContext: BasicValidateModel = SettingsField(
+        default_factory=BasicValidateModel,
+        title="Validate Instance In Context",
+        section="Validators"
+    )
     ValidateFrameRange: BasicValidateModel = SettingsField(
         default_factory=BasicValidateModel,
-        title="Validate Frame Range",
-        section="Validators"
+        title="Validate Frame Range"
     )
     ValidateAttributes: ValidateAttributesModel = SettingsField(
         default_factory=ValidateAttributesModel,
@@ -114,6 +118,11 @@ class PublishersModel(BaseSettingsModel):
 
 
 DEFAULT_PUBLISH_SETTINGS = {
+    "ValidateInstanceInContext": {
+        "enabled": True,
+        "optional": True,
+        "active": True
+    },
     "ValidateFrameRange": {
         "enabled": True,
         "optional": True,