diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5e7b92e0a3c..ff3c13631a6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -465,6 +465,17 @@ jobs:
           name: "Build and test"
           command: build aztec-node | add_timestamps
 
+  aztec-faucet:
+    machine:
+      image: ubuntu-2204:2023.07.2
+    resource_class: large
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build and test"
+          command: build aztec-faucet | add_timestamps
+
   pxe-x86_64:
     machine:
       image: ubuntu-2204:2023.07.2
@@ -1263,6 +1274,11 @@ workflows:
             - yarn-project
           <<: *defaults
 
+      - aztec-faucet:
+          requires:
+            - yarn-project
+          <<: *defaults
+
       - pxe-x86_64:
           requires:
             - yarn-project
diff --git a/build_manifest.yml b/build_manifest.yml
index e1c9d907f78..c3d413b1552 100644
--- a/build_manifest.yml
+++ b/build_manifest.yml
@@ -113,6 +113,12 @@ aztec-sandbox:
   dependencies:
     - yarn-project
 
+aztec-faucet:
+  buildDir: yarn-project
+  projectDir: yarn-project/aztec-faucet
+  dependencies:
+    - yarn-project
+
 pxe:
   buildDir: yarn-project
   projectDir: yarn-project/pxe
diff --git a/yarn-project/aztec-faucet/.dockerignore b/yarn-project/aztec-faucet/.dockerignore
new file mode 100644
index 00000000000..2b30eaf4896
--- /dev/null
+++ b/yarn-project/aztec-faucet/.dockerignore
@@ -0,0 +1,4 @@
+data
+dest
+node_modules
+Dockerfile
\ No newline at end of file
diff --git a/yarn-project/aztec-faucet/.eslintrc.cjs b/yarn-project/aztec-faucet/.eslintrc.cjs
new file mode 100644
index 00000000000..e659927475c
--- /dev/null
+++ b/yarn-project/aztec-faucet/.eslintrc.cjs
@@ -0,0 +1 @@
+module.exports = require('@aztec/foundation/eslint');
diff --git a/yarn-project/aztec-faucet/.gitignore b/yarn-project/aztec-faucet/.gitignore
new file mode 100644
index 00000000000..81efe293f26
--- /dev/null
+++ b/yarn-project/aztec-faucet/.gitignore
@@ -0,0 +1 @@
+/data*
diff --git a/yarn-project/aztec-faucet/Dockerfile b/yarn-project/aztec-faucet/Dockerfile
new file mode 100644
index 00000000000..d524e04c8ef
--- /dev/null
+++ b/yarn-project/aztec-faucet/Dockerfile
@@ -0,0 +1,14 @@
+FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project AS builder
+
+WORKDIR /usr/src/yarn-project/aztec-faucet
+
+# Productionify. See comment in yarn-project-base/Dockerfile.
+RUN yarn cache clean && yarn workspaces focus --production
+
+# Create final, minimal size image.
+FROM node:18-alpine
+COPY --from=builder /usr/src/ /usr/src/
+WORKDIR /usr/src/yarn-project/aztec-faucet
+ENTRYPOINT ["yarn"]
+CMD [ "start" ]
+EXPOSE 8080
diff --git a/yarn-project/aztec-faucet/README.md b/yarn-project/aztec-faucet/README.md
new file mode 100644
index 00000000000..44427ad4f0c
--- /dev/null
+++ b/yarn-project/aztec-faucet/README.md
@@ -0,0 +1,3 @@
+# Aztec Faucet
+
+This application allows someone to obtain a small amount of eth via a http endpoint.
diff --git a/yarn-project/aztec-faucet/package.json b/yarn-project/aztec-faucet/package.json
new file mode 100644
index 00000000000..df0541d920c
--- /dev/null
+++ b/yarn-project/aztec-faucet/package.json
@@ -0,0 +1,61 @@
+{
+  "name": "@aztec/aztec-faucet",
+  "version": "0.1.0",
+  "main": "dest/bin/index.js",
+  "type": "module",
+  "bin": "./dest/bin/index.js",
+  "typedocOptions": {
+    "entryPoints": [
+      "./src/bin/index.ts"
+    ],
+    "name": "Aztec Faucet",
+    "tsconfig": "./tsconfig.json"
+  },
+  "scripts": {
+    "start": "node --no-warnings ./dest/bin",
+    "build": "yarn clean && tsc -b",
+    "build:dev": "tsc -b --watch",
+    "clean": "rm -rf ./dest .tsbuildinfo",
+    "formatting": "run -T prettier --check ./src && run -T eslint ./src",
+    "formatting:fix": "run -T prettier -w ./src",
+    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests"
+  },
+  "inherits": [
+    "../package.common.json"
+  ],
+  "jest": {
+    "preset": "ts-jest/presets/default-esm",
+    "moduleNameMapper": {
+      "^(\\.{1,2}/.*)\\.m?js$": "$1"
+    },
+    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
+    "rootDir": "./src"
+  },
+  "dependencies": {
+    "@aztec/ethereum": "workspace:^",
+    "@aztec/foundation": "workspace:^",
+    "koa": "^2.14.2",
+    "koa-cors": "^0.0.16",
+    "koa-router": "^12.0.0",
+    "viem": "^1.2.5"
+  },
+  "devDependencies": {
+    "@jest/globals": "^29.5.0",
+    "@rushstack/eslint-patch": "^1.1.4",
+    "@types/jest": "^29.5.0",
+    "@types/node": "^18.7.23",
+    "jest": "^29.5.0",
+    "ts-jest": "^29.1.0",
+    "ts-node": "^10.9.1",
+    "typescript": "^5.0.4"
+  },
+  "files": [
+    "dest",
+    "src",
+    "!*.test.*"
+  ],
+  "types": "./dest/index.d.ts",
+  "engines": {
+    "node": ">=18"
+  }
+}
diff --git a/yarn-project/aztec-faucet/src/bin/index.ts b/yarn-project/aztec-faucet/src/bin/index.ts
new file mode 100644
index 00000000000..df33695c57b
--- /dev/null
+++ b/yarn-project/aztec-faucet/src/bin/index.ts
@@ -0,0 +1,153 @@
+#!/usr/bin/env -S node --no-warnings
+import { NULL_KEY, createEthereumChain } from '@aztec/ethereum';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { createDebugLogger } from '@aztec/foundation/log';
+
+import http from 'http';
+import Koa from 'koa';
+import cors from 'koa-cors';
+import Router from 'koa-router';
+import { Hex, http as ViemHttp, createWalletClient, parseEther } from 'viem';
+import { privateKeyToAccount } from 'viem/accounts';
+
+const {
+  FAUCET_PORT = 8082,
+  API_PREFIX = '',
+  API_KEY = '',
+  RPC_URL = '',
+  CHAIN_ID = '',
+  PRIVATE_KEY = '',
+  INTERVAL = '',
+  ETH_AMOUNT = '',
+} = process.env;
+
+const logger = createDebugLogger('aztec:faucet');
+
+const rpcUrl = RPC_URL;
+const apiKey = API_KEY;
+const chainId = +CHAIN_ID;
+const privateKey: Hex = PRIVATE_KEY ? createHex(PRIVATE_KEY) : NULL_KEY;
+const interval = +INTERVAL;
+const mapping: { [key: Hex]: Date } = {};
+
+/**
+ * Helper function to convert a string to a Hex value
+ * @param hex - The string to convert
+ * @returns The converted value
+ */
+function createHex(hex: string) {
+  return `0x${hex.replace('0x', '')}` as Hex;
+}
+
+/**
+ * Function to throttle drips on a per address basis
+ * @param address - Address requesting some ETH
+ */
+function checkThrottle(address: Hex) {
+  if (mapping[address] === undefined) {
+    return;
+  }
+  const last = mapping[address];
+  const current = new Date();
+  const diff = (current.getTime() - last.getTime()) / 1000;
+  if (diff < interval) {
+    throw new Error(`Not funding address ${address}, please try again later`);
+  }
+}
+
+/**
+ * Helper function to send some ETH to the given address
+ * @param address - Address to receive some ETH
+ */
+async function transferEth(address: string) {
+  const chain = createEthereumChain(rpcUrl, apiKey);
+
+  const account = privateKeyToAccount(privateKey);
+  const walletClient = createWalletClient({
+    account: account,
+    chain: chain.chainInfo,
+    transport: ViemHttp(chain.rpcUrl),
+  });
+  const hexAddress = createHex(address);
+  checkThrottle(hexAddress);
+  try {
+    const hash = await walletClient.sendTransaction({
+      account,
+      to: hexAddress,
+      value: parseEther(ETH_AMOUNT),
+    });
+    mapping[hexAddress] = new Date();
+    logger.info(`Sent ${ETH_AMOUNT} ETH to ${hexAddress} in tx ${hash}`);
+  } catch (error) {
+    logger.error(`Failed to send eth to ${hexAddress}`);
+    throw error;
+  }
+}
+
+/**
+ * Creates a router for the faucet.
+ * @param apiPrefix - The prefix to use for all api requests
+ * @returns - The router for handling status requests.
+ */
+function createRouter(apiPrefix: string) {
+  logger.info(`Creating router with prefix ${apiPrefix}`);
+  const router = new Router({ prefix: `${apiPrefix}` });
+  router.get('/status', (ctx: Koa.Context) => {
+    ctx.status = 200;
+  });
+  router.get('/drip/:address', async (ctx: Koa.Context) => {
+    const { address } = ctx.params;
+    await transferEth(EthAddress.fromString(address).toChecksumString());
+    ctx.status = 200;
+  });
+  return router;
+}
+
+/**
+ * Create and start a new Aztec Node HTTP Server
+ */
+async function main() {
+  logger.info(`Setting up Aztec Faucet...`);
+
+  const chain = createEthereumChain(rpcUrl, apiKey);
+  if (chain.chainInfo.id !== chainId) {
+    throw new Error(`Incorrect chain id, expected ${chain.chainInfo.id}`);
+  }
+
+  const shutdown = () => {
+    logger.info('Shutting down...');
+    process.exit(0);
+  };
+
+  process.once('SIGINT', shutdown);
+  process.once('SIGTERM', shutdown);
+
+  const app = new Koa();
+  app.on('error', error => {
+    logger.error(`Error on API handler: ${error}`);
+  });
+  const exceptionHandler = async (ctx: Koa.Context, next: () => Promise<void>) => {
+    try {
+      await next();
+    } catch (err: any) {
+      logger.error(err);
+      ctx.status = 400;
+      ctx.body = { error: err.message };
+    }
+  };
+  app.use(exceptionHandler);
+  app.use(cors());
+  const apiRouter = createRouter(API_PREFIX);
+  app.use(apiRouter.routes());
+  app.use(apiRouter.allowedMethods());
+
+  const httpServer = http.createServer(app.callback());
+  httpServer.listen(+FAUCET_PORT);
+  logger.info(`Aztec Faucet listening on port ${FAUCET_PORT}`);
+  await Promise.resolve();
+}
+
+main().catch(err => {
+  logger.error(err);
+  process.exit(1);
+});
diff --git a/yarn-project/aztec-faucet/terraform/main.tf b/yarn-project/aztec-faucet/terraform/main.tf
new file mode 100644
index 00000000000..8a1f901fd09
--- /dev/null
+++ b/yarn-project/aztec-faucet/terraform/main.tf
@@ -0,0 +1,219 @@
+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"
+  }
+}
+
+
+resource "aws_cloudwatch_log_group" "aztec-faucet" {
+  name              = "/fargate/service/${var.DEPLOY_TAG}/aztec-faucet"
+  retention_in_days = 14
+}
+
+resource "aws_service_discovery_service" "aztec-faucet" {
+  name = "${var.DEPLOY_TAG}-aztec-faucet"
+
+  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-faucet" {
+  family                   = "${var.DEPLOY_TAG}-aztec-faucet"
+  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-faucet",
+    "image": "${var.ECR_URL}/aztec-faucet:aztec3-packages-prod",
+    "essential": true,
+    "memoryReservation": 3776,
+    "portMappings": [
+      {
+        "containerPort": 80
+      }
+    ],
+    "environment": [
+      {
+        "name": "NODE_ENV",
+        "value": "production"
+      },
+      {
+        "name": "FAUCET_PORT",
+        "value": "80"
+      },
+      {
+        "name": "DEBUG",
+        "value": "aztec:*"
+      },
+      {
+        "name": "RPC_URL",
+        "value": "${var.RPC_URL}"
+      },
+      {
+        "name": "API_KEY",
+        "value": "${var.API_KEY}"
+      },
+      {
+        "name": "API_PREFIX",
+        "value": "/${var.DEPLOY_TAG}/aztec-faucet/${API_PREFIX}"
+      },
+      {
+        "name": "CHAIN_ID",
+        "value": "${var.CHAIN_ID}"
+      },
+      {
+        "name": "PRIVATE_KEY",
+        "value": "${var.PRIVATE_KEY}"
+      }
+      {
+        "name": "INTERVAL",
+        "value": "86400"
+      },
+      {
+        "name": "ETH_AMOUNT",
+        "value": "1.0"
+      }
+    ],
+    "logConfiguration": {
+      "logDriver": "awslogs",
+      "options": {
+        "awslogs-group": "/fargate/service/${var.DEPLOY_TAG}/aztec-faucet",
+        "awslogs-region": "eu-west-2",
+        "awslogs-stream-prefix": "ecs"
+      }
+    }
+  }
+]
+DEFINITIONS
+}
+
+resource "aws_ecs_service" "aztec-faucet" {
+  name                               = "${var.DEPLOY_TAG}-faucet"
+  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.setup_iac.outputs.security_group_private_id]
+  }
+
+  load_balancer {
+    target_group_arn = aws_alb_target_group.aztec-faucet.arn
+    container_name   = "${var.DEPLOY_TAG}-aztec-faucet"
+    container_port   = 80
+  }
+
+  service_registries {
+    registry_arn   = aws_service_discovery_service.aztec-faucet.arn
+    container_name = "${var.DEPLOY_TAG}-aztec-faucet"
+    container_port = 80
+  }
+
+  task_definition = aws_ecs_task_definition.aztec-faucet.family
+}
+
+# Configure ALB to route /aztec-faucet to server.
+resource "aws_alb_target_group" "aztec-faucet" {
+  name                 = "${var.DEPLOY_TAG}-aztec-faucet"
+  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-faucet/${var.API_PREFIX}/status"
+    matcher             = "200"
+    interval            = 10
+    healthy_threshold   = 2
+    unhealthy_threshold = 5
+    timeout             = 5
+  }
+
+  tags = {
+    name = "${var.DEPLOY_TAG}-aztec-faucet"
+  }
+}
+
+resource "aws_lb_listener_rule" "api-1" {
+  listener_arn = data.terraform_remote_state.aztec2_iac.outputs.alb_listener_arn
+  priority     = 500
+
+  action {
+    type             = "forward"
+    target_group_arn = aws_alb_target_group.aztec-faucet.arn
+  }
+
+  condition {
+    path_pattern {
+      values = ["/${var.DEPLOY_TAG}/aztec-faucet*"]
+    }
+  }
+}
diff --git a/yarn-project/aztec-faucet/terraform/variables.tf b/yarn-project/aztec-faucet/terraform/variables.tf
new file mode 100644
index 00000000000..6ce160819ba
--- /dev/null
+++ b/yarn-project/aztec-faucet/terraform/variables.tf
@@ -0,0 +1,27 @@
+variable "DEPLOY_TAG" {
+  type = string
+}
+
+variable "RPC_URL" {
+  type = string
+}
+
+variable "API_KEY" {
+  type = string
+}
+
+variable "API_PREFIX" {
+  type = string
+}
+
+variable "CHAIN_ID" {
+  type = string
+}
+
+variable "PRIVATE_KEY" {
+  type = string
+}
+
+variable "ECR_URL" {
+  type = string
+}
diff --git a/yarn-project/aztec-faucet/tsconfig.json b/yarn-project/aztec-faucet/tsconfig.json
new file mode 100644
index 00000000000..22ac5578175
--- /dev/null
+++ b/yarn-project/aztec-faucet/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "extends": "..",
+  "compilerOptions": {
+    "outDir": "dest",
+    "rootDir": "src",
+    "tsBuildInfoFile": ".tsbuildinfo"
+  },
+  "references": [
+    {
+      "path": "../ethereum"
+    },
+    {
+      "path": "../foundation"
+    }
+  ],
+  "include": ["src"]
+}
diff --git a/yarn-project/aztec-node/terraform/main.tf b/yarn-project/aztec-node/terraform/main.tf
index 8a279d53303..52b5c903e7c 100644
--- a/yarn-project/aztec-node/terraform/main.tf
+++ b/yarn-project/aztec-node/terraform/main.tf
@@ -137,11 +137,11 @@ resource "aws_ecs_task_definition" "aztec-node-1" {
       },
       {
         "name": "SEQ_MAX_TX_PER_BLOCK",
-        "value": "32"
+        "value": "${var.SEQ_MAX_TX_PER_BLOCK}"
       },
       {
         "name": "SEQ_MIN_TX_PER_BLOCK",
-        "value": "4"
+        "value": "${var.SEQ_MIN_TX_PER_BLOCK}"
       },
       {
         "name": "SEQ_PUBLISHER_PRIVATE_KEY",
@@ -202,6 +202,14 @@ resource "aws_ecs_task_definition" "aztec-node-1" {
       {
         "name": "PEER_ID_PRIVATE_KEY",
         "value": "${var.NODE_1_PRIVATE_KEY}"
+      },
+      {
+        "name": "P2P_MIN_PEERS",
+        "value": "${var.P2P_MIN_PEERS}"
+      },
+      {
+        "name": "P2P_MAX_PEERS",
+        "value": "${var.P2P_MAX_PEERS}"
       }
     ],
     "logConfiguration": {
@@ -430,11 +438,11 @@ resource "aws_ecs_task_definition" "aztec-node-2" {
       },
       {
         "name": "SEQ_MAX_TX_PER_BLOCK",
-        "value": "32"
+        "value": "${var.SEQ_MAX_TX_PER_BLOCK}"
       },
       {
         "name": "SEQ_MIN_TX_PER_BLOCK",
-        "value": "4"
+        "value": "${var.SEQ_MIN_TX_PER_BLOCK}"
       },
       {
         "name": "SEQ_PUBLISHER_PRIVATE_KEY",
@@ -495,6 +503,14 @@ resource "aws_ecs_task_definition" "aztec-node-2" {
       {
         "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": {
diff --git a/yarn-project/aztec-node/terraform/variables.tf b/yarn-project/aztec-node/terraform/variables.tf
index 33128ae2f5b..d80ae23529d 100644
--- a/yarn-project/aztec-node/terraform/variables.tf
+++ b/yarn-project/aztec-node/terraform/variables.tf
@@ -69,3 +69,19 @@ variable "NODE_2_PRIVATE_KEY" {
 variable "ECR_URL" {
   type = string
 }
+
+variable "SEQ_MAX_TX_PER_BLOCK" {
+  type = string
+}
+
+variable "SEQ_MIN_TX_PER_BLOCK" {
+  type = string
+}
+
+variable "P2P_MIN_PEERS" {
+  type = string
+}
+
+variable "P2P_MAX_PEERS" {
+  type = string
+}
diff --git a/yarn-project/deploy_ecr.sh b/yarn-project/deploy_ecr.sh
index 9dae7f7b1d6..f13d34ac43d 100755
--- a/yarn-project/deploy_ecr.sh
+++ b/yarn-project/deploy_ecr.sh
@@ -3,7 +3,7 @@
 extract_repo yarn-project /usr/src project
 PROJECT_ROOT=$(pwd)/project/src/
 
-for REPOSITORY in "p2p-bootstrap" "aztec-node"
+for REPOSITORY in "p2p-bootstrap" "aztec-node" "aztec-faucet"
 do
     echo "Deploying $REPOSITORY"
     RELATIVE_PROJECT_DIR=$(query_manifest relativeProjectDir $REPOSITORY)
diff --git a/yarn-project/p2p-bootstrap/terraform/main.tf b/yarn-project/p2p-bootstrap/terraform/main.tf
index 8e44f28913d..a5b2f88ffb4 100644
--- a/yarn-project/p2p-bootstrap/terraform/main.tf
+++ b/yarn-project/p2p-bootstrap/terraform/main.tf
@@ -129,6 +129,14 @@ resource "aws_ecs_task_definition" "aztec-bootstrap-1" {
       {
         "name": "DEBUG",
         "value": "aztec:*"
+      },
+      {
+        "name": "P2P_MIN_PEERS",
+        "value": "${var.P2P_MIN_PEERS}"
+      },
+      {
+        "name": "P2P_MAX_PEERS",
+        "value": "${var.P2P_MAX_PEERS}"
       }
     ],
     "logConfiguration": {
@@ -305,6 +313,14 @@ resource "aws_ecs_task_definition" "aztec-bootstrap-2" {
       {
         "name": "DEBUG",
         "value": "aztec:*"
+      },
+      {
+        "name": "P2P_MIN_PEERS",
+        "value": "${var.P2P_MIN_PEERS}"
+      },
+      {
+        "name": "P2P_MAX_PEERS",
+        "value": "${var.P2P_MAX_PEERS}"
       }
     ],
     "logConfiguration": {
diff --git a/yarn-project/p2p-bootstrap/terraform/variables.tf b/yarn-project/p2p-bootstrap/terraform/variables.tf
index 0557ec21e0a..aafaf04abe0 100644
--- a/yarn-project/p2p-bootstrap/terraform/variables.tf
+++ b/yarn-project/p2p-bootstrap/terraform/variables.tf
@@ -21,3 +21,11 @@ variable "BOOTNODE_2_PRIVATE_KEY" {
 variable "ECR_URL" {
   type = string
 }
+
+variable "P2P_MIN_PEERS" {
+  type = string
+}
+
+variable "P2P_MAX_PEERS" {
+  type = string
+}
diff --git a/yarn-project/package.json b/yarn-project/package.json
index 36bf9b261ad..b4fd6ed43e0 100644
--- a/yarn-project/package.json
+++ b/yarn-project/package.json
@@ -18,6 +18,7 @@
   "workspaces": [
     "acir-simulator",
     "archiver",
+    "aztec-faucet",
     "aztec-node",
     "pxe",
     "aztec-sandbox",
diff --git a/yarn-project/tsconfig.json b/yarn-project/tsconfig.json
index 07554204d49..af50822b8bb 100644
--- a/yarn-project/tsconfig.json
+++ b/yarn-project/tsconfig.json
@@ -20,6 +20,7 @@
   "references": [
     { "path": "acir-simulator/tsconfig.json" },
     { "path": "archiver/tsconfig.json" },
+    { "path": "aztec-faucet/tsconfig.json" },
     { "path": "aztec.js/tsconfig.json" },
     { "path": "aztec-node/tsconfig.json" },
     { "path": "pxe/tsconfig.json" },
diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock
index da4782e27d4..883ffd7cf6f 100644
--- a/yarn-project/yarn.lock
+++ b/yarn-project/yarn.lock
@@ -118,6 +118,29 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@aztec/aztec-faucet@workspace:aztec-faucet":
+  version: 0.0.0-use.local
+  resolution: "@aztec/aztec-faucet@workspace:aztec-faucet"
+  dependencies:
+    "@aztec/ethereum": "workspace:^"
+    "@aztec/foundation": "workspace:^"
+    "@jest/globals": ^29.5.0
+    "@rushstack/eslint-patch": ^1.1.4
+    "@types/jest": ^29.5.0
+    "@types/node": ^18.7.23
+    jest: ^29.5.0
+    koa: ^2.14.2
+    koa-cors: ^0.0.16
+    koa-router: ^12.0.0
+    ts-jest: ^29.1.0
+    ts-node: ^10.9.1
+    typescript: ^5.0.4
+    viem: ^1.2.5
+  bin:
+    aztec-faucet: ./dest/bin/index.js
+  languageName: unknown
+  linkType: soft
+
 "@aztec/aztec-node@workspace:^, @aztec/aztec-node@workspace:aztec-node":
   version: 0.0.0-use.local
   resolution: "@aztec/aztec-node@workspace:aztec-node"
@@ -13244,6 +13267,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"koa-cors@npm:^0.0.16":
+  version: 0.0.16
+  resolution: "koa-cors@npm:0.0.16"
+  checksum: 66d85b7a4834c436a6bfbe77248a19edebc2082c5e73d907c680a96f75ec1963146024b29cc3bb04c7790e52c6f0067f3dd71a0e341bdcc83dbc6971b86a3339
+  languageName: node
+  linkType: hard
+
 "koa-is-json@npm:^1.0.0":
   version: 1.0.0
   resolution: "koa-is-json@npm:1.0.0"