diff --git a/scripts/docker/entrypoint.inc.sh b/scripts/docker/entrypoint.inc.sh
index 832163bad..82494f9e9 100644
--- a/scripts/docker/entrypoint.inc.sh
+++ b/scripts/docker/entrypoint.inc.sh
@@ -112,7 +112,7 @@ launch_baker() {
     wait_for_the_node_to_be_bootstraped
     exec "$baker" --base-dir "$client_dir" \
          --addr "$NODE_HOST" --port "$NODE_RPC_PORT" \
-	 launch with context "$node_data_dir/context/"
+	 run with local node "$node_data_dir"
 }
 
 launch_endorser() {
@@ -120,5 +120,5 @@ launch_endorser() {
     wait_for_the_node_to_be_bootstraped
     exec "$endorser" --base-dir "$client_dir" \
          --addr "$NODE_HOST" --port "$NODE_RPC_PORT" \
-	 launch
+	 run --endorsement-delay 10
 }
diff --git a/src/proto_alpha/lib_delegate/delegate_commands.ml b/src/proto_alpha/lib_delegate/delegate_commands.ml
index bea84ba14..906a440af 100644
--- a/src/proto_alpha/lib_delegate/delegate_commands.ml
+++ b/src/proto_alpha/lib_delegate/delegate_commands.ml
@@ -63,17 +63,17 @@ let baker_commands () =
   [
     command ~group ~desc: "Launch the baker daemon."
       (args1 max_priority_arg)
-      (prefixes [ "launch" ; "with" ; "context" ]
+      (prefixes [ "run" ; "with" ; "local" ; "node" ]
        @@ param
          ~name:"context_path"
-         ~desc:"Path to the shell context (e.g. tezos-node.XXXXX/context/)"
+         ~desc:"Path to the node data directory (e.g. $HOME/.tezos-node)"
          directory_parameter
        @@ seq_of_param Client_keys.Public_key_hash.alias_param)
-      (fun max_priority context_path delegates cctxt ->
+      (fun max_priority node_path delegates cctxt ->
          Client_daemon.Baker.run cctxt
            ?max_priority
            ~min_date:((Time.add (Time.now ()) (Int64.neg 1800L)))
-           ~context_path
+           ~context_path:(Filename.concat node_path "context")
            (List.map snd delegates)
       )
   ]
@@ -87,7 +87,7 @@ let endorser_commands () =
   [
     command ~group ~desc: "Launch the endorser daemon"
       (args1 endorsement_delay_arg )
-      (prefixes [ "launch" ]
+      (prefixes [ "run" ]
        @@ seq_of_param Client_keys.Public_key_hash.alias_param)
       (fun endorsement_delay delegates cctxt ->
          Client_daemon.Endorser.run cctxt
@@ -106,7 +106,7 @@ let accuser_commands () =
   [
     command ~group ~desc: "Launch the accuser daemon"
       no_options
-      (prefixes [ "launch" ]
+      (prefixes [ "run" ]
        @@ stop)
       (fun () cctxt -> Client_daemon.Accuser.run cctxt) ;
   ]