diff --git a/boilerplate/config/blockchain.yml b/boilerplate/config/blockchain.yml
index eec7cb53..911fd1dc 100644
--- a/boilerplate/config/blockchain.yml
+++ b/boilerplate/config/blockchain.yml
@@ -7,6 +7,7 @@ development:
   datadir: /tmp/embark
   chains: config/chains/development.json
   mine_when_needed: true
+  max_peers: 0
   gas_limit: 500000
   gas_price: 10000000000000
   console: false
@@ -20,6 +21,7 @@ staging:
   rpc_whitelist: "*"
   datadir: default
   network_id: 0
+  max_peers: 4
   console: true
   account:
     init: false
@@ -30,6 +32,7 @@ production:
   rpc_whitelist: "*"
   datadir: default
   network_id: 1
+  max_peers: 0
   console: true
   account:
     init: false
diff --git a/lib/config/blockchain.js b/lib/config/blockchain.js
index 70f2fd50..6fade581 100644
--- a/lib/config/blockchain.js
+++ b/lib/config/blockchain.js
@@ -41,6 +41,7 @@ BlockchainConfig.prototype.config = function(env) {
     genesisBlock: config.genesis_block,
     datadir: config.datadir,
     chains: config.chains,
+    deployTimeout: config.deploy_timeout || 20,
     networkId: networkId,
     maxPeers: 4,
     port: config.port || "30303",