diff --git a/docker/Dockerfile b/docker/Dockerfile
index 065a910287..9c1f4a7dbb 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -40,4 +40,4 @@ WORKDIR $WVDATA
 HEALTHCHECK CMD curl -f http://localhost:6869/node/status || exit 1
 
 STOPSIGNAL SIGINT
-ENTRYPOINT "${WAVES_INSTALL_PATH}/bin/entrypoint.sh"
+ENTRYPOINT ["/usr/share/waves/bin/entrypoint.sh"]
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index dbb7f9b2b4..23b2567216 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -13,12 +13,12 @@ JAVA_OPTS="-XX:+ExitOnOutOfMemoryError
 
 echo "JAVA_OPTS=${JAVA_OPTS}" | tee -a ${WVLOG}/waves.log
 
-if [ -n ${WAVES_WALLET_SEED} ] ; then
+if [ -n "$WAVES_WALLET_SEED" ] ; then
   JAVA_OPTS="-Dwaves.wallet.seed=${WAVES_WALLET_SEED} ${JAVA_OPTS}"
 fi
 
-if [ -n ${WAVES_WALLET_PASSWORD} ] ; then
+if [ -n "$WAVES_WALLET_PASSWORD" ] ; then
   JAVA_OPTS="-Dwaves.wallet.password=${WAVES_WALLET_PASSWORD} ${JAVA_OPTS}"
 fi
 
-exec java $JAVA_OPTS -cp "${WAVES_INSTALL_PATH}/lib/plugins/*:$WAVES_INSTALL_PATH/lib/*" com.wavesplatform.Application $ARGS
+exec java $JAVA_OPTS -cp "${WAVES_INSTALL_PATH}/lib/plugins/*:$WAVES_INSTALL_PATH/lib/*" com.wavesplatform.Application $@