diff --git a/nitro-bridge-demo.md b/nitro-bridge-demo.md
index fc9c00b..3f1e523 100644
--- a/nitro-bridge-demo.md
+++ b/nitro-bridge-demo.md
@@ -531,7 +531,7 @@
   - Open new terminal, check that no channels exist on L2
 
     ```bash
-    laconic-so deployment --dir bridge-deployment exec nitro-rpc-client "nitro-rpc-client get-all-l2-channels -p 4006 -h nitro-bridge"
+    laconic-so deployment --dir bridge-deployment exec nitro-rpc-client "nitro-rpc-client get-all-l2-channels -p 4005 -h nitro-bridge"
 
     # Expected output:
     # []
@@ -558,7 +558,7 @@
     - Once direct-fund objective is complete, bridge will create mirrored channel on L2
 
     - Check node A' logs to see bridged-fund objective completed
-      
+
       ```bash
       laconic-so deployment --dir l2alice-nitro-deployment logs nitro-node -f --tail 30
 
@@ -636,7 +636,7 @@
   - Check status of all L2 mirrored ledger channels
 
     ```bash
-    laconic-so deployment --dir bridge-deployment exec nitro-rpc-client "nitro-rpc-client get-all-l2-channels -p 4006 -h nitro-bridge"
+    laconic-so deployment --dir bridge-deployment exec nitro-rpc-client "nitro-rpc-client get-all-l2-channels -p 4005 -h nitro-bridge"
 
     # Expected output:
     # [
@@ -731,7 +731,7 @@
   ```
 
 - Check largest voucher received on the payment channel
-  
+
   ```bash
   laconic-so deployment --dir l2charlie-nitro-deployment exec nitro-rpc-client "nitro-rpc-client get-voucher $PAYMENT_CHANNEL_ID -p 4005 -h nitro-node"
 
@@ -740,7 +740,7 @@
   #   Amount: 200,
   #   ChannelId: '0xb29aeb32c9495a793ebf7bd116232075d1e7bfe89fc82281c7d498e3ffd3e3bf',
   #   Signature: '0x8fbdb9bb91932b422c30cc07bf422e4f1c3ae1be1b60e01bbfcb193ae5c8f5b0571de84667d87b5ef9b737287faa0ddf41f1f9fc159673205679622c69fd69d81b'
-  # }  
+  # }
   ```
 
 - Check payment channel status again to view updated channel state
@@ -775,7 +775,7 @@
     ```bash
     laconic-so deployment --dir l2alice-nitro-deployment exec nitro-rpc-client "nitro-rpc-client get-all-ledger-channels -p 4005 -h nitro-node"
 
-    # Expected output:    
+    # Expected output:
     # [
     #  {
     #    "ID": "0x6a9f5ccf1fa802525d794f4a899897f947615f6acc7141e61e056a8bfca29179",
diff --git a/stack-orchestrator/compose/docker-compose-nitro-bridge.yml b/stack-orchestrator/compose/docker-compose-nitro-bridge.yml
index 19441ba..131a4a5 100644
--- a/stack-orchestrator/compose/docker-compose-nitro-bridge.yml
+++ b/stack-orchestrator/compose/docker-compose-nitro-bridge.yml
@@ -3,7 +3,7 @@ name: nitro-bridge
 services:
   l2-nitro-contracts:
     image: cerc/nitro-client:local
-    restart: on-failure    
+    restart: on-failure
     environment:
       CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
       OPTIMISM_DEPLOYER_PK: ${OPTIMISM_DEPLOYER_PK}
@@ -27,7 +27,7 @@ services:
     restart: unless-stopped
     depends_on:
       l2-nitro-contracts:
-        condition: service_started    
+        condition: service_started
     environment:
       CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
       OPTIMISM_CHAIN_ID: ${OPTIMISM_CHAIN_ID:-42069}
@@ -37,7 +37,7 @@ services:
       NITRO_SC_PK: ${NITRO_SC_PK}
       NITRO_L1_MSG_PORT: ${NITRO_L1_MSG_PORT:-3005}
       NITRO_L2_MSG_PORT: ${NITRO_L2_MSG_PORT:-3006}
-      NITRO_RPC_PORT: ${NITRO_RPC_PORT:-4006}
+      NITRO_RPC_PORT: ${NITRO_RPC_PORT:-4005}
       NITRO_PUBLIC_P2P_HOST: ${NITRO_PUBLIC_P2P_HOST:-127.0.0.1}
       NITRO_L1_EXT_MULTIADDR: ${NITRO_L1_EXT_MULTIADDR}
       NITRO_L2_EXT_MULTIADDR: ${NITRO_L2_EXT_MULTIADDR}
@@ -56,7 +56,7 @@ services:
     ports:
       - 3005
       - 3006
-      - 4006
+      - 4005
     healthcheck:
       test: ["CMD", "nc", "-vz", "localhost", "3006"]
       interval: 30s
diff --git a/stack-orchestrator/compose/docker-compose-nitro-rpc-client.yml b/stack-orchestrator/compose/docker-compose-nitro-rpc-client.yml
index 438e52c..df4d118 100644
--- a/stack-orchestrator/compose/docker-compose-nitro-rpc-client.yml
+++ b/stack-orchestrator/compose/docker-compose-nitro-rpc-client.yml
@@ -8,6 +8,12 @@ services:
     environment:
       NODE_EXTRA_CA_CERTS: "/app/mkcert-caroot/rootCA.pem"
     command: ["bash", "-c", "tail -f /dev/null"]
+    healthcheck:
+      test: ["CMD-SHELL", "nitro-rpc-client --version -p 4005"]
+      interval: 30s
+      timeout: 5s
+      retries: 10
+      start_period: 10s
     volumes:
       - nitro_node_caroot:/app/mkcert-caroot
 
diff --git a/stack-orchestrator/stacks/bridge/README.md b/stack-orchestrator/stacks/bridge/README.md
index 2b57d63..8aae3c0 100644
--- a/stack-orchestrator/stacks/bridge/README.md
+++ b/stack-orchestrator/stacks/bridge/README.md
@@ -36,7 +36,7 @@
     go-nitro:
      - 3005:3005
      - 3006:3006
-     - 4006:4006
+     - 4005:4005
   ```
 
 - Create deployment
@@ -72,7 +72,7 @@
   NITRO_L2_MSG_PORT=3006
 
   # Port to be used by RPC server
-  NITRO_RPC_PORT=4006
+  NITRO_RPC_PORT=4005
 
   NITRO_PUBLIC_P2P_HOST=127.0.0.1