diff --git a/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.wasm-linux-clang b/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.wasm-linux-clang
index 48e54f5b97a..cb9474b73fc 100644
--- a/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.wasm-linux-clang
+++ b/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.wasm-linux-clang
@@ -1,4 +1,4 @@
-FROM ubuntu:lunar AS builder
+FROM ubuntu:jammy AS builder
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential wget git libssl-dev cmake ninja-build curl
 RUN curl https://wasmtime.dev/install.sh -sSf | bash /dev/stdin --version v3.0.1
 WORKDIR /usr/src/barretenberg/cpp
diff --git a/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang b/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang
index 73600fc890e..47ecf761c73 100644
--- a/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang
+++ b/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang
@@ -1,4 +1,4 @@
-FROM ubuntu:lunar AS builder
+FROM ubuntu:jammy AS builder
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential wget git libssl-dev cmake ninja-build curl binaryen
 
 WORKDIR /usr/src/circuits/cpp/barretenberg/cpp
diff --git a/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang-assert b/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang-assert
index 59ce8179f8b..615244dc7ba 100644
--- a/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang-assert
+++ b/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang-assert
@@ -1,4 +1,4 @@
-FROM ubuntu:lunar AS builder
+FROM ubuntu:jammy AS builder
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential git libssl-dev cmake ninja-build curl binaryen
 
 WORKDIR /usr/src/circuits/cpp/barretenberg/cpp
@@ -9,7 +9,7 @@ COPY . .
 
 RUN cmake --preset wasm && cmake --build --preset wasm
 
-FROM ubuntu:lunar
+FROM ubuntu:jammy
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y xz-utils curl
 RUN curl https://wasmtime.dev/install.sh -sSf | bash /dev/stdin --version v3.0.1
 COPY --from=builder /usr/src/circuits/cpp/barretenberg/cpp/srs_db /usr/src/circuits/cpp/barretenberg/cpp/srs_db
diff --git a/yarn-project/noir-contracts/Dockerfile.build b/yarn-project/noir-contracts/Dockerfile.build
index 1f96d61f553..45a6508f6e2 100644
--- a/yarn-project/noir-contracts/Dockerfile.build
+++ b/yarn-project/noir-contracts/Dockerfile.build
@@ -1,7 +1,7 @@
 # Running on ubuntu until noir supports an alpine build
 
 # Builder stage to build the noir artifacts
-FROM ubuntu:lunar
+FROM ubuntu:jammy
 
 RUN apt-get update && apt-get install -y \
     curl \