diff --git a/openpype/hosts/houdini/plugins/publish/increment_current_file.py b/openpype/hosts/houdini/plugins/publish/increment_current_file.py
index 5cb14d732a..c990f481d3 100644
--- a/openpype/hosts/houdini/plugins/publish/increment_current_file.py
+++ b/openpype/hosts/houdini/plugins/publish/increment_current_file.py
@@ -2,10 +2,9 @@ import pyblish.api
 
 from openpype.lib import version_up
 from openpype.pipeline import registered_host
-from openpype.pipeline.publish import get_errored_plugins_from_context
 
 
-class IncrementCurrentFile(pyblish.api.InstancePlugin):
+class IncrementCurrentFile(pyblish.api.ContextPlugin):
     """Increment the current file.
 
     Saves the current scene with an increased version number.
@@ -15,30 +14,10 @@ class IncrementCurrentFile(pyblish.api.InstancePlugin):
     label = "Increment current file"
     order = pyblish.api.IntegratorOrder + 9.0
     hosts = ["houdini"]
-    families = ["colorbleed.usdrender", "redshift_rop"]
-    targets = ["local"]
+    families = ["workfile"]
+    optional = True
 
-    def process(self, instance):
-
-        # This should be a ContextPlugin, but this is a workaround
-        # for a bug in pyblish to run once for a family: issue #250
-        context = instance.context
-        key = "__hasRun{}".format(self.__class__.__name__)
-        if context.data.get(key, False):
-            return
-        else:
-            context.data[key] = True
-
-        context = instance.context
-        errored_plugins = get_errored_plugins_from_context(context)
-        if any(
-            plugin.__name__ == "HoudiniSubmitPublishDeadline"
-            for plugin in errored_plugins
-        ):
-            raise RuntimeError(
-                "Skipping incrementing current file because "
-                "submission to deadline failed."
-            )
+    def process(self, context):
 
         # Filename must not have changed since collecting
         host = registered_host()
diff --git a/openpype/hosts/houdini/plugins/publish/increment_current_file_deadline.py b/openpype/hosts/houdini/plugins/publish/increment_current_file_deadline.py
deleted file mode 100644
index cb0d7e3680..0000000000
--- a/openpype/hosts/houdini/plugins/publish/increment_current_file_deadline.py
+++ /dev/null
@@ -1,35 +0,0 @@
-import pyblish.api
-
-import hou
-from openpype.lib import version_up
-from openpype.pipeline.publish import get_errored_plugins_from_context
-
-
-class IncrementCurrentFileDeadline(pyblish.api.ContextPlugin):
-    """Increment the current file.
-
-    Saves the current scene with an increased version number.
-
-    """
-
-    label = "Increment current file"
-    order = pyblish.api.IntegratorOrder + 9.0
-    hosts = ["houdini"]
-    targets = ["deadline"]
-
-    def process(self, context):
-
-        errored_plugins = get_errored_plugins_from_context(context)
-        if any(
-            plugin.__name__ == "HoudiniSubmitPublishDeadline"
-            for plugin in errored_plugins
-        ):
-            raise RuntimeError(
-                "Skipping incrementing current file because "
-                "submission to deadline failed."
-            )
-
-        current_filepath = context.data["currentFile"]
-        new_filepath = version_up(current_filepath)
-
-        hou.hipFile.save(file_name=new_filepath, save_to_recent_files=True)