diff --git a/docker-compose.tendermint.yml b/docker-compose.tendermint.yml
index 0796b562..dc798723 100644
--- a/docker-compose.tendermint.yml
+++ b/docker-compose.tendermint.yml
@@ -38,9 +38,9 @@ services:
   tendermint:
     image: tendermint/tendermint:0.13
     volumes:
-      - ./tmdata:/tendermint
+      - ./tmdata/config.toml:/tendermint/config.toml
     entrypoint: ''
-    command: bash -c "tendermint unsafe_reset_all && tendermint node"
+    command: bash -c "tendermint init && tendermint node"
   curl-client:
     image: appropriate/curl
     command: /bin/sh -c "curl http://tendermint:46657/abci_query && curl http://bdb:9984/"
diff --git a/tmdata/genesis.json b/tmdata/genesis.json
deleted file mode 100644
index 1c5ae703..00000000
--- a/tmdata/genesis.json
+++ /dev/null
@@ -1 +0,0 @@
-{"genesis_time":"0001-01-01T00:00:00Z","chain_id":"test-chain-EhS6zg","validators":[{"pub_key":{"type":"ed25519","data":"C3E96823EB67401C5B794F4100CEA04B745C29A0707979485EAE4F3C1A7D8583"},"power":10,"name":""}],"app_hash":""}
\ No newline at end of file
diff --git a/tmdata/priv_validator.json b/tmdata/priv_validator.json
deleted file mode 100644
index d48911de..00000000
--- a/tmdata/priv_validator.json
+++ /dev/null
@@ -1 +0,0 @@
-{"address":"2571CF34499E67BED107A6FE73418667A4461F6A","pub_key":{"type":"ed25519","data":"C3E96823EB67401C5B794F4100CEA04B745C29A0707979485EAE4F3C1A7D8583"},"last_height":1,"last_round":0,"last_step":3,"last_signature":{"type":"ed25519","data":"C9C16BEB7C71DC6FFDFE06973BEFDD995BD12F5A3B124F387E037C6E6F2CD913FA084495DEDEFABE5C52C385C8B909FDC0EB9BC15F3499B97C7693DCD1F82004"},"last_signbytes":"7B22636861696E5F6964223A22746573742D636861696E2D456853367A67222C22766F7465223A7B22626C6F636B5F6964223A7B2268617368223A2239334634373641364642323431393131343434324232444135434339303539353443393337373830222C227061727473223A7B2268617368223A2236423034414544374631323742353534433133383435394439413445423130394242354232413431222C22746F74616C223A317D7D2C22686569676874223A312C22726F756E64223A302C2274797065223A327D7D","priv_key":{"type":"ed25519","data":"5431111D9D8833305509308708341EBA0AD7226F30DBDA43616B4A73F94F2369C3E96823EB67401C5B794F4100CEA04B745C29A0707979485EAE4F3C1A7D8583"}}
\ No newline at end of file