diff --git a/build-system/scripts/build_local b/build-system/scripts/build_local
index a067e48387d..4ef00589f92 100755
--- a/build-system/scripts/build_local
+++ b/build-system/scripts/build_local
@@ -105,8 +105,8 @@ for E in "${PROJECTS[@]}"; do
         docker pull $CACHE_IMAGE_URI
       else
         docker build ${ADDITIONAL_ARGS:-} --build-arg ARG_COMMIT_HASH=$COMMIT_HASH -f $DOCKERFILE -t $CACHE_IMAGE_URI .
-        docker tag $CACHE_IMAGE_URI $DEPLOY_IMAGE_URI
       fi
+      docker tag $CACHE_IMAGE_URI $DEPLOY_IMAGE_URI
     fi
   fi
 
diff --git a/build_manifest.yml b/build_manifest.yml
index b924b3d3941..f955b467221 100644
--- a/build_manifest.yml
+++ b/build_manifest.yml
@@ -84,7 +84,6 @@ l1-contracts:
 noir-contracts-build:
   buildDir: yarn-project
   projectDir: yarn-project/noir-contracts
-  dockerfile: Dockerfile.build
   rebuildPatterns:
     - ^yarn-project/noir-contracts/
     - ^yarn-project/aztec-nr/
diff --git a/yarn-project/acir-simulator/Dockerfile b/yarn-project/acir-simulator/Dockerfile
deleted file mode 100644
index dda44983527..00000000000
--- a/yarn-project/acir-simulator/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
-COPY . .
-
-WORKDIR /usr/src/yarn-project/acir-simulator
-RUN yarn build && yarn formatting && yarn test
-
-# Prune dev dependencies. See comment in base image.
-RUN yarn cache clean
-RUN yarn workspaces focus --production > /dev/null
-
-FROM node:18-alpine
-COPY --from=builder /usr/src/yarn-project/acir-simulator /usr/src/yarn-project/acir-simulator
-WORKDIR /usr/src/yarn-project/acir-simulator
-ENTRYPOINT ["yarn"]
diff --git a/yarn-project/archiver/Dockerfile b/yarn-project/archiver/Dockerfile
deleted file mode 100644
index 957da686540..00000000000
--- a/yarn-project/archiver/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
-
-COPY . .
-
-WORKDIR /usr/src/yarn-project/archiver
-RUN yarn build && yarn formatting && yarn test
-
-# Prune dev dependencies. See comment in base image.
-RUN yarn cache clean
-RUN yarn workspaces focus --production > /dev/null
-
-FROM node:18-alpine
-COPY --from=builder /usr/src/yarn-project/archiver /usr/src/yarn-project/archiver
-WORKDIR /usr/src/yarn-project/archiver
-ENTRYPOINT ["yarn"]
\ No newline at end of file
diff --git a/yarn-project/aztec-node/Dockerfile b/yarn-project/aztec-node/Dockerfile
deleted file mode 100644
index f93944094e1..00000000000
--- a/yarn-project/aztec-node/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
-
-COPY . .
-
-WORKDIR /usr/src/yarn-project/aztec-node
-RUN yarn build && yarn formatting && yarn test
-
-# Prune dev dependencies. See comment in base image.
-RUN yarn cache clean
-RUN yarn workspaces focus --production > /dev/null
-
-FROM node:18-alpine
-COPY --from=builder /usr/src /usr/src
-WORKDIR /usr/src/yarn-project/aztec-node
-ENTRYPOINT ["yarn"]
-CMD [ "start" ]
\ No newline at end of file
diff --git a/yarn-project/aztec.js/Dockerfile b/yarn-project/aztec.js/Dockerfile
deleted file mode 100644
index ec1e896c7e6..00000000000
--- a/yarn-project/aztec.js/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
-
-COPY . .
-
-WORKDIR /usr/src/yarn-project/aztec.js
-RUN yarn build && yarn formatting && yarn test
-
-# Prune dev dependencies. See comment in base image.
-RUN yarn cache clean
-RUN yarn workspaces focus --production > /dev/null
-
-FROM node:18-alpine
-COPY --from=builder /usr/src/yarn-project/aztec.js /usr/src/yarn-project/aztec.js
-WORKDIR /usr/src/yarn-project/aztec.js
-ENTRYPOINT ["yarn"]
\ No newline at end of file
diff --git a/yarn-project/circuits.js/Dockerfile b/yarn-project/circuits.js/Dockerfile
deleted file mode 100644
index d3219bdef76..00000000000
--- a/yarn-project/circuits.js/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
-
-# (1) project
-COPY . .
-
-
-# (2) build
-WORKDIR /usr/src/yarn-project/circuits.js
-RUN yarn build && yarn formatting
-
-# (3) test
-RUN yarn test
-
-# (4) Prune dev dependencies. See comment in base image.
-RUN yarn cache clean
-RUN yarn workspaces focus --production > /dev/null
-
-# (5) set up entry point
-FROM node:18-alpine
-COPY --from=builder /usr/src/yarn-project /usr/src/yarn-project
-RUN rm /usr/src/yarn-project/circuits.js/resources/aztec3-circuits.wasm
-COPY --from=builder /usr/src/circuits/cpp/build-wasm/bin/aztec3-circuits.wasm /usr/src/yarn-project/circuits.js/resources/aztec3-circuits.wasm
-WORKDIR /usr/src/yarn-project/circuits.js
-ENTRYPOINT ["yarn", "test"]
diff --git a/yarn-project/cli/Dockerfile b/yarn-project/cli/Dockerfile
deleted file mode 100644
index c6e257251d4..00000000000
--- a/yarn-project/cli/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
-
-COPY . .
-
-WORKDIR /usr/src/yarn-project/cli
-RUN yarn build && yarn formatting && yarn test
-
-# Prune dev dependencies. See comment in base image.
-RUN yarn cache clean
-RUN yarn workspaces focus --production > /dev/null
-
-FROM node:18-alpine
-COPY --from=builder /usr/src/ /usr/src/
-WORKDIR /usr/src/yarn-project/cli
-ENTRYPOINT ["yarn", "start"]
\ No newline at end of file
diff --git a/yarn-project/ethereum/Dockerfile b/yarn-project/ethereum/Dockerfile
deleted file mode 100644
index 35123be37db..00000000000
--- a/yarn-project/ethereum/Dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
-
-COPY . .
-
-WORKDIR /usr/src/yarn-project/ethereum
-RUN yarn build && yarn formatting
-
-RUN yarn test
-
-# Prune dev dependencies. See comment in base image.
-RUN yarn cache clean
-RUN yarn workspaces focus --production > /dev/null
-
-FROM node:18-alpine
-COPY --from=builder /usr/src/ /usr/src/
-WORKDIR /usr/src/yarn-project/ethereum
-ENTRYPOINT ["yarn"]
\ No newline at end of file
diff --git a/yarn-project/foundation/Dockerfile b/yarn-project/foundation/Dockerfile
deleted file mode 100644
index e3666179f61..00000000000
--- a/yarn-project/foundation/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
-
-COPY @types @types
-COPY foundation foundation
-WORKDIR /usr/src/yarn-project/foundation
-RUN yarn build && yarn formatting && yarn test
-
-# Prune dev dependencies. See comment in base image.
-RUN yarn cache clean
-RUN yarn workspaces focus --production > /dev/null
-
-FROM node:18-alpine
-COPY --from=builder /usr/src/yarn-project/foundation /usr/src/yarn-project/foundation
-WORKDIR /usr/src/yarn-project/foundation
-ENTRYPOINT ["yarn"]
\ No newline at end of file
diff --git a/yarn-project/key-store/Dockerfile b/yarn-project/key-store/Dockerfile
deleted file mode 100644
index 54c45c98433..00000000000
--- a/yarn-project/key-store/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
-
-COPY . .
-
-WORKDIR /usr/src/yarn-project/key-store
-RUN yarn build && yarn formatting && yarn test
-
-# Prune dev dependencies. See comment in base image.
-RUN yarn cache clean
-RUN yarn workspaces focus --production > /dev/null
-
-FROM node:18-alpine
-COPY --from=builder /usr/src/yarn-project/key-store /usr/src/yarn-project/key-store
-WORKDIR /usr/src/yarn-project/key-store
-ENTRYPOINT ["yarn"]
\ No newline at end of file
diff --git a/yarn-project/l1-artifacts/Dockerfile b/yarn-project/l1-artifacts/Dockerfile
deleted file mode 100644
index 6902b8a5888..00000000000
--- a/yarn-project/l1-artifacts/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
-COPY . .
-
-WORKDIR /usr/src/yarn-project/l1-artifacts
-RUN yarn build
-
-# Prune dev dependencies. See comment in base image.
-RUN yarn cache clean
-RUN yarn workspaces focus --production > /dev/null
-
-FROM node:18-alpine
-COPY --from=builder /usr/src/yarn-project/l1-artifacts /usr/src/yarn-project/l1-artifacts
-WORKDIR /usr/src/yarn-project/l1-artifacts
-ENTRYPOINT ["yarn"]
\ No newline at end of file
diff --git a/yarn-project/merkle-tree/Dockerfile b/yarn-project/merkle-tree/Dockerfile
deleted file mode 100644
index 27402634f7c..00000000000
--- a/yarn-project/merkle-tree/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
-
-COPY . .
-
-WORKDIR /usr/src/yarn-project/merkle-tree
-RUN yarn build && yarn formatting && yarn test
-
-# Prune dev dependencies. See comment in base image.
-RUN yarn cache clean
-RUN yarn workspaces focus --production > /dev/null
-
-FROM node:18-alpine
-COPY --from=builder /usr/src/yarn-project/merkle-tree /usr/src/yarn-project/merkle-tree
-WORKDIR /usr/src/yarn-project/merkle-tree
-ENTRYPOINT ["yarn"]
\ No newline at end of file
diff --git a/yarn-project/noir-compiler/Dockerfile b/yarn-project/noir-compiler/Dockerfile
deleted file mode 100644
index b054627ba45..00000000000
--- a/yarn-project/noir-compiler/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
-
-COPY . .
-
-WORKDIR /usr/src/yarn-project/noir-compiler
-RUN yarn build && yarn formatting && yarn test
-
-# Prune dev dependencies. See comment in base image.
-RUN yarn cache clean
-RUN yarn workspaces focus --production > /dev/null
-
-FROM node:18-alpine
-COPY --from=builder /usr/src/yarn-project/noir-compiler /usr/src/yarn-project/noir-compiler
-WORKDIR /usr/src/yarn-project/noir-compiler
-ENTRYPOINT ["yarn"]
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/Dockerfile b/yarn-project/noir-contracts/Dockerfile
index 5807d15c811..5600d0a9e98 100644
--- a/yarn-project/noir-contracts/Dockerfile
+++ b/yarn-project/noir-contracts/Dockerfile
@@ -1,15 +1,20 @@
-FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
-
-COPY . .
-
+FROM ubuntu:lunar
+RUN apt-get update && apt-get install -y \
+    jq \
+    curl \
+    git \
+    sed
+WORKDIR /usr/src/yarn-project
+COPY noir-contracts noir-contracts
+COPY noir-compiler noir-compiler
+COPY aztec-nr aztec-nr
 WORKDIR /usr/src/yarn-project/noir-contracts
