diff --git a/DOCKER/Dockerfile b/DOCKER/Dockerfile
index 932d674de9f33ba03a6d0308cdd4d8eebd3a94a6..016d23573e71a3e155d63e347bfcac420ce036e6 100644
--- a/DOCKER/Dockerfile
+++ b/DOCKER/Dockerfile
@@ -73,7 +73,7 @@ USER $USER
 RUN mkdir --parents /home/$USER/.eris/chains/tendermint
 ENV TMROOT /home/$USER/.eris/chains/tendermint
 
-# run tendermint
+# run eris-db
 # ports: 1337:eris-db API; 46656:tendermint-peer; 46657:tendermint-rpc
 EXPOSE 1337
 EXPOSE 46656
diff --git a/DOCKER/chain_api.sh b/DOCKER/chain_api.sh
index 8fecb978619334a8394d279d28d00e45e2ff48d1..26a96ffd826d1569fa9c92831c92147a7a61cd6a 100755
--- a/DOCKER/chain_api.sh
+++ b/DOCKER/chain_api.sh
@@ -1,4 +1,4 @@
 #! /bin/bash
 
 echo "Running chain $CHAIN_ID (via ErisDB API)"
-erisdb $TMROOT
+erisdb $CHAIN_DIR
diff --git a/DOCKER/chain_new.sh b/DOCKER/chain_new.sh
index a487564af5a7f44aee41d937e2946935a9d592a2..caa327efeb4adaa7286a9e6ae3c95370c733914a 100755
--- a/DOCKER/chain_new.sh
+++ b/DOCKER/chain_new.sh
@@ -33,7 +33,7 @@ fi
 # tendermint node & last_pid=$! && sleep 1 && kill -KILL $last_pid
 if [ $ERISDB_API ]; then
 	echo "Running chain $CHAIN_ID (via ErisDB API)"
-	erisdb $TMROOT
+	erisdb $CHAIN_DIR
 	ifExit "Error starting erisdb"
 else
 	echo Running chain $CHAIN_ID
diff --git a/DOCKER/chain_run.sh b/DOCKER/chain_run.sh
index 6728d41c74ca619f410c1407ea7762018637cb67..7a14e574396e6e091f6c345d8362a97cbb046d77 100755
--- a/DOCKER/chain_run.sh
+++ b/DOCKER/chain_run.sh
@@ -2,7 +2,7 @@
 
 if [ $ERISDB_API ]; then
 	echo "Running chain $CHAIN_ID (via ErisDB API)"
-	erisdb $TMROOT
+	erisdb $CHAIN_DIR
 	ifExit "Error starting erisdb"
 else
 	echo Running chain $CHAIN_ID
diff --git a/DOCKER/start.sh b/DOCKER/start.sh
index 7f3194e58a43d069eaf8f3256238efb78fec52ff..c15b1f3ce15079323eb6bd0c3bfb50d91a639949 100755
--- a/DOCKER/start.sh
+++ b/DOCKER/start.sh
@@ -41,7 +41,7 @@ fi
 CHAIN_DIR="/home/$USER/.eris/chains/$CHAIN_ID"
 
 # set the tendermint directory
-TMROOT=$CHAIN_DIR
+TMROOT="$CHAIN_DIR"/tendermint
 
 if [ ! -d "$CHAIN_DIR" ]; then
 	mkdir -p $CHAIN_DIR
diff --git a/net_test/data/init.sh b/net_test/data/init.sh
index 28c329fed04c14e4436082135dfb24901ffb8581..2020d318790c125625815768057158c66ec96baf 100755
--- a/net_test/data/init.sh
+++ b/net_test/data/init.sh
@@ -9,4 +9,4 @@ git fetch origin $BRANCH
 git checkout $BRANCH
 go install ./cmd/erisdb
 
-erisdb $TMROOT # should be exposed by docker file
+erisdb $CHAIN_DIR # should be exposed by docker file
diff --git a/net_test/data/net_test_0/init.sh b/net_test/data/net_test_0/init.sh
index 28c329fed04c14e4436082135dfb24901ffb8581..2020d318790c125625815768057158c66ec96baf 100755
--- a/net_test/data/net_test_0/init.sh
+++ b/net_test/data/net_test_0/init.sh
@@ -9,4 +9,4 @@ git fetch origin $BRANCH
 git checkout $BRANCH
 go install ./cmd/erisdb
 
-erisdb $TMROOT # should be exposed by docker file
+erisdb $CHAIN_DIR # should be exposed by docker file
diff --git a/net_test/data/net_test_1/init.sh b/net_test/data/net_test_1/init.sh
index 28c329fed04c14e4436082135dfb24901ffb8581..2020d318790c125625815768057158c66ec96baf 100755
--- a/net_test/data/net_test_1/init.sh
+++ b/net_test/data/net_test_1/init.sh
@@ -9,4 +9,4 @@ git fetch origin $BRANCH
 git checkout $BRANCH
 go install ./cmd/erisdb
 
-erisdb $TMROOT # should be exposed by docker file
+erisdb $CHAIN_DIR # should be exposed by docker file
diff --git a/net_test/data/net_test_2/init.sh b/net_test/data/net_test_2/init.sh
index 28c329fed04c14e4436082135dfb24901ffb8581..2020d318790c125625815768057158c66ec96baf 100755
--- a/net_test/data/net_test_2/init.sh
+++ b/net_test/data/net_test_2/init.sh
@@ -9,4 +9,4 @@ git fetch origin $BRANCH
 git checkout $BRANCH
 go install ./cmd/erisdb
 
-erisdb $TMROOT # should be exposed by docker file
+erisdb $CHAIN_DIR # should be exposed by docker file
diff --git a/net_test/data/net_test_3/init.sh b/net_test/data/net_test_3/init.sh
index 28c329fed04c14e4436082135dfb24901ffb8581..2020d318790c125625815768057158c66ec96baf 100755
--- a/net_test/data/net_test_3/init.sh
+++ b/net_test/data/net_test_3/init.sh
@@ -9,4 +9,4 @@ git fetch origin $BRANCH
 git checkout $BRANCH
 go install ./cmd/erisdb
 
-erisdb $TMROOT # should be exposed by docker file
+erisdb $CHAIN_DIR # should be exposed by docker file