diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6a9bfbae5b9..802998ad110 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -948,7 +948,21 @@ jobs:
           name: "Deploy mainnet fork"
           command: |
             should_deploy || exit 0
-            deploy_ecr mainnet-fork
+            deploy mainnet-fork
+
+  deploy-contracts:
+    machine:
+      image: ubuntu-2204:2023.07.2
+    resource_class: medium
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Deploy L1 contracts to mainnet fork"
+          working_directory: l1-contracts
+          command: |
+            should_deploy || exit 0
+            ./scripts/ci_deploy_contracts.sh
 
   deploy-npm:
     machine:
@@ -977,6 +991,29 @@ jobs:
             deploy_dockerhub noir x86_64,arm64
             deploy_dockerhub aztec-sandbox x86_64,arm64
             deploy_dockerhub cli x86_64,arm64
+            deploy_dockerhub faucet x86_64,arm64
+            deploy_dockerhub mainnet-fork x86_64,arm64
+            dpeloy_dockerhub l1-contracts x86_64,arm64
+
+  deploy-devnet:
+    machine:
+      image: ubuntu-2204:2023.07.2
+    resource_class: medium
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Deploy devnet to AWS"
+          command: |
+            should_deploy 0 || exit 0
+            export TF_VAR_FAUCET_PRIVATE_KEY=$FAUCET_PRIVATE_KEY
+            export TF_VAR_BOOTNODE_1_PEER_ID=$BOOTNODE_1_PEER_ID
+            export TF_VAR_BOOTNODE_2_PEER_ID=$BOOTNODE_2_PEER_ID
+            export TF_VAR_BOOTNODE_1_PRIVATE_KEY=$BOOTNODE_1_PRIVATE_KEY
+            export TF_VAR_BOOTNODE_2_PRIVATE_KEY=$BOOTNODE_2_PRIVATE_KEY
+            deploy p2p-bootstrap
+            deploy aztec-node
+            deploy aztec-faucet
 
 # Repeatable config for defining the workflow below.
 defaults: &defaults
@@ -1203,4 +1240,16 @@ workflows:
       # Production deployment
       - deploy-dockerhub: *defaults_deploy
       - deploy-npm: *defaults_deploy
-      - deploy-mainnet-fork: *defaults_deploy
+      - deploy-mainnet-fork:
+          requires:
+            - deploy-dockerhub
+          <<: *defaults_deploy
+      - deploy-contracts:
+          requires:
+            - deploy-mainnet-fork
+          <<: *defaults_deploy
+      - deploy-devnet:
+          requires:
+            - deploy-contracts
+          <<: *defaults_deploy
+
diff --git a/build-system/scripts/deploy b/build-system/scripts/deploy
index 06410f5f031..08ef24ac2e8 100755
--- a/build-system/scripts/deploy
+++ b/build-system/scripts/deploy
@@ -19,7 +19,7 @@ if check_rebuild cache-$CONTENT_HASH-$DEPLOY_TAG-deployed $REPOSITORY; then
   exit 0
 fi
 
-deploy_terraform $REPOSITORY ./terraform/$DEPLOY_ENV "$TO_TAINT"
+deploy_terraform $REPOSITORY ./terraform/ "$TO_TAINT"
 
 # Restart services.
 for SERVICE in $SERVICES; do
