diff --git a/build_manifest.yml b/build_manifest.yml
index 9ab9f3bbe1b..1f5908cd8bd 100644
--- a/build_manifest.yml
+++ b/build_manifest.yml
@@ -168,6 +168,7 @@ yarn-project:
     - noir-packages
     - l1-contracts
     - noir-projects
+    - barretenberg-x86_64-linux-clang
   multiarch: host
 
 # A runnable container, sets entrypoint to be the aztec infrastructure entrypoint.
diff --git a/yarn-project/Dockerfile b/yarn-project/Dockerfile
index 8a7659fa5ad..6d6aa4e255e 100644
--- a/yarn-project/Dockerfile
+++ b/yarn-project/Dockerfile
@@ -13,12 +13,10 @@ COPY --from=noir-packages /usr/src/noir/packages /usr/src/noir/packages
 COPY --from=contracts /usr/src/l1-contracts /usr/src/l1-contracts
 COPY --from=noir-projects /usr/src/noir-projects /usr/src/noir-projects
 COPY --from=barretenberg /usr/src/barretenberg/cpp/build/bin/bb /usr/src/barretenberg/cpp/build/bin/bb
-COPY --from=barretenberg /usr/src/barretenberg/cpp/srs_db/download_ignition.sh /usr/src/barretenberg/cpp/srs_db/download_ignition.sh
 
 WORKDIR /usr/src/barretenberg/cpp/srs_db
+COPY ../barretenberg/cpp/srs_db/download_ignition.sh ./download_ignition.sh
 RUN ./download_ignition.sh 0
-COPY . .
-
 
 WORKDIR /usr/src/yarn-project
 COPY . .
diff --git a/yarn-project/Dockerfile.test b/yarn-project/Dockerfile.test
index 6dfe4510760..fc4e645b790 100644
--- a/yarn-project/Dockerfile.test
+++ b/yarn-project/Dockerfile.test
@@ -2,6 +2,7 @@ FROM --platform=linux/amd64 aztecprotocol/bb.js as bb.js
 FROM --platform=linux/amd64 aztecprotocol/noir-packages as noir-packages
 FROM --platform=linux/amd64 aztecprotocol/l1-contracts as contracts
 FROM --platform=linux/amd64 aztecprotocol/noir-projects as noir-projects
+FROM --platform=linux/amd64 aztecprotocol/barretenberg-x86_64-linux-clang as barretenberg
 
 FROM node:18.19.0 as builder
 RUN apt update && apt install -y jq curl perl && rm -rf /var/lib/apt/lists/* && apt-get clean
@@ -11,6 +12,11 @@ COPY --from=bb.js /usr/src/barretenberg/ts /usr/src/barretenberg/ts
 COPY --from=noir-packages /usr/src/noir/packages /usr/src/noir/packages
 COPY --from=contracts /usr/src/l1-contracts /usr/src/l1-contracts
 COPY --from=noir-projects /usr/src/noir-projects /usr/src/noir-projects
+COPY --from=barretenberg /usr/src/barretenberg/cpp/build/bin/bb /usr/src/barretenberg/cpp/build/bin/bb
+
+WORKDIR /usr/src/barretenberg/cpp/srs_db
+COPY ../barretenberg/cpp/srs_db/download_ignition.sh ./download_ignition.sh
+RUN ./download_ignition.sh 0
 
 WORKDIR /usr/src/yarn-project
 COPY . .
@@ -31,4 +37,4 @@ RUN yarn prepare:check && yarn formatting && yarn test
 
 # Avoid pushing some huge container back to ecr.
 FROM scratch
-COPY --from=builder /usr/src/yarn-project/README.md /usr/src/yarn-project/README.md
\ No newline at end of file
+COPY --from=builder /usr/src/yarn-project/README.md /usr/src/yarn-project/README.md