diff --git a/client/ayon_core/hosts/nuke/plugins/publish/collect_headless_farm.py b/client/ayon_core/hosts/nuke/plugins/publish/collect_headless_farm.py
index f2af3551d9..dfd294cebc 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/collect_headless_farm.py
+++ b/client/ayon_core/hosts/nuke/plugins/publish/collect_headless_farm.py
@@ -28,9 +28,7 @@ def process(self, context):
 
             # Clear the families as we only want the main family, ei. no review
             # etc.
-            instance.data["families"] = []
+            instance.data["families"] = ["headless_farm"]
 
             # Use the workfile instead of published.
-            settings = instance.data["publish_attributes"]
-            settings = settings["NukeSubmitDeadline"]
-            settings["use_published_workfile"] = False
+            instance.data["use_published_workfile"] = False
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_headless_farm.py b/client/ayon_core/hosts/nuke/plugins/publish/extract_headless_farm.py
index be74a05392..003e51aa1a 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/extract_headless_farm.py
+++ b/client/ayon_core/hosts/nuke/plugins/publish/extract_headless_farm.py
@@ -13,6 +13,7 @@ class ExtractHeadlessFarm(pyblish.api.InstancePlugin):
     order = pyblish.api.ExtractorOrder + 0.499
     label = "Extract Headless Farm"
     hosts = ["nuke"]
+    families = ["headless_farm"]
 
     def process(self, instance):
         if not instance.context.data.get("headless_farm", False):
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py
index d70cb75bf3..751fb4c46a 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py
@@ -128,8 +128,11 @@ def process(self, instance):
         render_path = instance.data['path']
         script_path = context.data["currentFile"]
 
-        use_published_workfile = instance.data["attributeValues"].get(
-            "use_published_workfile", self.use_published_workfile
+        use_published_workfile = instance.data.get(
+            "use_published_workfile",
+            instance.data["attributeValues"].get(
+                "use_published_workfile", self.use_published_workfile
+            )
         )
         if use_published_workfile:
             script_path = self._get_published_workfile_path(context)
diff --git a/client/ayon_core/plugins/publish/validate_version.py b/client/ayon_core/plugins/publish/validate_version.py
index 9031194e8c..25a5757330 100644
--- a/client/ayon_core/plugins/publish/validate_version.py
+++ b/client/ayon_core/plugins/publish/validate_version.py
@@ -1,8 +1,10 @@
 import pyblish.api
-from ayon_core.pipeline.publish import PublishValidationError
+from ayon_core.pipeline.publish import (
+    PublishValidationError, OptionalPyblishPluginMixin
+)
 
 
-class ValidateVersion(pyblish.api.InstancePlugin):
+class ValidateVersion(pyblish.api.InstancePlugin, OptionalPyblishPluginMixin):
     """Validate instance version.
 
     AYON does not allow overwriting previously published versions.
@@ -18,6 +20,9 @@ class ValidateVersion(pyblish.api.InstancePlugin):
     active = True
 
     def process(self, instance):
+        if not self.is_active(instance.data):
+            return
+
         version = instance.data.get("version")
         latest_version = instance.data.get("latestVersion")