diff --git a/spartan/environments/tps-scenario.env b/spartan/environments/tps-scenario.env
index b7548574fd39..abdaf40948b0 100644
--- a/spartan/environments/tps-scenario.env
+++ b/spartan/environments/tps-scenario.env
@@ -54,6 +54,8 @@ PROVER_RESOURCE_PROFILE="hi-tps"
 PROVER_AGENT_POLL_INTERVAL_MS=10000
 WAIT_FOR_PROVER_DEPLOY=false
 
+P2P_PUBLIC_IP=false
+
 RUN_TESTS=false
 
 P2P_MAX_TX_POOL_SIZE=1000000000
diff --git a/spartan/scripts/deploy_network.sh b/spartan/scripts/deploy_network.sh
index 992653a701c6..ad40060dee94 100755
--- a/spartan/scripts/deploy_network.sh
+++ b/spartan/scripts/deploy_network.sh
@@ -467,7 +467,7 @@ if [[ "${CLUSTER}" == "kind" ]]; then
   P2P_PUBLIC_IP=false
 else
   P2P_NODEPORT_ENABLED=false
-  P2P_PUBLIC_IP=true
+  P2P_PUBLIC_IP=${P2P_PUBLIC_IP:-true}
 fi
 
 cat > "${DEPLOY_AZTEC_INFRA_DIR}/terraform.tfvars" << EOF
diff --git a/spartan/terraform/deploy-aztec-infra/main.tf b/spartan/terraform/deploy-aztec-infra/main.tf
index 85c891329229..338cef6dffeb 100644
--- a/spartan/terraform/deploy-aztec-infra/main.tf
+++ b/spartan/terraform/deploy-aztec-infra/main.tf
@@ -306,7 +306,7 @@ locals {
             p2p = { publicIP = var.P2P_PUBLIC_IP }
           }
         }
-      })], local.is_kind ? [yamlencode({
+        })], local.is_kind ? [yamlencode({
         agent = {
           nodeSelector = null
           affinity     = null
@@ -335,9 +335,9 @@ locals {
           "broker.node.logLevel"                                = var.LOG_LEVEL
           "broker.node.env.BOOTSTRAP_NODES"                     = "asdf"
           "broker.node.env.PROVER_BROKER_DEBUG_REPLAY_ENABLED"  = var.PROVER_BROKER_DEBUG_REPLAY_ENABLED
-          "agent.node.image.repository"                          = local.prover_agent_image.repository
-          "agent.node.image.tag"                                 = local.prover_agent_image.tag
-          "agent.node.env.CRS_PATH"                              = "/usr/src/crs"
+          "agent.node.image.repository"                         = local.prover_agent_image.repository
+          "agent.node.image.tag"                                = local.prover_agent_image.tag
+          "agent.node.env.CRS_PATH"                             = "/usr/src/crs"
           "agent.node.proverRealProofs"                         = var.PROVER_REAL_PROOFS
           "agent.node.env.PROVER_AGENT_POLL_INTERVAL_MS"        = var.PROVER_AGENT_POLL_INTERVAL_MS
           "agent.replicaCount"                                  = var.PROVER_REPLICAS
@@ -416,7 +416,6 @@ locals {
       })]
 
       custom_settings = merge({
-        "nodeType"                    = "rpc"
         "replicaCount"                = var.RPC_REPLICAS
         "service.p2p.nodePortEnabled" = var.P2P_NODEPORT_ENABLED
         "service.p2p.announcePort"    = local.p2p_port_rpc
diff --git a/spartan/terraform/deploy-aztec-infra/values/full-node.yaml b/spartan/terraform/deploy-aztec-infra/values/full-node.yaml
index ac81a957591f..44db0c6f9e87 100644
--- a/spartan/terraform/deploy-aztec-infra/values/full-node.yaml
+++ b/spartan/terraform/deploy-aztec-infra/values/full-node.yaml
@@ -3,6 +3,17 @@ node:
   env:
     OTEL_SERVICE_NAME: "full-node"
 
+  preStartScript: |
+    if [ -n "${BOOT_NODE_HOST:-}" ]; then
+      until curl --silent --head --fail "${BOOT_NODE_HOST}/status" > /dev/null; do
+        echo "Waiting for boot node..."
+        sleep 1
+      done
+      echo "Boot node is ready!"
+
+      export BOOTSTRAP_NODES=$(curl -X POST -H "content-type: application/json" --data '{"method": "bootstrap_getEncodedEnr"}' $BOOT_NODE_HOST | jq -r .result)
+    fi
+
   startCmd:
     - --node
     - --archiver
diff --git a/spartan/terraform/deploy-aztec-infra/values/prover-resources-hi-tps.yaml b/spartan/terraform/deploy-aztec-infra/values/prover-resources-hi-tps.yaml
index bdaee2f34f3c..586e22a37d7b 100644
--- a/spartan/terraform/deploy-aztec-infra/values/prover-resources-hi-tps.yaml
+++ b/spartan/terraform/deploy-aztec-infra/values/prover-resources-hi-tps.yaml
@@ -1,5 +1,4 @@
 node:
-  hostNetwork: true
   node:
     enableInspector: true
     nodeJsOptions:
diff --git a/spartan/terraform/deploy-aztec-infra/values/rpc.yaml b/spartan/terraform/deploy-aztec-infra/values/rpc.yaml
index 55cab255e6b8..a79515b9cd5a 100644
--- a/spartan/terraform/deploy-aztec-infra/values/rpc.yaml
+++ b/spartan/terraform/deploy-aztec-infra/values/rpc.yaml
@@ -1,5 +1,5 @@
+nodeType: "rpc-node"
 node:
-  nodeType: "rpc-node"
   env:
     OTEL_SERVICE_NAME: "node"
     AWS_ACCESS_KEY_ID: ""