diff --git a/openpype/hosts/maya/plugins/publish/collect_fbx_animation.py b/openpype/hosts/maya/plugins/publish/collect_fbx_animation.py
index e1b2fc0b7b..fb045973b6 100644
--- a/openpype/hosts/maya/plugins/publish/collect_fbx_animation.py
+++ b/openpype/hosts/maya/plugins/publish/collect_fbx_animation.py
@@ -20,6 +20,7 @@ class CollectFbxAnimation(pyblish.api.InstancePlugin):
             if i.lower().endswith("skeletonanim_set")
         ]
         if skeleton_sets:
+            instance.data["families"].append("rig.fbx")
             for skeleton_set in skeleton_sets:
                 skeleton_content = cmds.ls(
                     cmds.sets(skeleton_set, query=True), long=True)
diff --git a/openpype/hosts/maya/plugins/publish/collect_rig_for_fbx.py b/openpype/hosts/maya/plugins/publish/collect_rig_for_fbx.py
index 6ade7451d6..853dcbb259 100644
--- a/openpype/hosts/maya/plugins/publish/collect_rig_for_fbx.py
+++ b/openpype/hosts/maya/plugins/publish/collect_rig_for_fbx.py
@@ -24,6 +24,7 @@ class CollectRigFbx(pyblish.api.InstancePlugin):
             if i.lower().endswith("skeletonmesh_set")
         ]
         if skeleton_sets or skeleton_mesh_sets:
