diff --git a/build-system/scripts/deploy_service b/build-system/scripts/deploy_service
index 80fad879ad4..d0ae08fd93f 100755
--- a/build-system/scripts/deploy_service
+++ b/build-system/scripts/deploy_service
@@ -4,10 +4,10 @@ set -eu
 
 # Redeploy services with the latest image that match $DEPLOY_TAG followed by $SERVICE_NAME.
 SERVICE_NAME=$1
-PATTERN="$DEPLOY_TAG.*$SERVICE_NAME.*"
+PATTERN="${DEPLOY_TAG}.*${SERVICE_NAME}[^\"]*"
 
 # Fetch list of services
-SERVICES=$(aws ecs list-services --region $ECR_DEPLOY_REGION --cluster setup | grep -Eo "arn:aws:ecs:[^:]+:[^:]+:service/[^/]+/$PATTERN" || true)
+SERVICES=$(aws ecs list-services --region $ECR_DEPLOY_REGION --cluster setup | grep -Eo "arn:aws:ecs:[^:]+:[^:]+:service/[^/]+/${PATTERN}" || true)
 
 echo "Services to redeploy:"
 echo "$SERVICES"
diff --git a/yarn-project/aztec-faucet/Dockerfile b/yarn-project/aztec-faucet/Dockerfile
index be0711dbb16..f4567db7482 100644
--- a/yarn-project/aztec-faucet/Dockerfile
+++ b/yarn-project/aztec-faucet/Dockerfile
@@ -1,4 +1,4 @@
 FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-prod
 WORKDIR /usr/src/yarn-project/aztec-faucet
-ENTRYPOINT ["yarn", "start"]
+ENTRYPOINT ["node", "--no-warnings", "/usr/src/yarn-project/aztec-faucet/dest/bin/index.js"]
 EXPOSE 8080
diff --git a/yarn-project/aztec-faucet/terraform/main.tf b/yarn-project/aztec-faucet/terraform/main.tf
index db33a2656c5..912257fe207 100644
--- a/yarn-project/aztec-faucet/terraform/main.tf
+++ b/yarn-project/aztec-faucet/terraform/main.tf
@@ -76,7 +76,7 @@ resource "aws_service_discovery_service" "aztec-faucet" {
 
 # Define task definition and service.
 resource "aws_ecs_task_definition" "aztec-faucet" {
-  family                   = "${var.DEPLOY_TAG}-faucet"
+  family                   = "${var.DEPLOY_TAG}-aztec-faucet"
   requires_compatibilities = ["FARGATE"]
   network_mode             = "awsvpc"
   cpu                      = "2048"
diff --git a/yarn-project/noir-protocol-circuits/.gitignore b/yarn-project/noir-protocol-circuits/.gitignore
index 2173ed9152e..fef96f805be 100644
--- a/yarn-project/noir-protocol-circuits/.gitignore
+++ b/yarn-project/noir-protocol-circuits/.gitignore
@@ -1,4 +1,5 @@
 proofs/
 Prover.toml
 Verifier.toml
-src/target
\ No newline at end of file
+src/target
+src/crs