diff --git a/src/binance-testnet/Dockerfile b/src/binance-testnet/Dockerfile
index 10a9e73..b4b0a92 100644
--- a/src/binance-testnet/Dockerfile
+++ b/src/binance-testnet/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:19.10 as build
+FROM ubuntu:19.10
 
 ARG BNC_VERSION=0.6.2
 
diff --git a/src/binance-testnet/api-server/Dockerfile b/src/binance-testnet/api-server/Dockerfile
index 1ea7aef..17be5fa 100644
--- a/src/binance-testnet/api-server/Dockerfile
+++ b/src/binance-testnet/api-server/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:10.16.0-alpine
+FROM alpine:3.9.4
 
 ARG BNC_VERSION=0.6.2
 
@@ -6,8 +6,8 @@ WORKDIR /api-server
 
 COPY --from=testnet-binaries /binaries/cli/testnet/${BNC_VERSION}/linux/tbnbcli ./
 
-RUN echo 12345678 | ./tbnbcli keys add key
+RUN echo 12345678 | ./tbnbcli keys add key --no-backup
 
 EXPOSE 8080
 
-ENTRYPOINT ["./tbnbcli", "api-server", "--chain-id", "Binance-Dev", "--node", "http://node:26657", "--laddr", "tcp://0.0.0.0:8080"]
+ENTRYPOINT ["./tbnbcli", "api-server", "--chain-id", "Binance-Dev", "--laddr", "tcp://0.0.0.0:8080", "--node"]
diff --git a/src/binance-testnet/docker-compose.yml b/src/binance-testnet/docker-compose.yml
index ebe2cff..b2ad8f1 100644
--- a/src/binance-testnet/docker-compose.yml
+++ b/src/binance-testnet/docker-compose.yml
@@ -17,6 +17,7 @@ services:
       - binance_rpc_net
     ports:
       - '8080:8080'
+    command: ["http://node:26657"]
   http-api:
     build: http-api
     image: bnc-http-api
diff --git a/src/binance-testnet/node/Dockerfile b/src/binance-testnet/node/Dockerfile
index fabf1b2..0ee5779 100644
--- a/src/binance-testnet/node/Dockerfile
+++ b/src/binance-testnet/node/Dockerfile
@@ -1,4 +1,3 @@
-#echo 12345678 | docker exec -i 5f6f653730442d81b6e34a82ac3dc8a82f071c1eec130bc09a0dca803ad00bd2 ./tbnbcli send --to tbnb1efjg7xt98t67ql2cmwjc5860lgayet9l8m55ym --amount 100:BNB --from node0 --chain-id Binance-Dev --json
 FROM alpine:3.9.4
 
 ARG BNC_VERSION=0.6.2