+            instance.data["families"].append("rig.fbx")
             instance.data["skeleton_mesh"] = []
             for skeleton_set in skeleton_sets:
                 skeleton_content = cmds.ls(
diff --git a/openpype/hosts/maya/plugins/publish/extract_fbx_animation.py b/openpype/hosts/maya/plugins/publish/extract_fbx_animation.py
index 111a202f82..8c540a0101 100644
--- a/openpype/hosts/maya/plugins/publish/extract_fbx_animation.py
+++ b/openpype/hosts/maya/plugins/publish/extract_fbx_animation.py
@@ -22,7 +22,7 @@ class ExtractRigFBX(publish.Extractor,
     """
     order = pyblish.api.ExtractorOrder
     label = "Extract Animation (FBX)"
-    families = ["animation"]
+    families = ["rig.fbx"]
 
     def process(self, instance):
         if not self.is_active(instance.data):
diff --git a/openpype/hosts/maya/plugins/publish/extract_rig_fbx.py b/openpype/hosts/maya/plugins/publish/extract_rig_fbx.py
index 2aa02a21c3..ebaf8a83ca 100644
--- a/openpype/hosts/maya/plugins/publish/extract_rig_fbx.py
+++ b/openpype/hosts/maya/plugins/publish/extract_rig_fbx.py
@@ -22,7 +22,7 @@ class ExtractRigFBX(publish.Extractor,
     """
     order = pyblish.api.ExtractorOrder
     label = "Extract Rig (FBX)"
-    families = ["rig"]
+    families = ["rig.fbx"]
 
     def process(self, instance):
         if not self.is_active(instance.data):
diff --git a/openpype/hosts/maya/plugins/publish/validate_skeleton_rig_content.py b/openpype/hosts/maya/plugins/publish/validate_skeleton_rig_content.py
index b70d8e6f3f..0406b00ec6 100644
--- a/openpype/hosts/maya/plugins/publish/validate_skeleton_rig_content.py
+++ b/openpype/hosts/maya/plugins/publish/validate_skeleton_rig_content.py
@@ -17,9 +17,9 @@ class ValidateSkeletonRigContents(pyblish.api.InstancePlugin):
     """
 
     order = ValidateContentsOrder
-    label = "Rig Contents"
+    label = "Skeleton Rig Contents"
     hosts = ["maya"]
-    families = ["rig"]
+    families = ["rig.fbx"]
 
     accepted_output = ["mesh", "transform"]
     accepted_controllers = ["transform"]
@@ -27,9 +27,13 @@ class ValidateSkeletonRigContents(pyblish.api.InstancePlugin):
     def process(self, instance):
 
         objectsets = ["skeletonAnim_SET", "skeletonMesh_SET"]
-        missing = [obj for obj in objectsets if obj not in instance]
+        missing = [
+            key for key in objectsets if key not in instance.data["rig_sets"]
+        ]
         if missing:
-            self.log.debug("%s is missing %s" % (instance, missing))
+            self.log.debug(
+                "%s is missing sets: %s" % (instance, ", ".join(missing))
+            )
             return
 
         controls_set = instance.data["rig_sets"]["skeletonAnim_SET"]
diff --git a/openpype/hosts/maya/plugins/publish/validate_skeleton_rig_controller.py b/openpype/hosts/maya/plugins/publish/validate_skeleton_rig_controller.py
index 82e0d542ca..a31d13bcec 100644
--- a/openpype/hosts/maya/plugins/publish/validate_skeleton_rig_controller.py
+++ b/openpype/hosts/maya/plugins/publish/validate_skeleton_rig_controller.py
@@ -30,9 +30,9 @@ class ValidateSkeletonRigControllers(pyblish.api.InstancePlugin):
 
     """
     order = ValidateContentsOrder + 0.05
-    label = "Rig Controllers"
+    label = "Skeleton Rig Controllers"
     hosts = ["maya"]
-    families = ["rig"]
+    families = ["rig.fbx"]
     actions = [RepairAction,
                openpype.hosts.maya.api.action.SelectInvalidAction]
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_skeleton_rig_out_set_node_ids.py b/openpype/hosts/maya/plugins/publish/validate_skeleton_rig_out_set_node_ids.py
index d62bd68b15..73ad12f422 100644
--- a/openpype/hosts/maya/plugins/publish/validate_skeleton_rig_out_set_node_ids.py
+++ b/openpype/hosts/maya/plugins/publish/validate_skeleton_rig_out_set_node_ids.py
@@ -23,9 +23,9 @@ class ValidateSkeletonRigOutSetNodeIds(pyblish.api.InstancePlugin):
     """
 
     order = ValidateContentsOrder
-    families = ["rig"]
+    families = ["rig.fbx"]
     hosts = ['maya']
-    label = 'Rig Out Set Node Ids'
+    label = 'Skeleton Rig Out Set Node Ids'
     actions = [
         openpype.hosts.maya.api.action.SelectInvalidAction,
         RepairAction
diff --git a/openpype/hosts/maya/plugins/publish/validate_skeleton_rig_output_ids.py b/openpype/hosts/maya/plugins/publish/validate_skeleton_rig_output_ids.py
index 0b936d35f4..0d1e702749 100644
--- a/openpype/hosts/maya/plugins/publish/validate_skeleton_rig_output_ids.py
+++ b/openpype/hosts/maya/plugins/publish/validate_skeleton_rig_output_ids.py
@@ -26,9 +26,9 @@ class ValidateSkeletonRigOutputIds(pyblish.api.InstancePlugin):
 
     """
     order = ValidateContentsOrder + 0.05
-    label = "Rig Output Ids"
+    label = "Skeleton Rig Output Ids"
     hosts = ["maya"]
-    families = ["rig"]
+    families = ["rig.fbx"]
     actions = [RepairAction,
                openpype.hosts.maya.api.action.SelectInvalidAction]
 
diff --git a/openpype/plugins/publish/integrate.py b/openpype/plugins/publish/integrate.py
index 7e48155b9e..2e122b652e 100644
--- a/openpype/plugins/publish/integrate.py
+++ b/openpype/plugins/publish/integrate.py
@@ -105,6 +105,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
                 "review",
                 "rendersetup",
                 "rig",
+                "rig.fbx",
                 "plate",
                 "look",
                 "audio",