diff --git a/build-system/scripts/deploy_dockerhub b/build-system/scripts/deploy_dockerhub
index 4009f453d48..ac99bbe4f1a 100755
--- a/build-system/scripts/deploy_dockerhub
+++ b/build-system/scripts/deploy_dockerhub
@@ -20,7 +20,17 @@ function docker_or_dryrun {
 echo "Repo: $REPOSITORY"
 echo "Arch List: $ARCH_LIST"
 
-VERSION_TAG=$(extract_tag_version $REPOSITORY true)
+VERSION_TAG=$(extract_tag_version $REPOSITORY false)
+
+# if no version tag, check if we're on `master` branch
+if [[ -z "$VERSION_TAG" ]]; then
+  if [[ "$BRANCH" != "master" ]]; then
+    echo "No version tag found. Exiting" >&2
+    exit 1
+  fi
+  # if we're on master, use the DEPLOY_TAG as the version tag
+  VERSION_TAG=$DEPLOY_TAG
+fi
 
 MANIFEST_DEPLOY_URI=$DOCKERHUB_ACCOUNT/$REPOSITORY:$VERSION_TAG
 MANIFEST_DIST_URI=$DOCKERHUB_ACCOUNT/$REPOSITORY:$DIST_TAG
@@ -42,12 +52,17 @@ for ARCH in $ARCH_LIST; do
   echo "Adding image $IMAGE_DEPLOY_URI to manifest list $MANIFEST_DEPLOY_URI..."
   docker_or_dryrun manifest create $MANIFEST_DEPLOY_URI --amend $IMAGE_DEPLOY_URI
 
-  echo "Adding image $IMAGE_DEPLOY_URI to manifest list $MANIFEST_DIST_URI"
-  docker_or_dryrun manifest create $MANIFEST_DIST_URI --amend $IMAGE_DEPLOY_URI
+  # Add latest manifest if we're making a release.
+  if [[ "$VERSION_TAG" != $DEPLOY_TAG ]]; then
+    echo "Adding image $IMAGE_DEPLOY_URI to manifest list $MANIFEST_DIST_URI"
+    docker_or_dryrun manifest create $MANIFEST_DIST_URI --amend $IMAGE_DEPLOY_URI
+  fi
 done
 
-echo "Tagging $MANIFEST_DEPLOY_URI as $VERSION_TAG..."
 docker_or_dryrun manifest push --purge $MANIFEST_DEPLOY_URI
-# Publish version as latest.
-echo "Tagging $MANIFEST_DEPLOY_URI as $DIST_TAG..."
-docker_or_dryrun manifest push --purge $MANIFEST_DIST_URI
+
+# Retag version as latest if we're making a release.
+if [[ "$VERSION_TAG" != "$DEPLOY_TAG" ]]; then
+  echo "Tagging $MANIFEST_DEPLOY_URI as $DIST_TAG..."
+  docker_or_dryrun manifest push --purge $MANIFEST_DIST_URI
+fi
diff --git a/build-system/scripts/deploy_terraform b/build-system/scripts/deploy_terraform
index 6d7f6ef81bb..3759cc52a0a 100755
--- a/build-system/scripts/deploy_terraform
+++ b/build-system/scripts/deploy_terraform
@@ -25,6 +25,10 @@ echo "Deploying terraform found at $PWD..."
 # Always want to export the DEPLOY_TAG variable to terraform. It's used to easily scope releases.
 export TF_VAR_DEPLOY_TAG=$DEPLOY_TAG
 export TF_VAR_COMMIT_HASH=$COMMIT_HASH
+export TF_VAR_DOCKERHUB_ACCOUNT=$DOCKERHUB_ACCOUNT
+export TF_VAR_FORK_MNEMONIC=$FORK_MNEMONIC
+export TF_VAR_INFURA_API_KEY=$INFURA_API_KEY
+export TF_VAR_API_KEY=$FORK_API_KEY
 
 # If given a repository name, use it to construct and set/override the backend key.
 # Otherwise use the key as specified in the terraform.
diff --git a/build-system/scripts/ensure_terraform b/build-system/scripts/ensure_terraform
index f2e33c5445d..d7444aa4e4c 100755
--- a/build-system/scripts/ensure_terraform
+++ b/build-system/scripts/ensure_terraform
@@ -6,7 +6,7 @@ set -eu
 [ ! -f /usr/local/bin/terraform ] || exit 0
 
 cd $HOME
-TERRAFORM_VERSION=0.13.3
+TERRAFORM_VERSION=1.5.2
 curl -sSL https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip -o terraform.zip
 sudo apt install -y unzip
 unzip terraform.zip
diff --git a/build-system/scripts/should_deploy b/build-system/scripts/should_deploy
index aac1504ab33..b5f198af06e 100755
--- a/build-system/scripts/should_deploy
+++ b/build-system/scripts/should_deploy
@@ -1,7 +1,15 @@
 #!/bin/bash
-# Retuns success if we are expected to do a deploy.
-# At present this is only if we have a commit tag.
-# Once we are doing master deployments to devnet, we'll want to check if BRANCH is master.
+# Returns success if we are expected to do a deployment.
+# This is if we have a commit tag (release) or if we're on `master` branch (devnet deployment).
+
 set -eu
 
-[ -n "$COMMIT_TAG" ]
\ No newline at end of file
+# This is when we only want to deploy on master, not release with new COMMIT_TAG.
+# Specifically for deploying devnet.
+RELEASE=${1:-1}
+
+if [ -n "$COMMIT_TAG" ] && [ "$RELEASE" != "0" ] || [ "$BRANCH" = "master" ]; then
+  exit 0
+else
+  exit 1
+fi
diff --git a/iac/mainnet-fork/scripts/wait_for_fork b/iac/mainnet-fork/scripts/wait_for_fork
index 4d990e30f88..326582c25af 100755
--- a/iac/mainnet-fork/scripts/wait_for_fork
+++ b/iac/mainnet-fork/scripts/wait_for_fork
@@ -6,7 +6,7 @@ set -e
 # This script waits on a healthy status from the fork - a valid response to the chainid request
 # We retry every 20 seconds, and wait for a total of 5 minutes (15 times)
 
-export ETHEREUM_HOST="https://aztec-mainnet-fork.aztec.network:8545/$FORK_API_KEY"
+export ETHEREUM_HOST="https://aztec-mainnet-fork.aztec.network:8545/$API_KEY"
 
 curl -H "Content-Type: application/json" -X POST --data '{"method":"eth_chainId","params":[],"id":33,"jsonrpc":"2.0"}' \
   --connect-timeout 30 \
diff --git a/iac/mainnet-fork/terraform/main.tf b/iac/mainnet-fork/terraform/main.tf
index 8cec1f4a18b..18bc1eb3ab2 100644
--- a/iac/mainnet-fork/terraform/main.tf
+++ b/iac/mainnet-fork/terraform/main.tf
@@ -1,7 +1,6 @@
 terraform {
   backend "s3" {
     bucket = "aztec-terraform"
-    key    = "aztec-network/mainnet-fork"
     region = "eu-west-2"
   }
   required_providers {
@@ -50,7 +49,7 @@ provider "aws" {
 }
 
 resource "aws_service_discovery_service" "aztec_mainnet_fork" {
-  name = "aztec-network-mainnet-fork"
+  name = "${var.DEPLOY_TAG}-mainnet-fork"
 
   health_check_custom_config {
     failure_threshold = 1
@@ -75,10 +74,10 @@ resource "aws_service_discovery_service" "aztec_mainnet_fork" {
 
 # EFS filesystem for mainnet fork
 resource "aws_efs_file_system" "aztec_mainnet_fork_data_store" {
-  creation_token = "aztec-network-mainnet-fork-data"
+  creation_token = "${var.DEPLOY_TAG}-mainnet-fork-data"
 
   tags = {
-    Name = "aztec-network-mainnet-fork-data"
+    Name = "${var.DEPLOY_TAG}-mainnet-fork-data"
   }
 
   lifecycle_policy {
@@ -100,7 +99,7 @@ resource "aws_efs_mount_target" "aztec_fork_private_az2" {
 
 # Define deployment task and service
 resource "aws_ecs_task_definition" "aztec_mainnet_fork" {
-  family                   = "aztec-network-mainnet-fork"
+  family                   = "${var.DEPLOY_TAG}-mainnet-fork"
   requires_compatibilities = ["FARGATE"]
   network_mode             = "awsvpc"
   cpu                      = "2048"
@@ -117,13 +116,13 @@ resource "aws_ecs_task_definition" "aztec_mainnet_fork" {
   container_definitions = <<DEFINITION
 [
   {
-    "name": "aztec-network-mainnet-fork",
-    "image": "${var.ECR_URL}/aztec-mainnet-fork:aztec3-packages-prod",
+    "name": "${var.DEPLOY_TAG}-mainnet-fork",
+    "image": "${var.DOCKERHUB_ACCOUNT}/aztec-mainnet-fork:${var.DEPLOY_TAG}",
     "essential": true,
     "environment": [
       {
         "name": "API_KEY",
-        "value": "${var.FORK_API_KEY}"
+        "value": "${var.API_KEY}"
       },
       {
         "name": "MNEMONIC",
@@ -170,7 +169,7 @@ DEFINITION
 
 # ALB to to limit public requests to apikey routes
 resource "aws_alb_target_group" "mainnet_fork" {
-  name                 = "aztec-network-mainnet-fork"
+  name                 = "${var.DEPLOY_TAG}-mainnet-fork"
   port                 = "80"
   protocol             = "HTTP"
   target_type          = "ip"
@@ -181,7 +180,7 @@ resource "aws_alb_target_group" "mainnet_fork" {
   ]
 
   health_check {
-    path                = "/${var.FORK_API_KEY}"
+    path                = "/${var.API_KEY}"
     matcher             = "404,400"
     interval            = 300
     healthy_threshold   = 2
@@ -190,12 +189,12 @@ resource "aws_alb_target_group" "mainnet_fork" {
   }
 
   tags = {
-    name = "aztec-network-mainnet-fork"
+    name = "${var.DEPLOY_TAG}-mainnet-fork"
   }
 }
 
 resource "aws_ecs_service" "aztec_mainnet_fork" {
-  name                               = "aztec-network-mainnet-fork"
+  name                               = "${var.DEPLOY_TAG}-mainnet-fork"
   cluster                            = data.terraform_remote_state.setup_iac.outputs.ecs_cluster_id
   launch_type                        = "FARGATE"
   desired_count                      = 1
@@ -213,13 +212,13 @@ resource "aws_ecs_service" "aztec_mainnet_fork" {
 
   load_balancer {
     target_group_arn = aws_alb_target_group.mainnet_fork.arn
-    container_name   = "aztec-network-mainnet-fork"
+    container_name   = "${var.DEPLOY_TAG}-mainnet-fork"
     container_port   = 80
   }
 
   service_registries {
     registry_arn   = aws_service_discovery_service.aztec_mainnet_fork.arn
-    container_name = "aztec-network-mainnet-fork"
+    container_name = "${var.DEPLOY_TAG}-mainnet-fork"
     container_port = 80
   }
 
@@ -241,7 +240,7 @@ resource "aws_lb_listener_rule" "aztec_mainnet_fork_route" {
 
   condition {
     host_header {
-      values = ["aztec-network-mainnet-fork.aztec.network"]
+      values = ["${var.DEPLOY_TAG}-mainnet-fork.aztec.network"]
     }
   }
 }
@@ -249,7 +248,7 @@ resource "aws_lb_listener_rule" "aztec_mainnet_fork_route" {
 # mainnet-fork DNS entry.
 resource "aws_route53_record" "aztec_mainnet_fork" {
   zone_id = data.terraform_remote_state.aztec2_iac.outputs.aws_route53_zone_id
-  name    = "aztec-network-mainnet-fork"
+  name    = "${var.DEPLOY_TAG}-mainnet-fork"
   type    = "A"
   alias {
     name                   = data.aws_alb.aztec-network_alb.dns_name
diff --git a/iac/mainnet-fork/terraform/variables.tf b/iac/mainnet-fork/terraform/variables.tf
index 611e9b67718..6291254aa1e 100644
--- a/iac/mainnet-fork/terraform/variables.tf
+++ b/iac/mainnet-fork/terraform/variables.tf
@@ -6,10 +6,14 @@ variable "FORK_MNEMONIC" {
   type = string
 }
 
-variable "FORK_API_KEY" {
+variable "API_KEY" {
   type = string
 }
 
-variable "ECR_URL" {
+variable "DOCKERHUB_ACCOUNT" {
+  type = string
+}
+
+variable "DEPLOY_TAG" {
   type = string
 }
diff --git a/l1-contracts/.gitignore b/l1-contracts/.gitignore
index 7ddd4a5a481..6a702f89970 100644
--- a/l1-contracts/.gitignore
+++ b/l1-contracts/.gitignore
@@ -16,4 +16,7 @@ lcov.info
 .foundry
 
 # Yarn lockfile
-yarn.lock
\ No newline at end of file
+yarn.lock
+
+# 'deploy_contracts' script output
+serve/
diff --git a/l1-contracts/Dockerfile b/l1-contracts/Dockerfile
index e312de30b44..73eda3294b3 100644
--- a/l1-contracts/Dockerfile
+++ b/l1-contracts/Dockerfile
@@ -8,7 +8,7 @@ RUN yarn && yarn lint
 # Building requires foundry.
 FROM ghcr.io/foundry-rs/foundry:nightly-c331b5eeee1b4151ef7354a081667e2d770b37f5
 # Required for foundry
-RUN apk update && apk add git
+RUN apk update && apk add git jq bash
 WORKDIR /usr/src/l1-contracts
 COPY . .
 RUN git init
diff --git a/l1-contracts/scripts/ci_deploy_contracts.sh b/l1-contracts/scripts/ci_deploy_contracts.sh
new file mode 100755
index 00000000000..8070d6630df
--- /dev/null
+++ b/l1-contracts/scripts/ci_deploy_contracts.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+FORCE_DEPLOY=${2:-"false"}
+
+export ETHEREUM_HOST=$DEPLOY_TAG-mainnet-fork.aztec.network:8545/$API_KEY
+
+# If we have previously successful commit, we can early out if nothing relevant has changed since.
+if [[ $FORCE_DEPLOY == 'false' ]] && check_rebuild cache-"$CONTENT_HASH" $REPOSITORY; then
+  echo "No contract deploy necessary."
+  exit 0
+fi
+
+mkdir -p serve
+# Contract addresses will be mounted in the serve directory
+docker run \
+  -v $(pwd)/serve:/usr/src/contracts/serve \
+  -e ETHEREUM_HOST=$ETHEREUM_HOST -e PRIVATE_KEY=$CONTRACT_PUBLISHER_PRIVATE_KEY \
+  aztecprotocol/l1-contracts:$DEPLOY_TAG \
+  ./scripts/deploy_contracts.sh
+
+# Write the contract addresses as terraform variables
+for KEY in ROLLUP_CONTRACT_ADDRESS REGISTRY_CONTRACT_ADDRESS INBOX_CONTRACT_ADDRESS OUTBOX_CONTRACT_ADDRESS; do
+  VALUE=$(jq -r .$KEY ./serve/contract_addresses.json)
+  export TF_VAR_$KEY=$VALUE
+done
+
+# Write TF state variables
+deploy_terraform l1-contracts ./terraform
diff --git a/l1-contracts/scripts/deploy_contracts.sh b/l1-contracts/scripts/deploy_contracts.sh
new file mode 100755
index 00000000000..bdd4ebe8053
--- /dev/null
+++ b/l1-contracts/scripts/deploy_contracts.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+set -eu
+
+# Sets up defaults then runs the E2E Setup script to perform contract deployments
+#
+# Expected enviornment variables
+# -ROLLUP_CONTRACT_ADDRESS
+# -CONTRACT_DEPLOYMENT_EMITTER_ADDRESS
+# -INBOX_CONTRACT_ADDRESS
+# -OUTBOX_CONTRACT_ADDRESS
+# -REGISTRY_CONTRACT_ADDRESS
+
+# Create serve directory in which we save contract_addresses.json.
+mkdir -p serve/
+echo "Created output directory"
+
+extract_deployed_to() {
+  grep 'Deployed to:' | awk '{print $3}'
+}
+
+deploy_contract() {
+  CONTRACT="$1"
+  CONSTRUCTOR_ARGS=(${2-})
+  if [ ${#CONSTRUCTOR_ARGS[@]} -gt 0 ]; then
+    forge create --rpc-url $ETHEREUM_HOST --private-key $PRIVATE_KEY $CONTRACT --constructor-args $CONSTRUCTOR_ARGS
+  else
+    forge create --rpc-url $ETHEREUM_HOST --private-key $PRIVATE_KEY $CONTRACT
+  fi
+}
+
+export REGISTRY_CONTRACT_ADDRESS=$(deploy_contract ./src/core/messagebridge/Registry.sol:Registry | extract_deployed_to)
+export INBOX_CONTRACT_ADDRESS=$(deploy_contract ./src/core/messagebridge/Inbox.sol:Inbox "$REGISTRY_CONTRACT_ADDRESS" | extract_deployed_to)
+export OUTBOX_CONTRACT_ADDRESS=$(deploy_contract ./src/core/messagebridge/Outbox.sol:Outbox "$REGISTRY_CONTRACT_ADDRESS" | extract_deployed_to)
+export ROLLUP_CONTRACT_ADDRESS=$(deploy_contract ./src/core/Rollup.sol:Rollup "$REGISTRY_CONTRACT_ADDRESS" | extract_deployed_to)
+export CONTRACT_DEPLOYMENT_EMITTER_ADDRESS=$(deploy_contract ./src/core/periphery/ContractDeploymentEmitter.sol:ContractDeploymentEmitter | extract_deployed_to)
+
+# Store contract addresses in a JSON file
+jq -n \
+  --arg registryAddress "$REGISTRY_CONTRACT_ADDRESS" \
+  --arg inboxAddress "$INBOX_CONTRACT_ADDRESS" \
+  --arg outboxAddress "$OUTBOX_CONTRACT_ADDRESS" \
+  --arg rollupAddress "$ROLLUP_CONTRACT_ADDRESS" \
+  --arg emitterAddress "$CONTRACT_DEPLOYMENT_EMITTER_ADDRESS" \
+  '{
+        REGISTRY_CONTRACT_ADDRESS: $registryAddress,
+        INBOX_CONTRACT_ADDRESS: $inboxAddress,
+        OUTBOX_CONTRACT_ADDRESS: $outboxAddress,
+        ROLLUP_CONTRACT_ADDRESS: $rollupAddress,
+        CONTRACT_DEPLOYMENT_EMITTER_ADDRESS: $emitterAddress
+    }' >serve/contract_addresses.json
+
+cat serve/contract_addresses.json
+
+echo "Contract addresses have been written to serve/contract_addresses.json"
diff --git a/l1-contracts/terraform/main.tf b/l1-contracts/terraform/main.tf
new file mode 100644
index 00000000000..89cb2c801e5
--- /dev/null
+++ b/l1-contracts/terraform/main.tf
@@ -0,0 +1,57 @@
+terraform {
+  backend "s3" {
+    bucket = "aztec-terraform"
+    region = "eu-west-2"
+  }
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "3.74.2"
+    }
+  }
+}
+
+variable "ROLLUP_CONTRACT_ADDRESS" {
+  type    = string
+  default = ""
+}
+
+output "rollup_contract_address" {
+  value = var.ROLLUP_CONTRACT_ADDRESS
+}
+
+variable "REGISTRY_CONTRACT_ADDRESS" {
+  type    = string
+  default = ""
+}
+
+output "registry_contract_address" {
+  value = var.REGISTRY_CONTRACT_ADDRESS
+}
+
+variable "INBOX_CONTRACT_ADDRESS" {
+  type    = string
+  default = ""
+}
+
+output "inbox_contract_address" {
+  value = var.INBOX_CONTRACT_ADDRESS
+}
+
+variable "OUTBOX_CONTRACT_ADDRESS" {
+  type    = string
+  default = ""
+}
+
+output "outbox_contract_address" {
+  value = var.OUTBOX_CONTRACT_ADDRESS
+}
+
+variable "CONTRACT_DEPLOYMENT_EMITTER_ADDRESS" {
+  type    = string
+  default = ""
+}
+
+output "contract_deployment_emitter_address" {
+  value = var.CONTRACT_DEPLOYMENT_EMITTER_ADDRESS
+}
diff --git a/yarn-project/aztec-faucet/terraform/main.tf b/yarn-project/aztec-faucet/terraform/main.tf
index 8a1f901fd09..bfbb82a982b 100644
--- a/yarn-project/aztec-faucet/terraform/main.tf
+++ b/yarn-project/aztec-faucet/terraform/main.tf
@@ -41,7 +41,7 @@ resource "aws_cloudwatch_log_group" "aztec-faucet" {
 }
 
 resource "aws_service_discovery_service" "aztec-faucet" {
-  name = "${var.DEPLOY_TAG}-aztec-faucet"
+  name = "${var.DEPLOY_TAG}-faucet"
 
   health_check_custom_config {
     failure_threshold = 1
@@ -72,7 +72,7 @@ resource "aws_service_discovery_service" "aztec-faucet" {
 
 # Define task definition and service.
 resource "aws_ecs_task_definition" "aztec-faucet" {
-  family                   = "${var.DEPLOY_TAG}-aztec-faucet"
+  family                   = "${var.DEPLOY_TAG}-faucet"
   requires_compatibilities = ["FARGATE"]
   network_mode             = "awsvpc"
   cpu                      = "2048"
@@ -83,8 +83,8 @@ resource "aws_ecs_task_definition" "aztec-faucet" {
   container_definitions = <<DEFINITIONS
 [
   {
-    "name": "${var.DEPLOY_TAG}-aztec-faucet",
-    "image": "${var.ECR_URL}/aztec-faucet:aztec3-packages-prod",
+    "name": "${var.DEPLOY_TAG}-faucet",
+    "image": "${var.DOCKERHUB_ACCOUNT}/aztec-faucet:${var.DEPLOY_TAG}",
     "essential": true,
     "memoryReservation": 3776,
     "portMappings": [
@@ -166,13 +166,13 @@ resource "aws_ecs_service" "aztec-faucet" {
 
   load_balancer {
     target_group_arn = aws_alb_target_group.aztec-faucet.arn
-    container_name   = "${var.DEPLOY_TAG}-aztec-faucet"
+    container_name   = "${var.DEPLOY_TAG}-faucet"
     container_port   = 80
   }
 
   service_registries {
     registry_arn   = aws_service_discovery_service.aztec-faucet.arn
-    container_name = "${var.DEPLOY_TAG}-aztec-faucet"
+    container_name = "${var.DEPLOY_TAG}-faucet"
     container_port = 80
   }
 
@@ -181,7 +181,7 @@ resource "aws_ecs_service" "aztec-faucet" {
 
 # Configure ALB to route /aztec-faucet to server.
 resource "aws_alb_target_group" "aztec-faucet" {
-  name                 = "${var.DEPLOY_TAG}-aztec-faucet"
+  name                 = "${var.DEPLOY_TAG}-faucet"
   port                 = 80
   protocol             = "HTTP"
   target_type          = "ip"
@@ -198,7 +198,7 @@ resource "aws_alb_target_group" "aztec-faucet" {
   }
 
   tags = {
-    name = "${var.DEPLOY_TAG}-aztec-faucet"
+    name = "${var.DEPLOY_TAG}-faucet"
   }
 }
 
diff --git a/yarn-project/aztec-faucet/terraform/variables.tf b/yarn-project/aztec-faucet/terraform/variables.tf
index 6ce160819ba..c5e11b4bbde 100644
--- a/yarn-project/aztec-faucet/terraform/variables.tf
+++ b/yarn-project/aztec-faucet/terraform/variables.tf
@@ -22,6 +22,6 @@ variable "PRIVATE_KEY" {
   type = string
 }
 
-variable "ECR_URL" {
+variable "DOCKERHUB_ACCOUNT" {
   type = string
 }
diff --git a/yarn-project/aztec-node/terraform/main.tf b/yarn-project/aztec-node/terraform/main.tf
index 52b5c903e7c..c0e7a17d833 100644
--- a/yarn-project/aztec-node/terraform/main.tf
+++ b/yarn-project/aztec-node/terraform/main.tf
@@ -1,6 +1,6 @@
 # Terraform to setup a prototype network of Aztec Nodes in AWS
 # It sets up 2 full nodes with different ports/keys etc.
-# Some duplication across the 2 defined services, could possibly 
+# Some duplication across the 2 defined services, could possibly
 # be refactored to use modules as and when we build out infrastructure for real
 
 
@@ -49,14 +49,36 @@ data "terraform_remote_state" "aztec-network_iac" {
   }
 }
 
+data "terraform_remote_state" "l1_contracts" {
+  backend = "s3"
+  config = {
+    bucket = "aztec-terraform"
+    key    = "${var.DEPLOY_TAG}/l1-contracts"
+    region = "eu-west-2"
+  }
+}
+
+# Compute local variables
+locals {
+  publisher_private_keys = [var.SEQ_1_PUBLISHER_PRIVATE_KEY, var.SEQ_2_PUBLISHER_PRIVATE_KEY]
+  bootnode_ids           = [var.BOOTNODE_1_PEER_ID, var.BOOTNODE_2_PEER_ID]
+  node_p2p_private_keys  = [var.NODE_1_PRIVATE_KEY, var.NODE_2_PRIVATE_KEY]
+  node_count             = length(local.publisher_private_keys)
+  bootnodes = [for i in range(0, local.node_count) :
+    "/dns4/${var.DEPLOY_TAG}-aztec-bootstrap-${i + 1}.local/tcp/${var.BOOTNODE_LISTEN_PORT + i}/p2p/${bootnode_ids[i]}"
+  ]
+  combined_bootnodes = join(",", local.bootnodes)
+}
 
-resource "aws_cloudwatch_log_group" "aztec-node-log-group-1" {
-  name              = "/fargate/service/${var.DEPLOY_TAG}/aztec-node-1"
+resource "aws_cloudwatch_log_group" "aztec-node-log-group" {
+  count             = local.node_count
+  name              = "/fargate/service/${var.DEPLOY_TAG}/aztec-node-${count.index + 1}"
   retention_in_days = 14
 }
 
-resource "aws_service_discovery_service" "aztec-node-1" {
-  name = "${var.DEPLOY_TAG}-aztec-node-1"
+resource "aws_service_discovery_service" "aztec-node" {
+  count = local.node_count
+  name  = "${var.DEPLOY_TAG}-aztec-node-${count.index + 1}"
 
   health_check_custom_config {
     failure_threshold = 1
@@ -81,25 +103,26 @@ resource "aws_service_discovery_service" "aztec-node-1" {
   # Terraform just fails if this resource changes and you have registered instances.
   provisioner "local-exec" {
     when    = destroy
-    command = "${path.module}/../servicediscovery-drain.sh ${self.id}"
+    command = "${path.module}/servicediscovery-drain.sh ${self.id}"
   }
 }
 
-# Define task definition and service.
-resource "aws_ecs_task_definition" "aztec-node-1" {
-  family                   = "${var.DEPLOY_TAG}-aztec-node-1"
+# Define task definitions for each node.
+resource "aws_ecs_task_definition" "aztec-node" {
+  # for_each                 = var.node_keys
+  count                    = local.node_count
+  family                   = "${var.DEPLOY_TAG}-aztec-node-${count.index + 1}"
   requires_compatibilities = ["FARGATE"]
   network_mode             = "awsvpc"
   cpu                      = "2048"
   memory                   = "4096"
   execution_role_arn       = data.terraform_remote_state.setup_iac.outputs.ecs_task_execution_role_arn
   task_role_arn            = data.terraform_remote_state.aztec2_iac.outputs.cloudwatch_logging_ecs_role_arn
-
-  container_definitions = <<DEFINITIONS
+  container_definitions    = <<DEFINITIONS
 [
   {
-    "name": "${var.DEPLOY_TAG}-aztec-node-1",
-    "image": "${var.ECR_URL}/aztec-node:aztec3-packages-prod",
+    "name": "${var.DEPLOY_TAG}-aztec-node-${count.index + 1}",
+    "image": "${var.DOCKERHUB_ACCOUNT}/aztec-sandbox:${var.DEPLOY_TAG}",
     "essential": true,
     "memoryReservation": 3776,
     "portMappings": [
@@ -107,14 +130,22 @@ resource "aws_ecs_task_definition" "aztec-node-1" {
         "containerPort": 80
       },
       {
-        "containerPort": ${var.NODE_1_TCP_PORT}
+        "containerPort": ${var.NODE_TCP_PORT + count.index + 1}
       }
     ],
     "environment": [
+      {
+        "name": "MODE",
+        "value": "node"
+      },
       {
         "name": "NODE_ENV",
         "value": "production"
       },
+      {
+        "name": "DEPLOY_TAG",
+        "value": "${var.DEPLOY_TAG}"
+      },
       {
         "name": "AZTEC_NODE_PORT",
         "value": "80"
@@ -145,23 +176,23 @@ resource "aws_ecs_task_definition" "aztec-node-1" {
       },
       {
         "name": "SEQ_PUBLISHER_PRIVATE_KEY",
-        "value": "${var.SEQ_1_PUBLISHER_PRIVATE_KEY}"
+        "value": "${local.publisher_private_keys[count.index]}"
       },
       {
         "name": "CONTRACT_DEPLOYMENT_EMITTER_ADDRESS",
-        "value": "${var.CONTRACT_DEPLOYMENT_EMITTER_ADDRESS}"
+        "value": "${data.terraform_remote_state.l1_contracts.outputs.contract_deployment_emitter_address}"
       },
       {
         "name": "ROLLUP_CONTRACT_ADDRESS",
-        "value": "${var.ROLLUP_CONTRACT_ADDRESS}"
+        "value": "${data.terraform_remote_state.l1_contracts.outputs.rollup_contract_address}"
       },
       {
         "name": "INBOX_CONTRACT_ADDRESS",
-        "value": "${var.INBOX_CONTRACT_ADDRESS}"
+        "value": "${data.terraform_remote_state.l1_contracts.outputs.inbox_contract_address}"
       },
       {
         "name": "REGISTRY_CONTRACT_ADDRESS",
-        "value": "${var.REGISTRY_CONTRACT_ADDRESS}"
+        "value": "${data.terraform_remote_state.l1_contracts.outputs.registry_contract_address}"
       },
       {
         "name": "API_KEY",
@@ -169,11 +200,11 @@ resource "aws_ecs_task_definition" "aztec-node-1" {
       },
       {
         "name": "API_PREFIX",
-        "value": "/${var.DEPLOY_TAG}/aztec-node-1"
+        "value": "/${var.DEPLOY_TAG}/aztec-node-${count.index + 1}"
       },
       {
         "name": "P2P_TCP_LISTEN_PORT",
-        "value": "${var.NODE_1_TCP_PORT}"
+        "value": "${var.NODE_TCP_PORT + count.index}"
       },
       {
         "name": "P2P_TCP_LISTEN_IP",
@@ -185,11 +216,11 @@ resource "aws_ecs_task_definition" "aztec-node-1" {
       },
       {
         "name": "P2P_ANNOUNCE_PORT",
-        "value": "${var.NODE_1_TCP_PORT}"
+        "value": "${var.NODE_TCP_PORT + count.index}"
       },
       {
         "name": "BOOTSTRAP_NODES",
-        "value": "/dns4/aztec-dev-aztec-bootstrap-2.local/tcp/${var.BOOTNODE_2_LISTEN_PORT}/p2p/${var.BOOTNODE_2_PEER_ID},/dns4/aztec-dev-aztec-bootstrap-1.local/tcp/${var.BOOTNODE_1_LISTEN_PORT}/p2p/${var.BOOTNODE_1_PEER_ID}"
+        "value": "${local.combined_bootnodes}"
       },
       {
         "name": "P2P_ENABLED",
@@ -201,7 +232,7 @@ resource "aws_ecs_task_definition" "aztec-node-1" {
       },
       {
         "name": "PEER_ID_PRIVATE_KEY",
-        "value": "${var.NODE_1_PRIVATE_KEY}"
+        "value": "${local.node_p2p_private_keys[count.index]}"
       },
       {
         "name": "P2P_MIN_PEERS",
@@ -215,7 +246,7 @@ resource "aws_ecs_task_definition" "aztec-node-1" {
     "logConfiguration": {
       "logDriver": "awslogs",
       "options": {
-        "awslogs-group": "/fargate/service/${var.DEPLOY_TAG}/aztec-node-1",
+        "awslogs-group": "/fargate/service/${var.DEPLOY_TAG}/aztec-node-${count.index + 1}",
         "awslogs-region": "eu-west-2",
         "awslogs-stream-prefix": "ecs"
       }
@@ -225,8 +256,9 @@ resource "aws_ecs_task_definition" "aztec-node-1" {
 DEFINITIONS
 }
 
-resource "aws_ecs_service" "aztec-node-1" {
-  name                               = "${var.DEPLOY_TAG}-aztec-node-1"
+resource "aws_ecs_service" "aztec-node" {
+  count                              = local.node_count
+  name                               = "${var.DEPLOY_TAG}-aztec-node-${count.index + 1}"
   cluster                            = data.terraform_remote_state.setup_iac.outputs.ecs_cluster_id
   launch_type                        = "FARGATE"
   desired_count                      = 1
@@ -234,6 +266,7 @@ resource "aws_ecs_service" "aztec-node-1" {
   deployment_minimum_healthy_percent = 0
   platform_version                   = "1.4.0"
 
+
   network_configuration {
     subnets = [
       data.terraform_remote_state.setup_iac.outputs.subnet_az1_private_id,
@@ -243,29 +276,31 @@ resource "aws_ecs_service" "aztec-node-1" {
   }
 
   load_balancer {
-    target_group_arn = aws_alb_target_group.aztec-node-1.arn
-    container_name   = "${var.DEPLOY_TAG}-aztec-node-1"
+    target_group_arn = aws_alb_target_group.aztec-node[count.index].arn
+    container_name   = "${var.DEPLOY_TAG}-aztec-node-${count.index + 1}"
     container_port   = 80
   }
 
+
   load_balancer {
-    target_group_arn = aws_lb_target_group.aztec-node-1-target-group.arn
-    container_name   = "${var.DEPLOY_TAG}-aztec-node-1"
-    container_port   = var.NODE_1_TCP_PORT
+    target_group_arn = aws_lb_target_group.aztec-node-target-group[count.index].arn
+    container_name   = "${var.DEPLOY_TAG}-aztec-node-${count.index + 1}"
+    container_port   = var.NODE_TCP_PORT + count.index
   }
 
   service_registries {
-    registry_arn   = aws_service_discovery_service.aztec-node-1.arn
-    container_name = "${var.DEPLOY_TAG}-aztec-node-1"
+    registry_arn   = aws_service_discovery_service.aztec-node[count.index].arn
+    container_name = "${var.DEPLOY_TAG}-aztec-node-${count.index + 1}"
     container_port = 80
   }
 
-  task_definition = aws_ecs_task_definition.aztec-node-1.family
+  task_definition = aws_ecs_task_definition.aztec-node[count.index].family
 }
 
 # Configure ALB to route /aztec-node to server.
-resource "aws_alb_target_group" "aztec-node-1" {
-  name                 = "${var.DEPLOY_TAG}-node-1-http-target"
+resource "aws_alb_target_group" "aztec-node" {
+  count                = local.node_count
+  name                 = "${var.DEPLOY_TAG}-node-${count.index + 1}-http-target"
   port                 = 80
   protocol             = "HTTP"
   target_type          = "ip"
@@ -273,7 +308,7 @@ resource "aws_alb_target_group" "aztec-node-1" {
   deregistration_delay = 5
 
   health_check {
-    path                = "/${var.DEPLOY_TAG}/aztec-node-1/status"
+    path                = "/${var.DEPLOY_TAG}/aztec-node-${count.index + 1}/status"
     matcher             = "200"
     interval            = 10
     healthy_threshold   = 2
@@ -282,29 +317,31 @@ resource "aws_alb_target_group" "aztec-node-1" {
   }
 
   tags = {
-    name = "${var.DEPLOY_TAG}-aztec-node-1"
+    name = "${var.DEPLOY_TAG}-aztec-node-${count.index + 1}"
   }
 }
 
-resource "aws_lb_listener_rule" "api-1" {
+resource "aws_lb_listener_rule" "api" {
+  count        = local.node_count
   listener_arn = data.terraform_remote_state.aztec2_iac.outputs.alb_listener_arn
-  priority     = 500
+  priority     = 500 + count.index
 
   action {
     type             = "forward"
-    target_group_arn = aws_alb_target_group.aztec-node-1.arn
+    target_group_arn = aws_alb_target_group.aztec-node[count.index].arn
   }
 
   condition {
     path_pattern {
-      values = ["/${var.DEPLOY_TAG}/aztec-node-1*"]
+      values = ["/${var.DEPLOY_TAG}/aztec-node-${count.index}*"]
     }
   }
 }
 
-resource "aws_lb_target_group" "aztec-node-1-target-group" {
-  name        = "${var.DEPLOY_TAG}-node-1-p2p-target"
-  port        = var.NODE_1_TCP_PORT
+resource "aws_lb_target_group" "aztec-node-target-group" {
+  count       = local.node_count
+  name        = "${var.DEPLOY_TAG}-node-${count.index + 1}-p2p-target"
+  port        = var.NODE_TCP_PORT + count.index
   protocol    = "TCP"
   target_type = "ip"
   vpc_id      = data.terraform_remote_state.setup_iac.outputs.vpc_id
@@ -314,14 +351,15 @@ resource "aws_lb_target_group" "aztec-node-1-target-group" {
     interval            = 10
     healthy_threshold   = 2
     unhealthy_threshold = 2
-    port                = var.NODE_1_TCP_PORT
+    port                = var.NODE_TCP_PORT + count.index
   }
 }
 
-resource "aws_security_group_rule" "allow-node-1-tcp" {
+resource "aws_security_group_rule" "allow-node-tcp" {
+  count             = local.node_count
   type              = "ingress"
-  from_port         = var.NODE_1_TCP_PORT
-  to_port           = var.NODE_1_TCP_PORT
+  from_port         = var.NODE_TCP_PORT + count.index
+  to_port           = var.NODE_TCP_PORT + count.index
   protocol          = "tcp"
   cidr_blocks       = ["0.0.0.0/0"]
   security_group_id = data.terraform_remote_state.aztec-network_iac.outputs.p2p_security_group_id
@@ -331,323 +369,23 @@ resource "aws_security_group_rule" "allow-node-1-tcp" {
 ## NLB listeners can't have a 'weight' property defined. You will see there isn't one here but that doesn't
 ## stop it trying to automatically specify one and giving an error
 
-# resource "aws_lb_listener" "aztec-node-1-tcp-listener" {
-#   load_balancer_arn = data.terraform_remote_state.aztec-network_iac.outputs.nlb_arn
-#   port              = "${var.NODE_1_TCP_PORT}"
-#   protocol          = "TCP"
-
-#   tags = {
-#     name = "aztec-node-1-tcp-listener"
-#   }
-
-#   default_action {
-#     type = "forward"
-
-#     forward {
-#       target_group {
-#         arn    = aws_lb_target_group.aztec-bootstrap-1-target-group.arn
-#       }
-#     }
-#   }
-# }
-
-resource "aws_cloudwatch_log_group" "aztec-node-log-group-2" {
-  name              = "/fargate/service/${var.DEPLOY_TAG}/aztec-node-2"
-  retention_in_days = 14
-}
-
-resource "aws_service_discovery_service" "aztec-node-2" {
-  name = "${var.DEPLOY_TAG}-aztec-node-2"
-
-  health_check_custom_config {
-    failure_threshold = 1
-  }
-
-  dns_config {
-    namespace_id = data.terraform_remote_state.setup_iac.outputs.local_service_discovery_id
-
-    dns_records {
-      ttl  = 60
-      type = "A"
-    }
-
-    dns_records {
-      ttl  = 60
-      type = "SRV"
-    }
-
-    routing_policy = "MULTIVALUE"
-  }
-
-  # Terraform just fails if this resource changes and you have registered instances.
-  provisioner "local-exec" {
-    when    = destroy
-    command = "${path.module}/../servicediscovery-drain.sh ${self.id}"
-  }
-}
-
-# Define task definition and service.
-resource "aws_ecs_task_definition" "aztec-node-2" {
-  family                   = "${var.DEPLOY_TAG}-aztec-node-2"
-  requires_compatibilities = ["FARGATE"]
-  network_mode             = "awsvpc"
-  cpu                      = "2048"
-  memory                   = "4096"
-  execution_role_arn       = data.terraform_remote_state.setup_iac.outputs.ecs_task_execution_role_arn
-  task_role_arn            = data.terraform_remote_state.aztec2_iac.outputs.cloudwatch_logging_ecs_role_arn
-
-  container_definitions = <<DEFINITIONS
-[
-  {
-    "name": "${var.DEPLOY_TAG}-aztec-node-2",
-    "image": "${var.ECR_URL}/aztec-node:aztec3-packages-prod",
-    "essential": true,
-    "memoryReservation": 3776,
-    "portMappings": [
-      {
-        "containerPort": 80
-      },
-      {
-        "containerPort": ${var.NODE_2_TCP_PORT}
-      }
-    ],
-    "environment": [
-      {
-        "name": "NODE_ENV",
-        "value": "production"
-      },
-      {
-        "name": "AZTEC_NODE_PORT",
-        "value": "80"
-      },
-      {
-        "name": "DEBUG",
-        "value": "aztec:*"
-      },
-      {
-        "name": "ETHEREUM_HOST",
-        "value": "testnet"
-      },
-      {
-        "name": "ARCHIVER_POLLING_INTERVAL",
-        "value": "10000"
-      },
-      {
-        "name": "SEQ_RETRY_INTERVAL",
-        "value": "10000"
-      },
-      {
-        "name": "SEQ_MAX_TX_PER_BLOCK",
-        "value": "${var.SEQ_MAX_TX_PER_BLOCK}"
-      },
-      {
-        "name": "SEQ_MIN_TX_PER_BLOCK",
-        "value": "${var.SEQ_MIN_TX_PER_BLOCK}"
-      },
-      {
-        "name": "SEQ_PUBLISHER_PRIVATE_KEY",
-        "value": "${var.SEQ_2_PUBLISHER_PRIVATE_KEY}"
-      },
-      {
-        "name": "CONTRACT_DEPLOYMENT_EMITTER_ADDRESS",
-        "value": "${var.CONTRACT_DEPLOYMENT_EMITTER_ADDRESS}"
-      },
-      {
-        "name": "ROLLUP_CONTRACT_ADDRESS",
-        "value": "${var.ROLLUP_CONTRACT_ADDRESS}"
-      },
-      {
-        "name": "INBOX_CONTRACT_ADDRESS",
-        "value": "${var.INBOX_CONTRACT_ADDRESS}"
-      },
-      {
-        "name": "REGISTRY_CONTRACT_ADDRESS",
-        "value": "${var.REGISTRY_CONTRACT_ADDRESS}"
-      },
-      {
-        "name": "API_KEY",
-        "value": "${var.API_KEY}"
-      },
-      {
-        "name": "API_PREFIX",
-        "value": "/${var.DEPLOY_TAG}/aztec-node-2"
-      },
-      {
-        "name": "P2P_TCP_LISTEN_PORT",
-        "value": "${var.NODE_2_TCP_PORT}"
-      },
-      {
-        "name": "P2P_TCP_LISTEN_IP",
-        "value": "0.0.0.0"
-      },
-      {
-        "name": "P2P_ANNOUNCE_HOSTNAME",
-        "value": "/dns4/${data.terraform_remote_state.aztec-network_iac.outputs.nlb_dns}"
-      },
-      {
-        "name": "P2P_ANNOUNCE_PORT",
-        "value": "${var.NODE_2_TCP_PORT}"
-      },
-      {
-        "name": "BOOTSTRAP_NODES",
-        "value": "/dns4/aztec-dev-aztec-bootstrap-2.local/tcp/${var.BOOTNODE_2_LISTEN_PORT}/p2p/${var.BOOTNODE_2_PEER_ID},/dns4/aztec-dev-aztec-bootstrap-1.local/tcp/${var.BOOTNODE_1_LISTEN_PORT}/p2p/${var.BOOTNODE_1_PEER_ID}"
-      },
-      {
-        "name": "P2P_ENABLED",
-        "value": "true"
-      },
-      {
-        "name": "CHAIN_ID",
-        "value": "${var.CHAIN_ID}"
-      },
-      {
-        "name": "PEER_ID_PRIVATE_KEY",
-        "value": "${var.NODE_2_PRIVATE_KEY}"
-      },
-      {
-        "name": "P2P_MIN_PEERS",
-        "value": "${var.P2P_MIN_PEERS}"
-      },
-      {
-        "name": "P2P_MAX_PEERS",
-        "value": "${var.P2P_MAX_PEERS}"
-      }
-    ],
-    "logConfiguration": {
-      "logDriver": "awslogs",
-      "options": {
-        "awslogs-group": "/fargate/service/${var.DEPLOY_TAG}/aztec-node-2",
-        "awslogs-region": "eu-west-2",
-        "awslogs-stream-prefix": "ecs"
-      }
-    }
-  }
-]
-DEFINITIONS
-}
-
-resource "aws_ecs_service" "aztec-node-2" {
-  name                               = "${var.DEPLOY_TAG}-aztec-node-2"
-  cluster                            = data.terraform_remote_state.setup_iac.outputs.ecs_cluster_id
-  launch_type                        = "FARGATE"
-  desired_count                      = 1
-  deployment_maximum_percent         = 100
-  deployment_minimum_healthy_percent = 0
-  platform_version                   = "1.4.0"
-
-  network_configuration {
-    subnets = [
-      data.terraform_remote_state.setup_iac.outputs.subnet_az1_private_id,
-      data.terraform_remote_state.setup_iac.outputs.subnet_az2_private_id
-    ]
-    security_groups = [data.terraform_remote_state.aztec-network_iac.outputs.p2p_security_group_id, data.terraform_remote_state.setup_iac.outputs.security_group_private_id]
-  }
-
-  load_balancer {
-    target_group_arn = aws_lb_target_group.aztec-node-2-target-group.arn
-    container_name   = "${var.DEPLOY_TAG}-aztec-node-2"
-    container_port   = var.NODE_2_TCP_PORT
-  }
-
-  load_balancer {
-    target_group_arn = aws_alb_target_group.aztec-node-2.arn
-    container_name   = "${var.DEPLOY_TAG}-aztec-node-2"
-    container_port   = 80
-  }
-
-  service_registries {
-    registry_arn   = aws_service_discovery_service.aztec-node-2.arn
-    container_name = "${var.DEPLOY_TAG}-aztec-node-2"
-    container_port = 80
-  }
-
-  task_definition = aws_ecs_task_definition.aztec-node-2.family
-}
-
-# Configure ALB to route /aztec-node to server.
-resource "aws_alb_target_group" "aztec-node-2" {
-  name                 = "${var.DEPLOY_TAG}-node-2-http-target"
-  port                 = 80
-  protocol             = "HTTP"
-  target_type          = "ip"
-  vpc_id               = data.terraform_remote_state.setup_iac.outputs.vpc_id
-  deregistration_delay = 5
-
-  health_check {
-    path                = "/${var.DEPLOY_TAG}/aztec-node-2/status"
-    matcher             = "200"
-    interval            = 10
-    healthy_threshold   = 2
-    unhealthy_threshold = 5
-    timeout             = 5
-  }
+resource "aws_lb_listener" "aztec-node-tcp-listener" {
+  count             = local.node_count
+  load_balancer_arn = data.terraform_remote_state.aztec-network_iac.outputs.nlb_arn
+  port              = var.NODE_TCP_PORT + count.index
+  protocol          = "TCP"
 
   tags = {
-    name = "${var.DEPLOY_TAG}-aztec-node-2"
+    name = "aztec-node-${count.index}-tcp-listener"
   }
-}
 
-resource "aws_lb_listener_rule" "api-2" {
-  listener_arn = data.terraform_remote_state.aztec2_iac.outputs.alb_listener_arn
-  priority     = 501
+  default_action {
+    type = "forward"
 
-  action {
-    type             = "forward"
-    target_group_arn = aws_alb_target_group.aztec-node-2.arn
-  }
-
-  condition {
-    path_pattern {
-      values = ["/${var.DEPLOY_TAG}/aztec-node-2*"]
+    forward {
+      target_group {
+        arn = aws_lb_target_group.aztec-bootstrap-target-group[count.index].arn
+      }
     }
   }
 }
-
-resource "aws_lb_target_group" "aztec-node-2-target-group" {
-  name        = "${var.DEPLOY_TAG}-node-2-p2p-target"
-  port        = var.NODE_2_TCP_PORT
-  protocol    = "TCP"
-  target_type = "ip"
-  vpc_id      = data.terraform_remote_state.setup_iac.outputs.vpc_id
-
-  health_check {
-    protocol            = "TCP"
-    interval            = 10
-    healthy_threshold   = 2
-    unhealthy_threshold = 2
-    port                = var.NODE_2_TCP_PORT
-  }
-}
-
-resource "aws_security_group_rule" "allow-node-2-tcp" {
-  type              = "ingress"
-  from_port         = var.NODE_2_TCP_PORT
-  to_port           = var.NODE_2_TCP_PORT
-  protocol          = "tcp"
-  cidr_blocks       = ["0.0.0.0/0"]
-  security_group_id = data.terraform_remote_state.aztec-network_iac.outputs.p2p_security_group_id
-}
-
-## Commented out here and setup manually as terraform (or the aws provider version we are using) has a bug
-## NLB listeners can't have a 'weight' property defined. You will see there isn't one here but that doesn't
-## stop it trying to automatically specify one and giving an error
-
-# resource "aws_lb_listener" "aztec-node-2-tcp-listener" {
-#   load_balancer_arn = data.terraform_remote_state.aztec-network_iac.outputs.nlb_arn
-#   port              = "${var.NODE_2_TCP_PORT}"
-#   protocol          = "TCP"
-
-#   tags = {
-#     name = "aztec-node-2-tcp-listener"
-#   }
-
-#   default_action {
-#     type = "forward"
-
-#     forward {
-#       target_group {
-#         arn    = aws_lb_target_group.aztec-bootstrap-2-target-group.arn
-#       }
-#     }
-#   }
-# }
diff --git a/yarn-project/aztec-node/terraform/servicediscovery-drain.sh b/yarn-project/aztec-node/terraform/servicediscovery-drain.sh
new file mode 100755
index 00000000000..1fa02e92d91
--- /dev/null
+++ b/yarn-project/aztec-node/terraform/servicediscovery-drain.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+[ $# -ne 1 ] && echo "Usage: $0 <service-id>" && exit 1
+
+serviceId="--service-id=$1"
+
+echo "Draining servicediscovery instances from $1 ..."
+ids="$(aws servicediscovery list-instances $serviceId --query 'Instances[].Id' --output text | tr '\t' ' ')"
+
+found=
+for id in $ids; do
+  if [ -n "$id" ]; then
+    echo "Deregistering $1 / $id ..."
+    aws servicediscovery deregister-instance $serviceId --instance-id "$id"
+    found=1
+  fi
+done
+
+# Yes, I'm being lazy here...
+[ -n "$found" ] && sleep 5 || true
\ No newline at end of file
diff --git a/yarn-project/aztec-node/terraform/variables.tf b/yarn-project/aztec-node/terraform/variables.tf
index d80ae23529d..f8c10fefd2c 100644
--- a/yarn-project/aztec-node/terraform/variables.tf
+++ b/yarn-project/aztec-node/terraform/variables.tf
@@ -31,15 +31,13 @@ variable "SEQ_2_PUBLISHER_PRIVATE_KEY" {
 }
 
 variable "CHAIN_ID" {
-  type = string
+  type    = string
+  default = 31337
 }
 
-variable "BOOTNODE_1_LISTEN_PORT" {
-  type = string
-}
-
-variable "BOOTNODE_2_LISTEN_PORT" {
-  type = string
+variable "BOOTNODE_LISTEN_PORT" {
+  type    = number
+  default = 40500
 }
 
 variable "BOOTNODE_1_PEER_ID" {
@@ -50,12 +48,9 @@ variable "BOOTNODE_2_PEER_ID" {
   type = string
 }
 
-variable "NODE_1_TCP_PORT" {
-  type = string
-}
-
-variable "NODE_2_TCP_PORT" {
-  type = string
+variable "NODE_TCP_PORT" {
+  type    = number
+  default = 40400
 }
 
 variable "NODE_1_PRIVATE_KEY" {
@@ -66,22 +61,26 @@ variable "NODE_2_PRIVATE_KEY" {
   type = string
 }
 
-variable "ECR_URL" {
+variable "DOCKERHUB_ACCOUNT" {
   type = string
 }
 
 variable "SEQ_MAX_TX_PER_BLOCK" {
-  type = string
+  type    = string
+  default = 64
 }
 
 variable "SEQ_MIN_TX_PER_BLOCK" {
-  type = string
+  type    = string
+  default = 1
 }
 
 variable "P2P_MIN_PEERS" {
-  type = string
+  type    = string
+  default = 50
 }
 
 variable "P2P_MAX_PEERS" {
-  type = string
+  type    = string
+  default = 100
 }
diff --git a/yarn-project/ethereum/src/testnet.ts b/yarn-project/ethereum/src/testnet.ts
index b260356df75..4c3694f9361 100644
--- a/yarn-project/ethereum/src/testnet.ts
+++ b/yarn-project/ethereum/src/testnet.ts
@@ -2,6 +2,8 @@ import { Chain } from 'viem';
 
 import { EthereumChain } from './ethereum_chain.js';
 
+const { DEPLOY_TAG = 'aztec-dev' } = process.env;
+
 export const createTestnetChain = (apiKey: string) => {
   const chain: Chain = {
     id: 677868,
@@ -14,10 +16,10 @@ export const createTestnetChain = (apiKey: string) => {
     },
     rpcUrls: {
       default: {
-        http: [`https://aztec-connect-testnet-eth-host.aztec.network:8545/${apiKey}`],
+        http: [`https://${DEPLOY_TAG}-mainnet-fork.aztec.network:8545/${apiKey}`],
       },
       public: {
-        http: [`https://aztec-connect-testnet-eth-host.aztec.network:8545/${apiKey}`],
+        http: [`https://${DEPLOY_TAG}-mainnet-fork.aztec.network:8545/${apiKey}`],
       },
     },
   };
diff --git a/yarn-project/p2p-bootstrap/terraform/main.tf b/yarn-project/p2p-bootstrap/terraform/main.tf
index a5b2f88ffb4..311c9b9b241 100644
--- a/yarn-project/p2p-bootstrap/terraform/main.tf
+++ b/yarn-project/p2p-bootstrap/terraform/main.tf
@@ -1,6 +1,6 @@
 # Terraform to setup a prototype network of Aztec Boot Nodes in AWS
 # It sets up 2 boot nodes with different ports/keys etc.
-# Some duplication across the 2 defined services, could possibly 
+# Some duplication across the 2 defined services, could possibly
 # be refactored to use modules as and when we build out infrastructure for real
 
 terraform {
@@ -48,14 +48,20 @@ data "terraform_remote_state" "aztec-network_iac" {
   }
 }
 
+locals {
+  bootnode_keys  = [var.BOOTNODE_1_PRIVATE_KEY, var.BOOTNODE_2_PRIVATE_KEY]
+  bootnode_count = length(local.bootnode_keys)
+}
+
 
-resource "aws_cloudwatch_log_group" "aztec-bootstrap-1-log-group" {
-  name              = "/fargate/service/${var.DEPLOY_TAG}/aztec-bootstrap-1"
+resource "aws_cloudwatch_log_group" "aztec-bootstrap-log-group" {
+  count             = local.bootnode_count
+  name              = "/fargate/service/${var.DEPLOY_TAG}/aztec-bootstrap-${count.index + 1}"
   retention_in_days = 14
 }
 
-resource "aws_service_discovery_service" "aztec-bootstrap-1" {
-  name = "${var.DEPLOY_TAG}-aztec-bootstrap-1"
+resource "aws_service_discovery_service" "aztec-bootstrap" {
+  name = "${var.DEPLOY_TAG}-aztec-bootstrap-${count.index + 1}"
 
   health_check_custom_config {
     failure_threshold = 1
@@ -80,12 +86,13 @@ resource "aws_service_discovery_service" "aztec-bootstrap-1" {
   # Terraform just fails if this resource changes and you have registered instances.
   provisioner "local-exec" {
     when    = destroy
-    command = "${path.module}/../servicediscovery-drain.sh ${self.id}"
+    command = "${path.module}/servicediscovery-drain.sh ${self.id}"
   }
 }
 
-resource "aws_ecs_task_definition" "aztec-bootstrap-1" {
-  family                   = "${var.DEPLOY_TAG}-aztec-bootstrap-1"
+resource "aws_ecs_task_definition" "aztec-bootstrap" {
+  count                    = local.bootnode_count
+  family                   = "${var.DEPLOY_TAG}-aztec-bootstrap-${count.index + 1}"
   requires_compatibilities = ["FARGATE"]
   network_mode             = "awsvpc"
   cpu                      = "2048"
@@ -96,14 +103,14 @@ resource "aws_ecs_task_definition" "aztec-bootstrap-1" {
   container_definitions = <<DEFINITIONS
 [
   {
-    "name": "${var.DEPLOY_TAG}-aztec-bootstrap-1",
-    "image": "${var.ECR_URL}/p2p-bootstrap:aztec3-packages-prod",
+    "name": "${var.DEPLOY_TAG}-aztec-bootstrap-${count.index + 1}",
+    "image": "${var.DOCKERHUB_ACCOUNT}/aztec-sandbox:${var.DEPLOY_TAG}",
     "essential": true,
     "command": ["start"],
     "memoryReservation": 3776,
     "portMappings": [
       {
-        "containerPort": ${var.BOOTNODE_1_LISTEN_PORT}
+        "containerPort": ${var.BOOTNODE_LISTEN_PORT + count.index}
       },
       {
         "containerPort": 80
@@ -114,9 +121,13 @@ resource "aws_ecs_task_definition" "aztec-bootstrap-1" {
         "name": "NODE_ENV",
         "value": "production"
       },
+      {
+        "name": "MODE",
+        "value": "p2p-bootstrap"
+      },
       {
         "name": "P2P_TCP_LISTEN_PORT",
-        "value": "${var.BOOTNODE_1_LISTEN_PORT}"
+        "value": "${var.BOOTNODE_LISTEN_PORT + count.index}"
       },
       {
         "name": "P2P_TCP_LISTEN_IP",
@@ -124,7 +135,7 @@ resource "aws_ecs_task_definition" "aztec-bootstrap-1" {
       },
       {
         "name": "PEER_ID_PRIVATE_KEY",
-        "value": "${var.BOOTNODE_1_PRIVATE_KEY}"
+        "value": "${local.bootnode_keys[count.index]}"
       },
       {
         "name": "DEBUG",
@@ -142,7 +153,7 @@ resource "aws_ecs_task_definition" "aztec-bootstrap-1" {
     "logConfiguration": {
       "logDriver": "awslogs",
       "options": {
-        "awslogs-group": "/fargate/service/${var.DEPLOY_TAG}/aztec-bootstrap-1",
+        "awslogs-group": "/fargate/service/${var.DEPLOY_TAG}/aztec-bootstrap-${count.index + 1}",
         "awslogs-region": "eu-west-2",
         "awslogs-stream-prefix": "ecs"
       }
@@ -152,8 +163,9 @@ resource "aws_ecs_task_definition" "aztec-bootstrap-1" {
 DEFINITIONS
 }
 
-resource "aws_ecs_service" "aztec-bootstrap-1" {
-  name                               = "${var.DEPLOY_TAG}-aztec-bootstrap-1"
+resource "aws_ecs_service" "aztec-bootstrap" {
+  count                              = local.bootnode_count
+  name                               = "${var.DEPLOY_TAG}-aztec-bootstrap-${count.index + 1}"
   cluster                            = data.terraform_remote_state.setup_iac.outputs.ecs_cluster_id
   launch_type                        = "FARGATE"
   desired_count                      = 1
@@ -170,23 +182,24 @@ resource "aws_ecs_service" "aztec-bootstrap-1" {
   }
 
   service_registries {
-    registry_arn   = aws_service_discovery_service.aztec-bootstrap-1.arn
-    container_name = "${var.DEPLOY_TAG}-aztec-bootstrap-1"
+    registry_arn   = aws_service_discovery_service.aztec-bootstrap[count.index].arn
+    container_name = "${var.DEPLOY_TAG}-aztec-bootstrap-${count.index + 1}"
     container_port = 80
   }
 
   load_balancer {
-    target_group_arn = aws_lb_target_group.aztec-bootstrap-1-target-group.id
-    container_name   = "${var.DEPLOY_TAG}-aztec-bootstrap-1"
-    container_port   = var.BOOTNODE_1_LISTEN_PORT
+    target_group_arn = aws_lb_target_group.aztec-bootstrap-target-group[count.index].id
+    container_name   = "${var.DEPLOY_TAG}-aztec-bootstrap-${count.index + 1}"
+    container_port   = var.BOOTNODE_LISTEN_PORT + count.index
   }
 
-  task_definition = aws_ecs_task_definition.aztec-bootstrap-1.family
+  task_definition = aws_ecs_task_definition.aztec-bootstrap[count.index].family
 }
 
-resource "aws_lb_target_group" "aztec-bootstrap-1-target-group" {
-  name        = "aztec-bootstrap-1-target-group"
-  port        = var.BOOTNODE_1_LISTEN_PORT
+resource "aws_lb_target_group" "aztec-bootstrap-target-group" {
+  count       = local.bootnode_count
+  name        = "aztec-bootstrap-${count.index + 1}-target-group"
+  port        = var.BOOTNODE_LISTEN_PORT + count.index
   protocol    = "TCP"
   target_type = "ip"
   vpc_id      = data.terraform_remote_state.setup_iac.outputs.vpc_id
@@ -196,223 +209,37 @@ resource "aws_lb_target_group" "aztec-bootstrap-1-target-group" {
     interval            = 10
     healthy_threshold   = 2
     unhealthy_threshold = 2
-    port                = var.BOOTNODE_1_LISTEN_PORT
+    port                = var.BOOTNODE_LISTEN_PORT + count.index
   }
 }
 
-resource "aws_security_group_rule" "allow-bootstrap-1-tcp" {
+resource "aws_security_group_rule" "allow-bootstrap-tcp" {
+  count             = local.bootnode_count
   type              = "ingress"
-  from_port         = var.BOOTNODE_1_LISTEN_PORT
-  to_port           = var.BOOTNODE_1_LISTEN_PORT
+  from_port         = var.BOOTNODE_LISTEN_PORT + count.index
+  to_port           = var.BOOTNODE_LISTEN_PORT + count.index
   protocol          = "tcp"
   cidr_blocks       = ["0.0.0.0/0"]
   security_group_id = data.terraform_remote_state.aztec-network_iac.outputs.p2p_security_group_id
 }
 
-## Commented out here and setup manually as terraform (or the aws provider version we are using) has a bug
-## NLB listeners can't have a 'weight' property defined. You will see there isn't one here but that doesn't
-## stop it trying to automatically specify one and giving an error
-
-# resource "aws_lb_listener" "aztec-bootstrap-1-tcp-listener" {
-#   load_balancer_arn = data.terraform_remote_state.aztec-network_iac.outputs.nlb_arn
-#   port              = "${var.BOOTNODE_1_LISTEN_PORT}"
-#   protocol          = "TCP"
-
-#   tags = {
-#     name = "aztec-bootstrap-1-target-group"
-#   }
-
-#   default_action {
-#     type = "forward"
-
-#     forward {
-#       target_group {
-#         arn    = aws_lb_target_group.aztec-bootstrap-1-target-group.arn
-#       }
-#     }
-#   }
-# }
-
-resource "aws_cloudwatch_log_group" "aztec-bootstrap-2-log-group" {
-  name              = "/fargate/service/${var.DEPLOY_TAG}/aztec-bootstrap-2"
-  retention_in_days = 14
-}
-
-resource "aws_service_discovery_service" "aztec-bootstrap-2" {
-  name = "${var.DEPLOY_TAG}-aztec-bootstrap-2"
+resource "aws_lb_listener" "aztec-bootstrap-tcp-listener" {
+  count             = local.bootnode_count
+  load_balancer_arn = data.terraform_remote_state.aztec-network_iac.outputs.nlb_arn
+  port              = var.BOOTNODE_LISTEN_PORT + count.index
+  protocol          = "TCP"
 
-  health_check_custom_config {
-    failure_threshold = 1
+  tags = {
+    name = "aztec-bootstrap-${count.index}-target-group"
   }
 
-  dns_config {
-    namespace_id = data.terraform_remote_state.setup_iac.outputs.local_service_discovery_id
-
-    dns_records {
-      ttl  = 60
-      type = "A"
-    }
-
-    dns_records {
-      ttl  = 60
-      type = "SRV"
-    }
-
-    routing_policy = "MULTIVALUE"
-  }
-
-  # Terraform just fails if this resource changes and you have registered instances.
-  provisioner "local-exec" {
-    when    = destroy
-    command = "${path.module}/../servicediscovery-drain.sh ${self.id}"
-  }
-}
+  default_action {
+    type = "forward"
 
-resource "aws_ecs_task_definition" "aztec-bootstrap-2" {
-  family                   = "${var.DEPLOY_TAG}-aztec-bootstrap-2"
-  requires_compatibilities = ["FARGATE"]
-  network_mode             = "awsvpc"
-  cpu                      = "2048"
-  memory                   = "4096"
-  execution_role_arn       = data.terraform_remote_state.setup_iac.outputs.ecs_task_execution_role_arn
-  task_role_arn            = data.terraform_remote_state.aztec2_iac.outputs.cloudwatch_logging_ecs_role_arn
-
-  container_definitions = <<DEFINITIONS
-[
-  {
-    "name": "${var.DEPLOY_TAG}-aztec-bootstrap-2",
-    "image": "${var.ECR_URL}/p2p-bootstrap:aztec3-packages-prod",
-    "essential": true,
-    "command": ["start"],
-    "memoryReservation": 3776,
-    "portMappings": [
-      {
-        "containerPort": ${var.BOOTNODE_2_LISTEN_PORT}
-      },
-      {
-        "containerPort": 80
-      }
-    ],
-    "environment": [
-      {
-        "name": "NODE_ENV",
-        "value": "production"
-      },
-      {
-        "name": "P2P_TCP_LISTEN_PORT",
-        "value": "${var.BOOTNODE_2_LISTEN_PORT}"
-      },
-      {
-        "name": "P2P_TCP_LISTEN_IP",
-        "value": "0.0.0.0"
-      },
-      {
-        "name": "PEER_ID_PRIVATE_KEY",
-        "value": "${var.BOOTNODE_2_PRIVATE_KEY}"
-      },
-      {
-        "name": "DEBUG",
-        "value": "aztec:*"
-      },
-      {
-        "name": "P2P_MIN_PEERS",
-        "value": "${var.P2P_MIN_PEERS}"
-      },
-      {
-        "name": "P2P_MAX_PEERS",
-        "value": "${var.P2P_MAX_PEERS}"
-      }
-    ],
-    "logConfiguration": {
-      "logDriver": "awslogs",
-      "options": {
-        "awslogs-group": "/fargate/service/${var.DEPLOY_TAG}/aztec-bootstrap-2",
-        "awslogs-region": "eu-west-2",
-        "awslogs-stream-prefix": "ecs"
+    forward {
+      target_group {
+        arn = aws_lb_target_group.aztec-bootstrap-target-group[count.index].arn
       }
     }
   }
-]
-DEFINITIONS
-}
-
-resource "aws_ecs_service" "aztec-bootstrap-2" {
-  name                               = "${var.DEPLOY_TAG}-aztec-bootstrap-2"
-  cluster                            = data.terraform_remote_state.setup_iac.outputs.ecs_cluster_id
-  launch_type                        = "FARGATE"
-  desired_count                      = 1
-  deployment_maximum_percent         = 100
-  deployment_minimum_healthy_percent = 0
-  platform_version                   = "1.4.0"
-
-  network_configuration {
-    subnets = [
-      data.terraform_remote_state.setup_iac.outputs.subnet_az1_private_id,
-      data.terraform_remote_state.setup_iac.outputs.subnet_az2_private_id
-    ]
-    security_groups = [data.terraform_remote_state.aztec-network_iac.outputs.p2p_security_group_id, data.terraform_remote_state.setup_iac.outputs.security_group_private_id]
-  }
-
-  service_registries {
-    registry_arn   = aws_service_discovery_service.aztec-bootstrap-2.arn
-    container_name = "${var.DEPLOY_TAG}-aztec-bootstrap-2"
-    container_port = 80
-  }
-
-  load_balancer {
-    target_group_arn = aws_lb_target_group.aztec-bootstrap-2-target-group.id
-    container_name   = "${var.DEPLOY_TAG}-aztec-bootstrap-2"
-    container_port   = var.BOOTNODE_2_LISTEN_PORT
-  }
-
-  task_definition = aws_ecs_task_definition.aztec-bootstrap-2.family
-}
-
-resource "aws_lb_target_group" "aztec-bootstrap-2-target-group" {
-  name        = "aztec-bootstrap-2-target-group"
-  port        = var.BOOTNODE_2_LISTEN_PORT
-  protocol    = "TCP"
-  target_type = "ip"
-  vpc_id      = data.terraform_remote_state.setup_iac.outputs.vpc_id
-
-  health_check {
-    protocol            = "TCP"
-    interval            = 10
-    healthy_threshold   = 2
-    unhealthy_threshold = 2
-    port                = var.BOOTNODE_2_LISTEN_PORT
-  }
 }
-
-resource "aws_security_group_rule" "allow-bootstrap-2-tcp" {
-  type              = "ingress"
-  from_port         = var.BOOTNODE_2_LISTEN_PORT
-  to_port           = var.BOOTNODE_2_LISTEN_PORT
-  protocol          = "tcp"
-  cidr_blocks       = ["0.0.0.0/0"]
-  security_group_id = data.terraform_remote_state.aztec-network_iac.outputs.p2p_security_group_id
-}
-
-## Commented out here and setup manually as terraform (or the aws provider version we are using) has a bug
-## NLB listeners can't have a 'weight' property defined. You will see there isn't one here but that doesn't
-## stop it trying to automatically specify one and giving an error
-
-# resource "aws_lb_listener" "aztec-bootstrap-2-tcp-listener" {
-#   load_balancer_arn = data.terraform_remote_state.aztec-network_iac.outputs.nlb_arn
-#   port              = "${var.BOOTNODE_2_LISTEN_PORT}"
-#   protocol          = "TCP"
-
-#   tags = {
-#     name = "aztec-bootstrap-2-tcp-listener"
-#   }
-
-#   default_action {
-#     type = "forward"
-
-#     forward {
-#       target_group {
-#         arn    = aws_lb_target_group.aztec-bootstrap-2-target-group.arn
-#       }
-#     }
-#   }
-# }
diff --git a/yarn-project/p2p-bootstrap/terraform/servicediscovery-drain.sh b/yarn-project/p2p-bootstrap/terraform/servicediscovery-drain.sh
new file mode 100755
index 00000000000..1fa02e92d91
--- /dev/null
+++ b/yarn-project/p2p-bootstrap/terraform/servicediscovery-drain.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+[ $# -ne 1 ] && echo "Usage: $0 <service-id>" && exit 1
+
+serviceId="--service-id=$1"
+
+echo "Draining servicediscovery instances from $1 ..."
+ids="$(aws servicediscovery list-instances $serviceId --query 'Instances[].Id' --output text | tr '\t' ' ')"
+
+found=
+for id in $ids; do
+  if [ -n "$id" ]; then
+    echo "Deregistering $1 / $id ..."
+    aws servicediscovery deregister-instance $serviceId --instance-id "$id"
+    found=1
+  fi
+done
+
+# Yes, I'm being lazy here...
+[ -n "$found" ] && sleep 5 || true
\ No newline at end of file
diff --git a/yarn-project/p2p-bootstrap/terraform/variables.tf b/yarn-project/p2p-bootstrap/terraform/variables.tf
index aafaf04abe0..aead56bdd84 100644
--- a/yarn-project/p2p-bootstrap/terraform/variables.tf
+++ b/yarn-project/p2p-bootstrap/terraform/variables.tf
@@ -2,30 +2,29 @@ variable "DEPLOY_TAG" {
   type = string
 }
 
-variable "BOOTNODE_1_LISTEN_PORT" {
-  type = string
+variable "BOOTNODE_LISTEN_PORT" {
+  type    = string
+  default = 40500
 }
 
 variable "BOOTNODE_1_PRIVATE_KEY" {
   type = string
 }
 
-variable "BOOTNODE_2_LISTEN_PORT" {
-  type = string
-}
-
 variable "BOOTNODE_2_PRIVATE_KEY" {
   type = string
 }
 
-variable "ECR_URL" {
-  type = string
-}
-
 variable "P2P_MIN_PEERS" {
-  type = string
+  type    = string
+  default = 50
 }
 
 variable "P2P_MAX_PEERS" {
+  type    = string
+  default = 100
+}
+
+variable "DOCKERHUB_ACCOUNT" {
   type = string
 }