diff --git a/openpype/hosts/maya/api/pipeline.py b/openpype/hosts/maya/api/pipeline.py
index 6fc93e864f..0261694be2 100644
--- a/openpype/hosts/maya/api/pipeline.py
+++ b/openpype/hosts/maya/api/pipeline.py
@@ -66,20 +66,20 @@ def install():
     log.info("Installing callbacks ... ")
     register_event_callback("init", on_init)
 
-    # Callbacks below are not required for headless mode, the `init` however
-    # is important to load referenced Alembics correctly at rendertime.
+    if os.environ.get("HEADLESS_PUBLISH"):
+        # Maya launched on farm, lib.IS_HEADLESS might be triggered locally too
+        # target "farm" == rendering on farm, expects OPENPYPE_PUBLISH_DATA
+        # target "remote" == remote execution
+        print("Registering pyblish target: remote")
+        pyblish.api.register_target("remote")
+        return
+
     if lib.IS_HEADLESS:
         log.info(("Running in headless mode, skipping Maya "
                  "save/open/new callback installation.."))
 
         return
 
-    if os.environ.get("HEADLESS_PUBLISH"):
-        # Maya launched on farm, lib.IS_HEADLESS might be triggered locally too
-        print("Registering pyblish target: remote")
-        pyblish.api.register_target("remote")
-        return
-
     print("Registering pyblish target: local")
     pyblish.api.register_target("local")
 
diff --git a/openpype/scripts/remote_publish.py b/openpype/scripts/remote_publish.py
index b54c8d931b..8e5c91d663 100644
--- a/openpype/scripts/remote_publish.py
+++ b/openpype/scripts/remote_publish.py
@@ -1,6 +1,7 @@
 try:
     from openpype.api import Logger
     import openpype.lib.remote_publish
+    import pyblish.api
 except ImportError as exc:
     # Ensure Deadline fails by output an error that contains "Fatal Error:"
     raise ImportError("Fatal Error: %s" % exc)
@@ -8,4 +9,4 @@ except ImportError as exc:
 if __name__ == "__main__":
     # Perform remote publish with thorough error checking
     log = Logger.get_logger(__name__)
-    openpype.lib.remote_publish.publish(log)
+    openpype.lib.remote_publish.publish(log, raise_error=True)