diff --git a/bin/cdist-explorer-run-global b/bin/cdist-explorer-run-global
index 51052627..b13b898f 100755
--- a/bin/cdist-explorer-run-global
+++ b/bin/cdist-explorer-run-global
@@ -33,7 +33,7 @@ __cdist_echo info "Running global explorers "
 __cdist_dir push "${__cdist_explorer_dir}" "${__cdist_remote_explorer_dir}"
 
 # run the initial explorers remotely
-__cdist_run_remote "${__cdist_target_host}" cdist-remote-explorer-run  \
+__cdist_run_remote cdist-remote-explorer-run  \
    "$__cdist_name_var_explorer" "$__cdist_remote_explorer_dir"       \
    "$__cdist_remote_out_explorer_dir"
 
diff --git a/core/__cdist_object_code_run b/core/__cdist_object_code_run
index c07505fe..48b6514d 100755
--- a/core/__cdist_object_code_run
+++ b/core/__cdist_object_code_run
@@ -32,6 +32,6 @@ __cdist_object_code_run()
    __cdist_code_run "$__cdist_object_code_run_object" "${__cdist_name_gencode_local}"
 
    # Code remote
-   __cdist_run_remote "$__cdist_target_host" \
-      "__cdist_code_run" "$__cdist_object_code_run_object" "${__cdist_name_gencode_remote}"
+   __cdist_run_remote "__cdist_code_run" \
+      "$__cdist_object_code_run_object" "${__cdist_name_gencode_remote}"
 }
diff --git a/core/__cdist_run_remote b/core/__cdist_run_remote
index 697a1d68..3af7c540 100755
--- a/core/__cdist_run_remote
+++ b/core/__cdist_run_remote
@@ -28,6 +28,5 @@ __cdist_run_remote()
    ssh "${__cdist_remote_user}@${__cdist_target_host}"   \
       "export PATH=\"${__cdist_remote_bin_dir}:\$PATH\";" \
       "export __cdist_out_object_dir=\"$__cdist_remote_out_object_dir\";" \
-      ". cdist-config;" \
-      "$@"
+      "cdist-remote" "$@"
 }