diff --git a/src/setup/devnet/index.js b/src/setup/devnet/index.js
index 96e8d116..587f1c73 100644
--- a/src/setup/devnet/index.js
+++ b/src/setup/devnet/index.js
@@ -161,6 +161,8 @@ export class Devnet {
               .replace(/eth_rpc_url[ ]*=[ ]*".*"/gi, `eth_rpc_url = "${this.config.ethURL}"`)
               .replace(/bor_rpc_url[ ]*=[ ]*".*"/gi, `bor_rpc_url = "http://bor${i}:8545"`)
               .replace(/amqp_url[ ]*=[ ]*".*"/gi, `amqp_url = "amqp://guest:guest@rabbit${i}:5672/"`)
+              .replace(/span_poll_interval[ ]*=[ ]*".*"/gi, 'span_poll_interval = "0m15s"')
+              .replace(/checkpoint_poll_interval[ ]*=[ ]*".*"/gi, 'checkpoint_poll_interval = "1m0s"')
               .save()
           }
         }
diff --git a/src/setup/devnet/templates/docker/docker-heimdall-start.sh.njk b/src/setup/devnet/templates/docker/docker-heimdall-start.sh.njk
index 4b73203d..6ea4b1f2 100644
--- a/src/setup/devnet/templates/docker/docker-heimdall-start.sh.njk
+++ b/src/setup/devnet/templates/docker/docker-heimdall-start.sh.njk
@@ -3,11 +3,8 @@
 INDEX=$1
 
 docker-compose run -d --service-ports --name heimdall$INDEX heimdall$INDEX sh -c "
-heimdalld start > ./logs/heimdalld.log &
-heimdalld rest-server > ./logs/heimdalld-rest-server.log &
-sleep 5
-bridge start --all > ./logs/bridge.log &
-
-# tail logs
+heimdalld start > ./logs/heimdalld.log 2>&1 &
+heimdalld rest-server > ./logs/heimdalld-rest-server.log 2>&1 &
+sleep 60 && bridge start --all > ./logs/bridge.log 2>&1 &
 tail -f ./logs/heimdalld.log ./logs/heimdalld-rest-server.log ./logs/bridge.log
 "