diff --git a/.github/integration-tests/bor_health.sh b/.github/integration-tests/bor_health.sh
index 0791d415..46999209 100644
--- a/.github/integration-tests/bor_health.sh
+++ b/.github/integration-tests/bor_health.sh
@@ -11,5 +11,5 @@ do
     fi
 done
 
-echo $peers
-echo $block
+echo "$peers"
+echo "$block"
diff --git a/.github/integration-tests/smoke_test.sh b/.github/integration-tests/smoke_test.sh
index 4541ec5d..5ef75568 100644
--- a/.github/integration-tests/smoke_test.sh
+++ b/.github/integration-tests/smoke_test.sh
@@ -18,7 +18,7 @@ do
         exit 1
     fi
 
-    if (( $balance > $balanceInit )); then
+    if (( balance > balanceInit )); then
         if [ $stateSyncFound != "true" ]; then
             stateSyncTime=$(( SECONDS - start_time ))
             stateSyncFound="true"
@@ -27,7 +27,7 @@ do
 
     checkpointID=$(curl -sL http://localhost:1317/checkpoints/latest | jq .result.id)
 
-    if [ $checkpointID != "null" ]; then
+    if [ "$checkpointID" != "null" ]; then
         if [ $checkpointFound != "true" ]; then
             checkpointTime=$(( SECONDS - start_time ))
             checkpointFound="true"
@@ -40,5 +40,5 @@ do
 
 done
 echo "Both state sync and checkpoint went through. All tests have passed!"
-echo "Time taken for state sync: $(printf '%02dm:%02ds\n'  $(($stateSyncTime%3600/60)) $(($stateSyncTime%60)))"
-echo "Time taken for checkpoint: $(printf '%02dm:%02ds\n'  $(($checkpointTime%3600/60)) $(($checkpointTime%60)))"
+echo "Time taken for state sync: $(printf '%02dm:%02ds\n' $((stateSyncTime%3600/60)) $((stateSyncTime%60)))"
+echo "Time taken for checkpoint: $(printf '%02dm:%02ds\n' $((checkpointTime%3600/60)) $((checkpointTime%60)))"
diff --git a/src/setup/devnet/index.js b/src/setup/devnet/index.js
index 02f507f7..bea08528 100644
--- a/src/setup/devnet/index.js
+++ b/src/setup/devnet/index.js
@@ -266,7 +266,7 @@ export class Devnet {
               )
               .replace(
                 /bor_grpc_url[ ]*=[ ]*".*"/gi,
-                'bor_grpc_url = "localhost:3131"'
+                `bor_grpc_url = "bor${i}:3131"`
               )
               .replace(
                 /amqp_url[ ]*=[ ]*".*"/gi,