diff --git a/ansible-tendermint/README.md b/ansible-tendermint/README.md
index 3b02fcd0..010dd37e 100644
--- a/ansible-tendermint/README.md
+++ b/ansible-tendermint/README.md
@@ -35,8 +35,43 @@ tendermint_upstart_template: "tendermint.conf.j2"
 tendermint_systemd_template: "tendermint.systemd.j2"
 
 tendermint_home: /opt/tendermint
+tendermint_node_port: 46656
 tendermint_rpc_port: 46657
-tendermint_proxy_app: tcp://127.0.0.1:46658
+tendermint_proxy_app: "tcp://127.0.0.1:46658"
+tendermint_node_laddr: "tcp://0.0.0.0:{{tendermint_node_port}}"
+tendermint_rpc_laddr: "tcp://0.0.0.0:{{tendermint_rpc_port}}"
+tendermint_fast_sync: true
+tendermint_db_backend: leveldb
+tendermint_log_level: notice
+tendermint_genesis_file: "{{tendermint_home}}/genesis.json"
+tendermint_abci: socket
+tendermint_skip_upnp: false
+tendermint_addrbook_file: "{{tendermint_home}}/addrbook.json"
+tendermint_addrbook_strict: true
+tendermint_pex_reactor: false
+tendermint_priv_validator_file: "{{tendermint_home}}/priv_validator.json"
+tendermint_db_dir: "{{tendermint_home}}/data"
+tendermint_grpc_laddr: ""
+tendermint_prof_laddr: ""
+tendermint_cs_wal_file: "{{tendermint_db_dir}}/cs.wal/wal"
+tendermint_cs_wal_light: false
+tendermint_filter_peers: false
+tendermint_block_size: 10000
+tendermint_block_part_size: 65536
+tendermint_disable_data_hash: false
+# all timeouts are in milliseconds
+tendermint_timeout_propose: 3000
+tendermint_timeout_propose_delta: 500
+tendermint_timeout_prevote: 1000
+tendermint_timeout_prevote_delta: 500
+tendermint_timeout_precommit: 1000
+tendermint_timeout_precommit_delta: 500
+tendermint_timeout_commit: 1000
+tendermint_skip_timeout_commit: false
+tendermint_mempool_recheck: true
+tendermint_mempool_recheck_empty: true
+tendermint_mempool_broadcast: true
+tendermint_mempool_wal_dir: "{{tendermint_db_dir}}/mempool.wal"
 
 tendermint_log_file: /var/log/tendermint.log
 
