diff --git a/.circleci/config.yml b/.circleci/config.yml
index d828f8307d22..1c88e9035b7b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -114,6 +114,28 @@ jobs:
           name: "Build and test"
           command: build aztec.js
 
+  barretenberg-js:
+    machine:
+      image: ubuntu-2004:202010-01
+    resource_class: large
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build and test"
+          command: build barretenberg.js
+
+  l2-block:
+    machine:
+      image: ubuntu-2004:202010-01
+    resource_class: large
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build and test"
+          command: build l2-block
+
   noir-contracts:
     machine:
       image: ubuntu-2004:202010-01
@@ -147,6 +169,17 @@ jobs:
           name: "Build and test"
           command: build merkle-tree
 
+  p2p:
+    machine:
+      image: ubuntu-2004:202010-01
+    resource_class: large
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build and test"
+          command: build p2p
+
   acir-simulator:
     machine:
       image: ubuntu-2004:202010-01
@@ -168,6 +201,17 @@ jobs:
       - run:
           name: "Build and test"
           command: build archiver
+  
+  aztec-rpc:
+    machine:
+      image: ubuntu-2004:202010-01
+    resource_class: large
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build and test"
+          command: build aztec-rpc
 
   circuits-js:
     machine:
@@ -266,7 +310,11 @@ workflows:
       - world-state: *yarn_project
       - acir-simulator: *yarn_project
       - archiver: *yarn_project
+      - aztec-rpc: *yarn_project
+      - barretenberg-js: *yarn_project
+      - l2-block: *yarn_project
       - merkle-tree: *yarn_project
+      - p2p: *yarn_project
       - noir-contracts: *yarn_project
       - sequencer-client: *yarn_project
       - circuits-js: *yarn_project
diff --git a/yarn-project/aztec-rpc/Dockerfile b/yarn-project/aztec-rpc/Dockerfile
index b92f7b7ff4c1..34a20c2bf115 100644
--- a/yarn-project/aztec-rpc/Dockerfile
+++ b/yarn-project/aztec-rpc/Dockerfile
@@ -1,5 +1,13 @@
 FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
 COPY . .
+# Build barretenberg.js to ensure wasm is in the dest folder.
+WORKDIR /usr/src/yarn-project/barretenberg.js
+RUN yarn build
+
+# dependencies
+WORKDIR /usr/src/yarn-project
+COPY barretenberg.js barretenberg.js
+
 RUN cd aztec-node && yarn build
 WORKDIR /usr/src/yarn-project/aztec-rpc
 RUN yarn build && yarn formatting && yarn test
diff --git a/yarn-project/barretenberg.js/src/crypto/pedersen/pedersen.ts b/yarn-project/barretenberg.js/src/crypto/pedersen/pedersen.ts
index ea873d94e2a3..67c29e8a84c1 100644
--- a/yarn-project/barretenberg.js/src/crypto/pedersen/pedersen.ts
+++ b/yarn-project/barretenberg.js/src/crypto/pedersen/pedersen.ts
@@ -13,7 +13,7 @@ export function pedersenCompress(wasm: BarretenbergWasm, lhs: Uint8Array, rhs: U
   // If not done already, precompute constants.
   wasm.call('pedersen__init');
   if (lhs.length !== 32 || rhs.length !== 32) {
-    throw new Error('lhs and rhs must be equal to 32 bytes')
+    throw new Error('lhs and rhs must be equal to 32 bytes');
   }
   wasm.writeMemory(0, lhs);
   wasm.writeMemory(32, rhs);
diff --git a/yarn-project/l2-block/Dockerfile b/yarn-project/l2-block/Dockerfile
index de655ec33cc2..d4b247a2f9ba 100644
--- a/yarn-project/l2-block/Dockerfile
+++ b/yarn-project/l2-block/Dockerfile
@@ -1,7 +1,10 @@
 FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
-COPY foundation foundation
-COPY circuits.js circuits.js
 COPY l2-block l2-block
+# dependencies
+COPY circuits.js circuits.js
+COPY ethereum.js ethereum.js
+COPY foundation foundation
+COPY l1-contracts l1-contracts
 WORKDIR /usr/src/yarn-project/l2-block
 RUN yarn build && yarn formatting && yarn test
 
diff --git a/yarn-project/p2p/Dockerfile b/yarn-project/p2p/Dockerfile
index d86ccdd3a1af..844e98ad80a6 100644
--- a/yarn-project/p2p/Dockerfile
+++ b/yarn-project/p2p/Dockerfile
@@ -1,6 +1,14 @@
 FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
 
 COPY p2p p2p
+# dependencies
+COPY circuits.js circuits.js
+COPY ethereum.js ethereum.js
+COPY foundation foundation
+COPY l1-contracts l1-contracts
+COPY l2-block l2-block
+COPY tx tx
+
 WORKDIR /usr/src/yarn-project/p2p
 RUN yarn build && yarn formatting && yarn test