diff --git a/.github/workflows/devnet-deploys.yml b/.github/workflows/devnet-deploys.yml
index a2b09291c1e..1120fef4628 100644
--- a/.github/workflows/devnet-deploys.yml
+++ b/.github/workflows/devnet-deploys.yml
@@ -3,6 +3,10 @@ on:
   push:
     branches: [devnet]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
   GIT_COMMIT: ${{ github.sha }}
@@ -56,10 +60,10 @@ jobs:
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: us-west-2
 
-      - name: Deploy Bootstrap Nodes
-        working-directory: ./yarn-project/aztec/terraform/node
+      - name: Deploy P2P Bootstrap Nodes
+        working-directory: ./yarn-project/p2p-bootstrap/terraform
         run: |
-          terraform init -input=false -backend-config="key=devnet/aztec-node"
+          terraform init -input=false -backend-config="key=devnet/p2p-bootstrap"
           terraform apply -input=false -auto-approve
 
       - name: Deploy Aztec Nodes
@@ -67,3 +71,9 @@ jobs:
         run: |
           terraform init -input=false -backend-config="key=devnet/aztec-node"
           terraform apply -input=false -auto-approve
+
+      - name: Deploy Provers
+        working-directory: ./yarn-project/aztec/terraform/prover
+        run: |
+          terraform init -input=false -backend-config="key=devnet/prover"
+          terraform apply -input=false -auto-approve
diff --git a/docs/docs/migration_notes.md b/docs/docs/migration_notes.md
index c0230b06913..e9e1abb4d16 100644
--- a/docs/docs/migration_notes.md
+++ b/docs/docs/migration_notes.md
@@ -1665,4 +1665,4 @@ Now, just remove the `src` folder,:
 
 ```rust
 easy_private_token_contract = {git = "https://github.com/AztecProtocol/aztec-packages/", tag ="v0.17.0", directory = "noir-projects/noir-contracts/contracts/easy_private_token_contract"}
-```
+```
\ No newline at end of file
diff --git a/yarn-project/aztec/terraform/node/main.tf b/yarn-project/aztec/terraform/node/main.tf
index d627d416f0a..d446d334c89 100644
--- a/yarn-project/aztec/terraform/node/main.tf
+++ b/yarn-project/aztec/terraform/node/main.tf
@@ -57,9 +57,11 @@ locals {
   publisher_private_keys = [var.SEQ_1_PUBLISHER_PRIVATE_KEY, var.SEQ_2_PUBLISHER_PRIVATE_KEY]
   node_p2p_private_keys  = [var.NODE_1_PRIVATE_KEY, var.NODE_2_PRIVATE_KEY]
   node_count             = length(local.publisher_private_keys)
-  #node_count           = 1
-  data_dir             = "/usr/src/yarn-project/aztec/data"
-  agents_per_sequencer = var.AGENTS_PER_SEQUENCER
+  data_dir               = "/usr/src/yarn-project/aztec/data"
+}
+
+output "node_count" {
+  value = local.node_count
 }
 
 resource "aws_cloudwatch_log_group" "aztec-node-log-group" {
@@ -115,20 +117,6 @@ resource "aws_efs_file_system" "node_data_store" {
   }
 }
 
-# resource "aws_efs_mount_target" "private_az1" {
-#   count           = local.node_count
-#   file_system_id  = aws_efs_file_system.node_data_store[count.index].id
-#   subnet_id       = data.terraform_remote_state.setup_iac.outputs.subnet_az1_private_id
-#   security_groups = [data.terraform_remote_state.setup_iac.outputs.security_group_private_id]
-# }
-
-# resource "aws_efs_mount_target" "private_az2" {
-#   count           = local.node_count
-#   file_system_id  = aws_efs_file_system.node_data_store[count.index].id
-#   subnet_id       = data.terraform_remote_state.setup_iac.outputs.subnet_az2_private_id
-#   security_groups = [data.terraform_remote_state.setup_iac.outputs.security_group_private_id]
-# }
-
 resource "aws_efs_mount_target" "public_az1" {
   count           = local.node_count
   file_system_id  = aws_efs_file_system.node_data_store[count.index].id
@@ -165,7 +153,7 @@ resource "aws_ecs_task_definition" "aztec-node" {
 [
   {
     "name": "${var.DEPLOY_TAG}-aztec-node-${count.index + 1}",
-    "image": "${var.FULL_IMAGE}",
+    "image": "${var.DOCKERHUB_ACCOUNT}/aztec:${var.DEPLOY_TAG}",
     "command": ["start", "--node", "--archiver", "--sequencer", "--prover"],
     "essential": true,
     "memoryReservation": 3776,
@@ -205,7 +193,7 @@ resource "aws_ecs_task_definition" "aztec-node" {
       },
       {
         "name": "ETHEREUM_HOST",
-        "value": "https://${var.DEPLOY_TAG}-mainnet-fork.aztec.network:8545/${var.API_KEY}"
+        "value": "https://aztec-dev-mainnet-fork.aztec.network:8545/${var.API_KEY}"
       },
       {
         "name": "DATA_DIRECTORY",
@@ -357,6 +345,7 @@ resource "aws_ecs_service" "aztec-node" {
   deployment_maximum_percent         = 100
   deployment_minimum_healthy_percent = 0
   platform_version                   = "1.4.0"
+  force_new_deployment               = true
 
 
   network_configuration {
@@ -373,19 +362,6 @@ resource "aws_ecs_service" "aztec-node" {
     container_port   = 80
   }
 
-
-  # load_balancer {
-  #   target_group_arn = aws_lb_target_group.aztec-node-tcp[count.index].arn
-  #   container_name   = "${var.DEPLOY_TAG}-aztec-node-${count.index + 1}"
-  #   container_port   = var.NODE_P2P_TCP_PORT + count.index
-  # }
-
-  # load_balancer {
-  #   target_group_arn = aws_lb_target_group.aztec-node-udp[count.index].arn
-  #   container_name   = "${var.DEPLOY_TAG}-aztec-node-${count.index + 1}"
-  #   container_port   = var.NODE_P2P_UDP_PORT + count.index
-  # }
-
   service_registries {
     registry_arn   = aws_service_discovery_service.aztec-node[count.index].arn
     container_name = "${var.DEPLOY_TAG}-aztec-node-${count.index + 1}"
@@ -436,23 +412,6 @@ resource "aws_lb_listener_rule" "api" {
   }
 }
 
-# resource "aws_lb_target_group" "aztec-node-tcp" {
-#   count       = local.node_count
-#   name        = "${var.DEPLOY_TAG}-node-${count.index + 1}-p2p-tcp-target"
-#   port        = var.NODE_P2P_TCP_PORT + count.index
-#   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_P2P_TCP_PORT + count.index
-#   }
-# }
-
 resource "aws_security_group_rule" "allow-node-tcp-in" {
   count             = local.node_count
   type              = "ingress"
@@ -473,40 +432,6 @@ resource "aws_security_group_rule" "allow-node-tcp-out" {
   security_group_id = data.terraform_remote_state.aztec-network_iac.outputs.p2p_security_group_id
 }
 
-# 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_P2P_TCP_PORT + count.index
-#   protocol          = "TCP"
-
-#   tags = {
-#     name = "aztec-node-${count.index}-tcp-listener"
-#   }
-
-#   default_action {
-#     type             = "forward"
-#     target_group_arn = aws_lb_target_group.aztec-node-tcp[count.index].arn
-#   }
-# }
-
-
-# resource "aws_lb_target_group" "aztec-node-udp" {
-#   count       = local.node_count
-#   name        = "${var.DEPLOY_TAG}-node-${count.index + 1}-p2p-udp-target"
-#   port        = var.NODE_P2P_UDP_PORT + count.index
-#   protocol    = "UDP"
-#   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_P2P_TCP_PORT + count.index
-#   }
-# }
-
 resource "aws_security_group_rule" "allow-node-udp-in" {
   type              = "ingress"
   from_port         = var.NODE_P2P_UDP_PORT
@@ -524,235 +449,3 @@ resource "aws_security_group_rule" "allow-node-udp-out" {
   cidr_blocks       = ["0.0.0.0/0"]
   security_group_id = data.terraform_remote_state.aztec-network_iac.outputs.p2p_security_group_id
 }
-
-# resource "aws_lb_listener" "aztec-node-udp-listener" {
-#   count             = local.node_count
-#   load_balancer_arn = data.terraform_remote_state.aztec-network_iac.outputs.nlb_arn
-#   port              = var.NODE_P2P_UDP_PORT + count.index
-#   protocol          = "UDP"
-
-#   tags = {
-#     name = "aztec-node-${count.index}-udp-listener"
-#   }
-
-#   default_action {
-#     type             = "forward"
-#     target_group_arn = aws_lb_target_group.aztec-node-udp[count.index].arn
-#   }
-# }
-
-
-
-// Configuration for proving agents
-
-resource "aws_cloudwatch_log_group" "aztec-proving-agent-log-group" {
-  count             = local.node_count
-  name              = "/fargate/service/${var.DEPLOY_TAG}/aztec-proving-agent-group-${count.index + 1}"
-  retention_in_days = 14
-}
-
-resource "aws_service_discovery_service" "aztec-proving-agent" {
-  count = local.node_count
-  name  = "${var.DEPLOY_TAG}-aztec-proving-agent-group-${count.index + 1}"
-
-  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 definitions for each node.
-resource "aws_ecs_task_definition" "aztec-proving-agent" {
-  count                    = local.node_count
-  family                   = "${var.DEPLOY_TAG}-aztec-proving-agent-group-${count.index + 1}"
-  requires_compatibilities = ["FARGATE"]
-  network_mode             = "awsvpc"
-  cpu                      = "16384"
-  memory                   = "98304"
-  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-proving-agent-group-${count.index + 1}",
-    "image": "${var.FULL_IMAGE}",
-    "command": ["start", "--prover"],
-    "essential": true,
-    "memoryReservation": 98304,
-    "portMappings": [
-      {
-        "containerPort": 80
-      }
-    ],
-    "environment": [
-      {
-        "name": "NODE_ENV",
-        "value": "production"
-      },
-      {
-        "name": "DEBUG",
-        "value": "aztec:*"
-      },
-      {
-        "name": "DEPLOY_TAG",
-        "value": "${var.DEPLOY_TAG}"
-      },
-      {
-        "name": "AZTEC_NODE_URL",
-        "value": "http://${var.DEPLOY_TAG}-aztec-node-${count.index + 1}.local/${var.DEPLOY_TAG}/aztec-node-${count.index + 1}"
-      },
-      {
-        "name": "PROVER_AGENTS",
-        "value": "1"
-      },
-      {
-        "name": "PROVER_REAL_PROOFS",
-        "value": "${var.PROVING_ENABLED}"
-      }
-    ],
-    "logConfiguration": {
-      "logDriver": "awslogs",
-      "options": {
-        "awslogs-group": "${aws_cloudwatch_log_group.aztec-proving-agent-log-group[count.index].name}",
-        "awslogs-region": "eu-west-2",
-        "awslogs-stream-prefix": "ecs"
-      }
-    }
-  }
-]
-DEFINITIONS
-}
-
-resource "aws_ecs_service" "aztec-proving-agent" {
-  count                              = local.node_count
-  name                               = "${var.DEPLOY_TAG}-aztec-proving-agent-group-${count.index + 1}"
-  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-proving-agent[count.index].arn
-    container_name = "${var.DEPLOY_TAG}-aztec-proving-agent-group-${count.index + 1}"
-    container_port = 80
-  }
-
-  task_definition = aws_ecs_task_definition.aztec-proving-agent[count.index].family
-}
-
-
-# Create CloudWatch metrics for the proving agents
-resource "aws_cloudwatch_metric_alarm" "cpu_high" {
-  count               = local.node_count
-  alarm_name          = "${var.DEPLOY_TAG}-proving-agent-cpu-high-${count.index + 1}"
-  comparison_operator = "GreaterThanThreshold"
-  evaluation_periods  = "1"
-  metric_name         = "CPUUtilization"
-  namespace           = "AWS/ECS"
-  period              = "60"
-  datapoints_to_alarm = 1
-  statistic           = "Maximum"
-  threshold           = "20"
-  alarm_description   = "Alert when CPU utilization is greater than 20%"
-  dimensions = {
-    ClusterName = data.terraform_remote_state.setup_iac.outputs.ecs_cluster_name
-    ServiceName = "${aws_ecs_service.aztec-proving-agent[count.index].name}"
-  }
-  alarm_actions = [aws_appautoscaling_policy.scale_out[count.index].arn]
-}
-
-resource "aws_cloudwatch_metric_alarm" "cpu_low" {
-  count               = local.node_count
-  alarm_name          = "${var.DEPLOY_TAG}-proving-agent-cpu-low-${count.index + 1}"
-  comparison_operator = "LessThanThreshold"
-  evaluation_periods  = "3"
-  metric_name         = "CPUUtilization"
-  namespace           = "AWS/ECS"
-  period              = "60"
-  datapoints_to_alarm = 3
-  statistic           = "Maximum"
-  threshold           = "20"
-  alarm_description   = "Alarm when CPU utilization is less than 20%"
-  dimensions = {
-    ClusterName = data.terraform_remote_state.setup_iac.outputs.ecs_cluster_name
-    ServiceName = "${aws_ecs_service.aztec-proving-agent[count.index].name}"
-  }
-  alarm_actions = [aws_appautoscaling_policy.scale_in[count.index].arn]
-}
-
-# Create Auto Scaling Target for ECS Service
-resource "aws_appautoscaling_target" "ecs_proving_agent" {
-  count              = local.node_count
-  max_capacity       = local.agents_per_sequencer
-  min_capacity       = 1
-  resource_id        = "service/${data.terraform_remote_state.setup_iac.outputs.ecs_cluster_id}/${aws_ecs_service.aztec-proving-agent[count.index].name}"
-  scalable_dimension = "ecs:service:DesiredCount"
-  service_namespace  = "ecs"
-}
-
-# Create Scaling Policy for Scaling Out
-resource "aws_appautoscaling_policy" "scale_out" {
-  count              = local.node_count
-  name               = "${var.DEPLOY_TAG}-scale-out-${count.index + 1}"
-  policy_type        = "StepScaling"
-  resource_id        = aws_appautoscaling_target.ecs_proving_agent[count.index].resource_id
-  scalable_dimension = aws_appautoscaling_target.ecs_proving_agent[count.index].scalable_dimension
-  service_namespace  = aws_appautoscaling_target.ecs_proving_agent[count.index].service_namespace
-
-  step_scaling_policy_configuration {
-    adjustment_type         = "ExactCapacity"
-    cooldown                = 60
-    metric_aggregation_type = "Maximum"
-
-    step_adjustment {
-      scaling_adjustment          = local.agents_per_sequencer
-      metric_interval_lower_bound = 0
-    }
-  }
-}
-
-# Create Scaling Policy for Scaling In
-resource "aws_appautoscaling_policy" "scale_in" {
-  count              = local.node_count
-  name               = "${var.DEPLOY_TAG}-scale-in-${count.index + 1}"
-  policy_type        = "StepScaling"
-  resource_id        = aws_appautoscaling_target.ecs_proving_agent[count.index].resource_id
-  scalable_dimension = aws_appautoscaling_target.ecs_proving_agent[count.index].scalable_dimension
-  service_namespace  = aws_appautoscaling_target.ecs_proving_agent[count.index].service_namespace
-
-  step_scaling_policy_configuration {
-    adjustment_type         = "ExactCapacity"
-    cooldown                = 60
-    metric_aggregation_type = "Maximum"
-
-    step_adjustment {
-      scaling_adjustment          = 1
-      metric_interval_upper_bound = 0
-    }
-  }
-}
diff --git a/yarn-project/aztec/terraform/node/variables.tf b/yarn-project/aztec/terraform/node/variables.tf
index 2febb315fa9..36cb280645f 100644
--- a/yarn-project/aztec/terraform/node/variables.tf
+++ b/yarn-project/aztec/terraform/node/variables.tf
@@ -64,27 +64,11 @@ variable "P2P_MAX_PEERS" {
 }
 
 variable "P2P_ENABLED" {
-  type = bool
+  type    = bool
+  default = true
 }
 
-variable "AVAILABILITY_ORACLE_CONTRACT_ADDRESS" { type = string }
-variable "ROLLUP_CONTRACT_ADDRESS" { type = string }
-variable "REGISTRY_CONTRACT_ADDRESS" { type = string }
-variable "INBOX_CONTRACT_ADDRESS" { type = string }
-variable "OUTBOX_CONTRACT_ADDRESS" { type = string }
-variable "GAS_TOKEN_CONTRACT_ADDRESS" { type = string }
-variable "GAS_PORTAL_CONTRACT_ADDRESS" { type = string }
-variable "AGENTS_PER_SEQUENCER" { type = string }
 variable "PROVING_ENABLED" {
   type    = bool
   default = true
 }
-
-variable "IMAGE_TAG" {
-  type = string
-}
-
-variable "FULL_IMAGE" {
-  type    = string
-  default = "${var.DOCKERHUB_ACCOUNT}/aztec:${var.IMAGE_TAG}"
-}
diff --git a/yarn-project/aztec/terraform/prover/main.tf b/yarn-project/aztec/terraform/prover/main.tf
new file mode 100644
index 00000000000..a9034ad7bc7
--- /dev/null
+++ b/yarn-project/aztec/terraform/prover/main.tf
@@ -0,0 +1,270 @@
+terraform {
+  backend "s3" {
+    bucket = "aztec-terraform"
+    region = "eu-west-2"
+  }
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "3.74.2"
+    }
+  }
+}
+
+# Define provider and region
+provider "aws" {
+  region = "eu-west-2"
+}
+
+data "terraform_remote_state" "setup_iac" {
+  backend = "s3"
+  config = {
+    bucket = "aztec-terraform"
+    key    = "setup/setup-iac"
+    region = "eu-west-2"
+  }
+}
+
+data "terraform_remote_state" "aztec2_iac" {
+  backend = "s3"
+  config = {
+    bucket = "aztec-terraform"
+    key    = "aztec2/iac"
+    region = "eu-west-2"
+  }
+}
+
+data "terraform_remote_state" "aztec-network_iac" {
+  backend = "s3"
+  config = {
+    bucket = "aztec-terraform"
+    key    = "aztec-network/iac"
+    region = "eu-west-2"
+  }
+}
+
+data "terraform_remote_state" "aztec-network_node" {
+  backend = "s3"
+  config = {
+    bucket = "aztec-terraform"
+    key    = "${var.DEPLOY_TAG}/aztec-node"
+    region = "eu-west-2"
+  }
+}
+
+locals {
+  node_count           = data.terraform_remote_state.aztec-network_node.outputs.node_count
+  agents_per_sequencer = var.AGENTS_PER_SEQUENCER
+}
+
+resource "aws_cloudwatch_log_group" "aztec-proving-agent-log-group" {
+  count             = local.node_count
+  name              = "/fargate/service/${var.DEPLOY_TAG}/aztec-proving-agent-group-${count.index + 1}"
+  retention_in_days = 14
+}
+
+resource "aws_service_discovery_service" "aztec-proving-agent" {
+  count = local.node_count
+  name  = "${var.DEPLOY_TAG}-aztec-proving-agent-group-${count.index + 1}"
+
+  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 definitions for each node.
+resource "aws_ecs_task_definition" "aztec-proving-agent" {
+  count                    = local.node_count
+  family                   = "${var.DEPLOY_TAG}-aztec-proving-agent-group-${count.index + 1}"
+  requires_compatibilities = ["FARGATE"]
+  network_mode             = "awsvpc"
+  cpu                      = "16384"
+  memory                   = "98304"
+  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-proving-agent-group-${count.index + 1}",
+    "image": "${var.DOCKERHUB_ACCOUNT}/aztec:${var.DEPLOY_TAG}",
+    "command": ["start", "--prover"],
+    "essential": true,
+    "memoryReservation": 98304,
+    "portMappings": [
+      {
+        "containerPort": 80
+      }
+    ],
+    "environment": [
+      {
+        "name": "NODE_ENV",
+        "value": "production"
+      },
+      {
+        "name": "DEBUG",
+        "value": "aztec:*"
+      },
+      {
+        "name": "DEPLOY_TAG",
+        "value": "${var.DEPLOY_TAG}"
+      },
+      {
+        "name": "AZTEC_NODE_URL",
+        "value": "http://${var.DEPLOY_TAG}-aztec-node-${count.index + 1}.local/${var.DEPLOY_TAG}/aztec-node-${count.index + 1}"
+      },
+      {
+        "name": "PROVER_AGENTS",
+        "value": "1"
+      },
+      {
+        "name": "PROVER_REAL_PROOFS",
+        "value": "${var.PROVING_ENABLED}"
+      }
+    ],
+    "logConfiguration": {
+      "logDriver": "awslogs",
+      "options": {
+        "awslogs-group": "${aws_cloudwatch_log_group.aztec-proving-agent-log-group[count.index].name}",
+        "awslogs-region": "eu-west-2",
+        "awslogs-stream-prefix": "ecs"
+      }
+    }
+  }
+]
+DEFINITIONS
+}
+
+resource "aws_ecs_service" "aztec-proving-agent" {
+  count                              = local.node_count
+  name                               = "${var.DEPLOY_TAG}-aztec-proving-agent-group-${count.index + 1}"
+  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-proving-agent[count.index].arn
+    container_name = "${var.DEPLOY_TAG}-aztec-proving-agent-group-${count.index + 1}"
+    container_port = 80
+  }
+
+  task_definition = aws_ecs_task_definition.aztec-proving-agent[count.index].family
+}
+
+
+# Create CloudWatch metrics for the proving agents
+resource "aws_cloudwatch_metric_alarm" "cpu_high" {
+  count               = local.node_count
+  alarm_name          = "${var.DEPLOY_TAG}-proving-agent-cpu-high-${count.index + 1}"
+  comparison_operator = "GreaterThanThreshold"
+  evaluation_periods  = "1"
+  metric_name         = "CPUUtilization"
+  namespace           = "AWS/ECS"
+  period              = "60"
+  datapoints_to_alarm = 1
+  statistic           = "Maximum"
+  threshold           = "20"
+  alarm_description   = "Alert when CPU utilization is greater than 20%"
+  dimensions = {
+    ClusterName = data.terraform_remote_state.setup_iac.outputs.ecs_cluster_name
+    ServiceName = "${aws_ecs_service.aztec-proving-agent[count.index].name}"
+  }
+  alarm_actions = [aws_appautoscaling_policy.scale_out[count.index].arn]
+}
+
+resource "aws_cloudwatch_metric_alarm" "cpu_low" {
+  count               = local.node_count
+  alarm_name          = "${var.DEPLOY_TAG}-proving-agent-cpu-low-${count.index + 1}"
+  comparison_operator = "LessThanThreshold"
+  evaluation_periods  = "3"
+  metric_name         = "CPUUtilization"
+  namespace           = "AWS/ECS"
+  period              = "60"
+  datapoints_to_alarm = 3
+  statistic           = "Maximum"
+  threshold           = "20"
+  alarm_description   = "Alarm when CPU utilization is less than 20%"
+  dimensions = {
+    ClusterName = data.terraform_remote_state.setup_iac.outputs.ecs_cluster_name
+    ServiceName = "${aws_ecs_service.aztec-proving-agent[count.index].name}"
+  }
+  alarm_actions = [aws_appautoscaling_policy.scale_in[count.index].arn]
+}
+
+# Create Auto Scaling Target for ECS Service
+resource "aws_appautoscaling_target" "ecs_proving_agent" {
+  count              = local.node_count
+  max_capacity       = local.agents_per_sequencer
+  min_capacity       = 1
+  resource_id        = "service/${data.terraform_remote_state.setup_iac.outputs.ecs_cluster_id}/${aws_ecs_service.aztec-proving-agent[count.index].name}"
+  scalable_dimension = "ecs:service:DesiredCount"
+  service_namespace  = "ecs"
+}
+
+# Create Scaling Policy for Scaling Out
+resource "aws_appautoscaling_policy" "scale_out" {
+  count              = local.node_count
+  name               = "${var.DEPLOY_TAG}-scale-out-${count.index + 1}"
+  policy_type        = "StepScaling"
+  resource_id        = aws_appautoscaling_target.ecs_proving_agent[count.index].resource_id
+  scalable_dimension = aws_appautoscaling_target.ecs_proving_agent[count.index].scalable_dimension
+  service_namespace  = aws_appautoscaling_target.ecs_proving_agent[count.index].service_namespace
+
+  step_scaling_policy_configuration {
+    adjustment_type         = "ExactCapacity"
+    cooldown                = 60
+    metric_aggregation_type = "Maximum"
+
+    step_adjustment {
+      scaling_adjustment          = local.agents_per_sequencer
+      metric_interval_lower_bound = 0
+    }
+  }
+}
+
+# Create Scaling Policy for Scaling In
+resource "aws_appautoscaling_policy" "scale_in" {
+  count              = local.node_count
+  name               = "${var.DEPLOY_TAG}-scale-in-${count.index + 1}"
+  policy_type        = "StepScaling"
+  resource_id        = aws_appautoscaling_target.ecs_proving_agent[count.index].resource_id
+  scalable_dimension = aws_appautoscaling_target.ecs_proving_agent[count.index].scalable_dimension
+  service_namespace  = aws_appautoscaling_target.ecs_proving_agent[count.index].service_namespace
+
+  step_scaling_policy_configuration {
+    adjustment_type         = "ExactCapacity"
+    cooldown                = 60
+    metric_aggregation_type = "Maximum"
+
+    step_adjustment {
+      scaling_adjustment          = 1
+      metric_interval_upper_bound = 0
+    }
+  }
+}
diff --git a/yarn-project/aztec/terraform/prover/variables.tf b/yarn-project/aztec/terraform/prover/variables.tf
new file mode 100644
index 00000000000..e6c6865d26d
--- /dev/null
+++ b/yarn-project/aztec/terraform/prover/variables.tf
@@ -0,0 +1,17 @@
+variable "DEPLOY_TAG" {
+  type = string
+}
+
+variable "AGENTS_PER_SEQUENCER" {
+  type    = string
+  default = 1
+}
+
+variable "PROVING_ENABLED" {
+  type    = bool
+  default = true
+}
+
+variable "DOCKERHUB_ACCOUNT" {
+  type = string
+}
diff --git a/yarn-project/p2p-bootstrap/terraform/main.tf b/yarn-project/p2p-bootstrap/terraform/main.tf
index 3536c88ee06..31b76cb33cd 100644
--- a/yarn-project/p2p-bootstrap/terraform/main.tf
+++ b/yarn-project/p2p-bootstrap/terraform/main.tf
@@ -104,7 +104,7 @@ resource "aws_ecs_task_definition" "p2p-bootstrap" {
   container_definitions = <<DEFINITIONS
 [
   {
-    "name": "${var.FULL_IMAGE}",
+    "name": "${var.DEPLOY_TAG}-p2p-bootstrap-node-${count.index + 1}",
     "image": "${var.DOCKERHUB_ACCOUNT}/aztec:${var.DEPLOY_TAG}",
     "command": ["start", "--p2p-bootstrap"],
     "essential": true,
@@ -167,13 +167,14 @@ DEFINITIONS
 
 resource "aws_ecs_service" "p2p-bootstrap" {
   count                              = local.bootnode_count
-  name                               = "${var.DEPLOY_TAG}-p2p-bootstrap-${count.index + 1}"
+  name                               = "${var.DEPLOY_TAG}-p2p-bootstrap-node-${count.index + 1}"
   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"
+  force_new_deployment               = true
 
   network_configuration {
     subnets = [
@@ -184,13 +185,13 @@ resource "aws_ecs_service" "p2p-bootstrap" {
 
   service_registries {
     registry_arn   = aws_service_discovery_service.p2p-bootstrap[count.index].arn
-    container_name = "${var.DEPLOY_TAG}-p2p-bootstrap-${count.index + 1}"
+    container_name = "${var.DEPLOY_TAG}-p2p-bootstrap-node-${count.index + 1}"
     container_port = 80
   }
 
   load_balancer {
     target_group_arn = aws_lb_target_group.p2p-bootstrap-target-group-udp[count.index].id
-    container_name   = "${var.DEPLOY_TAG}-p2p-bootstrap-${count.index + 1}"
+    container_name   = "${var.DEPLOY_TAG}-p2p-bootstrap-node-${count.index + 1}"
     container_port   = var.BOOTNODE_LISTEN_PORT + count.index
   }
 
diff --git a/yarn-project/p2p-bootstrap/terraform/variables.tf b/yarn-project/p2p-bootstrap/terraform/variables.tf
index e81c4c21c0f..e11f49dbf3e 100644
--- a/yarn-project/p2p-bootstrap/terraform/variables.tf
+++ b/yarn-project/p2p-bootstrap/terraform/variables.tf
@@ -29,8 +29,3 @@ variable "DOCKERHUB_ACCOUNT" {
   type    = string
   default = "aztecprotocol"
 }
-
-variable "FULL_IMAGE" {
-  type    = string
-  default = "${var.DOCKERHUB_ACCOUNT}/aztec:${var.DEPLOY_TAG}"
-}