@@ -45,8 +80,6 @@ tendermint_genesis_time: "{{ansible_date_time.iso8601_micro}}"
 tendermint_seeds: ""
 ```
 
-You can also change `templates/config.toml.j2` to suit your needs.
-
 ## Handlers
 
 These are the handlers that are defined in `handlers/main.yml`.
diff --git a/ansible-tendermint/defaults/main.yml b/ansible-tendermint/defaults/main.yml
index cc0cd763..9a70b735 100644
--- a/ansible-tendermint/defaults/main.yml
+++ b/ansible-tendermint/defaults/main.yml
@@ -17,8 +17,43 @@ tendermint_upstart_template: "tendermint.conf.j2"
 tendermint_systemd_template: "tendermint.systemd.j2"
 
 tendermint_home: /opt/tendermint
+tendermint_node_port: 46656
 tendermint_rpc_port: 46657
-tendermint_proxy_app: tcp://127.0.0.1:46658
+tendermint_proxy_app: "tcp://127.0.0.1:46658"
+tendermint_node_laddr: "tcp://0.0.0.0:{{tendermint_node_port}}"
+tendermint_rpc_laddr: "tcp://0.0.0.0:{{tendermint_rpc_port}}"
+tendermint_fast_sync: true
+tendermint_db_backend: leveldb
+tendermint_log_level: notice
+tendermint_genesis_file: "{{tendermint_home}}/genesis.json"
+tendermint_abci: socket
+tendermint_skip_upnp: false
+tendermint_addrbook_file: "{{tendermint_home}}/addrbook.json"
+tendermint_addrbook_strict: true
+tendermint_pex_reactor: false
+tendermint_priv_validator_file: "{{tendermint_home}}/priv_validator.json"
+tendermint_db_dir: "{{tendermint_home}}/data"
+tendermint_grpc_laddr: ""
+tendermint_prof_laddr: ""
+tendermint_cs_wal_file: "{{tendermint_db_dir}}/cs.wal/wal"
+tendermint_cs_wal_light: false
+tendermint_filter_peers: false
+tendermint_block_size: 10000
+tendermint_block_part_size: 65536
+tendermint_disable_data_hash: false
+# all timeouts are in milliseconds
+tendermint_timeout_propose: 3000
+tendermint_timeout_propose_delta: 500
+tendermint_timeout_prevote: 1000
+tendermint_timeout_prevote_delta: 500
+tendermint_timeout_precommit: 1000
+tendermint_timeout_precommit_delta: 500
+tendermint_timeout_commit: 1000
+tendermint_skip_timeout_commit: false
+tendermint_mempool_recheck: true
+tendermint_mempool_recheck_empty: true
+tendermint_mempool_broadcast: true
+tendermint_mempool_wal_dir: "{{tendermint_db_dir}}/mempool.wal"
 
 tendermint_log_file: /var/log/tendermint.log
 
diff --git a/ansible-tendermint/templates/config.toml.j2 b/ansible-tendermint/templates/config.toml.j2
index d4d4c780..3743a195 100644
--- a/ansible-tendermint/templates/config.toml.j2
+++ b/ansible-tendermint/templates/config.toml.j2
@@ -1,7 +1,38 @@
 proxy_app = "{{tendermint_proxy_app}}"
-node_laddr = "tcp://0.0.0.0:46656"
+node_laddr = "{{tendermint_node_laddr}}"
 seeds = "{{tendermint_seeds}}"
-fast_sync = true
-db_backend = "leveldb"
-log_level = "notice"
-rpc_laddr = "tcp://0.0.0.0:{{tendermint_rpc_port}}"
+fast_sync = {{tendermint_fast_sync | bool | lower}}
+db_backend = "{{tendermint_db_backend}}"
+log_level = "{{tendermint_log_level}}"
+rpc_laddr = "{{tendermint_rpc_laddr}}"
+
+genesis_file = "{{tendermint_genesis_file}}"
+abci = "{{tendermint_abci}}"
+skip_upnp = {{tendermint_skip_upnp | bool | lower}}
+addrbook_file = "{{tendermint_addrbook_file}}"
+addrbook_strict = {{tendermint_addrbook_strict | bool | lower}}
+pex_reactor = {{tendermint_pex_reactor | bool | lower}}
+priv_validator_file = "{{tendermint_priv_validator_file}}"
+
+db_dir = "{{tendermint_db_dir}}"
+grpc_laddr = "{{tendermint_grpc_laddr}}"
+prof_laddr = "{{tendermint_prof_laddr}}"
+cs_wal_file = "{{tendermint_cs_wal_file}}"
+cs_wal_light = {{tendermint_cs_wal_light | bool | lower}}
+filter_peers = {{tendermint_filter_peers | bool | lower}}
+
+block_size = {{tendermint_block_size}}
+block_part_size = {{tendermint_block_part_size}}
+disable_data_hash = {{tendermint_disable_data_hash | bool | lower}}
+timeout_propose = {{tendermint_timeout_propose}}
+timeout_propose_delta = {{tendermint_timeout_propose_delta}}
+timeout_prevote = {{tendermint_timeout_prevote}}
+timeout_prevote_delta = {{tendermint_timeout_prevote_delta}}
+timeout_precommit = {{tendermint_timeout_precommit}}
+timeout_precommit_delta = {{tendermint_timeout_precommit_delta}}
+timeout_commit = {{tendermint_timeout_commit}}
+skip_timeout_commit = {{tendermint_skip_timeout_commit | bool | lower}}
+mempool_recheck = {{tendermint_mempool_recheck | bool | lower}}
+mempool_recheck_empty = {{tendermint_mempool_recheck_empty | bool | lower}}
+mempool_broadcast = {{tendermint_mempool_broadcast | bool | lower}}
+mempool_wal_dir = "{{tendermint_mempool_wal_dir}}"