-RUN yarn build && yarn test
 
-# Prune dev dependencies. See comment in base image.
-RUN yarn cache clean
-RUN yarn workspaces focus --production > /dev/null
+# Download and extract nargo
+ENV NARGO_HOME="/usr/src/yarn-project/noir-contracts/.nargo"
+RUN ./scripts/install_noirup.sh $(pwd)
+ENV PATH="/usr/src/yarn-project/noir-contracts/.nargo/bin:${PATH}"
 
-FROM node:18-alpine
-COPY --from=builder /usr/src/yarn-project/noir-contracts /usr/src/yarn-project/noir-contracts
-WORKDIR /usr/src/yarn-project/noir-contracts
-ENTRYPOINT ["yarn"]
\ No newline at end of file
+RUN ./scripts/install_noir.sh
+RUN ./scripts/compile_all.sh
+RUN ./scripts/nargo_test_ci.sh
diff --git a/yarn-project/noir-contracts/Dockerfile.build b/yarn-project/noir-contracts/Dockerfile.build
deleted file mode 100644
index 5600d0a9e98..00000000000
--- a/yarn-project/noir-contracts/Dockerfile.build
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM ubuntu:lunar
-RUN apt-get update && apt-get install -y \
-    jq \
-    curl \
-    git \
-    sed
-WORKDIR /usr/src/yarn-project
-COPY noir-contracts noir-contracts
-COPY noir-compiler noir-compiler
-COPY aztec-nr aztec-nr
-WORKDIR /usr/src/yarn-project/noir-contracts
-
-# Download and extract nargo
-ENV NARGO_HOME="/usr/src/yarn-project/noir-contracts/.nargo"
-RUN ./scripts/install_noirup.sh $(pwd)
-ENV PATH="/usr/src/yarn-project/noir-contracts/.nargo/bin:${PATH}"
-
-RUN ./scripts/install_noir.sh
-RUN ./scripts/compile_all.sh
-RUN ./scripts/nargo_test_ci.sh
diff --git a/yarn-project/p2p-bootstrap/Dockerfile b/yarn-project/p2p-bootstrap/Dockerfile
deleted file mode 100644
index a2c114481f1..00000000000
--- a/yarn-project/p2p-bootstrap/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
-
-COPY . .
-
-WORKDIR /usr/src/yarn-project/p2p-bootstrap
-RUN yarn build && yarn formatting
-
-RUN yarn test
-
-# Prune dev dependencies. See comment in base image.
-RUN yarn cache clean
-RUN yarn workspaces focus --production > /dev/null
-
-FROM node:18-alpine
-COPY --from=builder /usr/src/ /usr/src/
-WORKDIR /usr/src/yarn-project/p2p-bootstrap
-ENTRYPOINT ["yarn"]
-CMD ["start"]
\ No newline at end of file
diff --git a/yarn-project/p2p/Dockerfile b/yarn-project/p2p/Dockerfile
deleted file mode 100644
index fd279f8c2c7..00000000000
--- a/yarn-project/p2p/Dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
-
-COPY . .
-
-WORKDIR /usr/src/yarn-project/p2p
-RUN yarn build && yarn formatting
-
-RUN yarn test
-
-# Prune dev dependencies. See comment in base image.
-RUN yarn cache clean
-RUN yarn workspaces focus --production > /dev/null
-
-FROM node:18-alpine
-COPY --from=builder /usr/src/yarn-project/p2p /usr/src/yarn-project/p2p
-WORKDIR /usr/src/yarn-project/p2p
-ENTRYPOINT ["yarn"]
\ No newline at end of file
diff --git a/yarn-project/prover-client/Dockerfile b/yarn-project/prover-client/Dockerfile
deleted file mode 100644
index e445e42895a..00000000000
--- a/yarn-project/prover-client/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
-
-COPY . .
-
-WORKDIR /usr/src/yarn-project/prover-client
-RUN yarn build && yarn formatting && yarn test
-
-# Prune dev dependencies. See comment in base image.
-RUN yarn cache clean
-RUN yarn workspaces focus --production > /dev/null
-
-FROM node:18-alpine
-COPY --from=builder /usr/src/yarn-project/prover-client /usr/src/yarn-project/prover-client
-WORKDIR /usr/src/yarn-project/prover-client
-ENTRYPOINT ["yarn"]
\ No newline at end of file
diff --git a/yarn-project/pxe/Dockerfile b/yarn-project/pxe/Dockerfile
deleted file mode 100644
index 2b8e9cc62a0..00000000000
--- a/yarn-project/pxe/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
-
-COPY . .
-
-WORKDIR /usr/src/yarn-project/pxe
-RUN yarn build && yarn formatting && yarn test
-
-# Prune dev dependencies. See comment in base image.
-RUN yarn cache clean
-RUN yarn workspaces focus --production > /dev/null
-
-FROM node:18-alpine
-COPY --from=builder /usr/src/yarn-project/pxe /usr/src/yarn-project/pxe
-WORKDIR /usr/src/yarn-project/pxe
-ENTRYPOINT ["yarn"]
\ No newline at end of file
diff --git a/yarn-project/sequencer-client/Dockerfile b/yarn-project/sequencer-client/Dockerfile
deleted file mode 100644
index 5fe3298f633..00000000000
--- a/yarn-project/sequencer-client/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
-
-# (1) project
-COPY . .
-
-# (2) build
-WORKDIR /usr/src/yarn-project/sequencer-client
-RUN yarn build && yarn formatting
-
-# (3) test
-RUN yarn test
-
-# (4) Prune dev dependencies. See comment in base image.
-RUN yarn cache clean
-RUN yarn workspaces focus --production > /dev/null
-
-# (5) set up entry point
-FROM node:18-alpine
-COPY --from=builder /usr/src/yarn-project /usr/src/yarn-project
-WORKDIR /usr/src/yarn-project/sequencer-client
-ENTRYPOINT ["yarn", "test"]
diff --git a/yarn-project/types/Dockerfile b/yarn-project/types/Dockerfile
deleted file mode 100644
index 3f97c9648b0..00000000000
--- a/yarn-project/types/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
-COPY . .
-
-WORKDIR /usr/src/yarn-project/types
-RUN yarn build && yarn formatting && yarn test
-
-# Prune dev dependencies. See comment in base image.
-RUN yarn cache clean
-RUN yarn workspaces focus --production > /dev/null
-
-FROM node:18-alpine
-COPY --from=builder /usr/src/yarn-project/types /usr/src/yarn-project/types
-WORKDIR /usr/src/yarn-project/types
-ENTRYPOINT ["yarn"]
diff --git a/yarn-project/world-state/Dockerfile b/yarn-project/world-state/Dockerfile
deleted file mode 100644
index 5dc7a8cd899..00000000000
--- a/yarn-project/world-state/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
-
-COPY . .
-
-WORKDIR /usr/src/yarn-project/world-state
-RUN yarn build && yarn formatting
-
-RUN yarn test
-
-# Prune dev dependencies. See comment in base image.
-RUN yarn cache clean
-RUN yarn workspaces focus --production > /dev/null
-
-# set up entry point
-FROM node:18-alpine
-COPY --from=builder /usr/src/yarn-project/world-state /usr/src/yarn-project/world-state
-WORKDIR /usr/src/yarn-project/world-state
-ENTRYPOINT ["yarn", "test"]
\ No newline at end of file