diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_model_name.py b/client/ayon_core/hosts/max/plugins/publish/validate_model_name.py
index a0cad4e454..eb86e2e5bd 100644
--- a/client/ayon_core/hosts/max/plugins/publish/validate_model_name.py
+++ b/client/ayon_core/hosts/max/plugins/publish/validate_model_name.py
@@ -103,8 +103,8 @@ class ValidateModelName(pyblish.api.InstancePlugin,
         invalid = False
         compare = {
             "project": instance.context.data["projectName"],
-            "asset": instance.context.data["folderPath"],
-            "subset": instance.context.data["subset"],
+            "asset": instance.data["folderPath"],
+            "subset": instance.data["productName"]
         }
         for key, required_value in compare.items():
             if key in regex.groupindex:
diff --git a/client/ayon_core/tools/workfiles/control.py b/client/ayon_core/tools/workfiles/control.py
index 86c6a62a11..6793cb23a9 100644
--- a/client/ayon_core/tools/workfiles/control.py
+++ b/client/ayon_core/tools/workfiles/control.py
@@ -573,6 +573,7 @@ class BaseWorkfileController(
                 workdir,
                 filename,
                 template_key,
+                src_filepath=representation_filepath
             )
         except Exception:
             failed = True