diff --git a/Dockerfile b/Dockerfile
index 3229bc9..edfc0a1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:vivid
 MAINTAINER uggla@free.fr
-LABEL PAServer
+LABEL name=PAServer
 LABEL version="1.0" description="PAServer in docker. Port used 20545"
 EXPOSE 20545
 ENV DEBIAN_FRONTEND noninteractive
@@ -37,4 +37,4 @@ chmod +x /home/pa/update_conf_file.sh && \
 /home/pa/update_conf_file.sh
 RUN cp /home/pa/NodePAMaster_conf.json /home/pa/NodePAMaster/src/conf.json
 RUN rm /home/pa/auth_papatcher.sh
-ENTRYPOINT ["node.js", "./NodePAMaster/src/control.js"]
+ENTRYPOINT ["/usr/bin/nodejs", "./NodePAMaster/src/control.js"]
diff --git a/buildImage.sh b/buildImage.sh
index 41fc7cb..ef1a867 100755
--- a/buildImage.sh
+++ b/buildImage.sh
@@ -55,6 +55,5 @@ sed -i "/serverip/ s/127\.0\.0\.1/$serveripaddress/" NodePAMaster_conf.json
 sed -i "/listonpastats/ s/true/$serverlistonpastats/" NodePAMaster_conf.json
 
 
-
-#sudo docker build --rm=true .
-sudo docker build .
+if [ $1 = "nobuild" ]; then exit 0;fi
+sudo docker build --rm=true .