diff --git a/cli b/cli
index 1075f9409a784a3af5691724b48329f5ef2bc7a3..c37a8f6fab47b0c1d89f643666edd5e3defb19bb 100755
--- a/cli
+++ b/cli
@@ -17,8 +17,8 @@ cmdup="docker-compose up"
 cmddown="docker-compose down"
 cmdinitsubmodule="git submodule init"
 cmdupdatetsubmodule="git submodule update"
-cmdbuildmirador="docker run --rm -v mirador-video-annotation:/opt -it node:12 /bin/sh -c 'cd /opt && npm install && npm run build:es'"
-cmdbuildmiradorplugin="docker run --rm -v annotations-plugin:/opt -it node:12 /bin/sh -c 'cd /opt && npm install && npm run build'"
+cmdbuildmirador="'"
+cmdbuildmiradorplugin=""
 
 MIRADOR_FOLDER=mirador-video-annotation
 MIRADOR_ANNOTATION_FOLDER=annotations-plugin
@@ -28,10 +28,10 @@ shift
 # Keep actions sorted
 case $action in
     "build-mirador")
-        cd $MIRADOR_FOLDER && $cmdbuildmirador
+        cd $MIRADOR_FOLDER && docker run --rm -v $PWD:/opt -it node:12 /bin/sh -c 'cd /opt && npm install && npm run build:es'
         ;;
     "build-mirador-plugin")
-        cd $MIRADOR_ANNOTATION_FOLDER && $cmdbuildmiradorplugin
+        cd $MIRADOR_ANNOTATION_FOLDER && docker run --rm -v $PWD:/opt -it node:12 /bin/sh -c 'cd /opt && npm install && npm run build'
         ;;
     "clean-mirador")
         cd $MIRADOR_FOLDER && rm -R -f node_modules package-lock.json
@@ -53,10 +53,10 @@ case $action in
         ;;
     "install")
         echo "** Start install ..."
-        FILE=.env
+        FILE='.env'
         if [ ! -f "$FILE" ]; then
             echo "** $FILE does not exist. Please copy .env template. [cp .env.template .env] and set COMPOSE_FILE to suit your needs"
-             exit 0
+            exit 0
         fi
 
         echo "** Submodule initialisation ..."
@@ -64,10 +64,10 @@ case $action in
         $cmdupdatesubmodule
         echo "** Submodule initialized"
         echo "** Building Mirador ..."
-        $cmdbuildmirador
+        cd $MIRADOR_FOLDER && docker run --rm -v $PWD:/opt -it node:12 /bin/sh -c 'cd /opt && npm install && npm run build:es'
         echo "** Mirador build."
         echo "** Building Mirador plugin  ..."
-        $cmdbuildmiradorplugin
+        cd $MIRADOR_ANNOTATION_FOLDER && docker run --rm -v $PWD:/opt -it node:12 /bin/sh -c 'cd /opt && npm install && npm run build'
         echo "** Mirador plugin build."
         ;;
     "up")