diff --git a/container-build/cerc-foundry/build.sh b/container-build/cerc-foundry/build.sh
deleted file mode 100755
index f80276e..0000000
--- a/container-build/cerc-foundry/build.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-# Build a local version of the foundry-rs/foundry image
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-docker build -t cerc/foundry:local -f ${CERC_REPO_BASE_DIR}/foundry/Dockerfile-debian ${build_command_args} ${CERC_REPO_BASE_DIR}/foundry
diff --git a/container-build/cerc-optimism-contracts/Dockerfile b/container-build/cerc-optimism-contracts/Dockerfile
index 3804246..49e7bdf 100644
--- a/container-build/cerc-optimism-contracts/Dockerfile
+++ b/container-build/cerc-optimism-contracts/Dockerfile
@@ -1,14 +1,16 @@
-FROM cerc/foundry:local
+# TODO: Make work for arm64/Apple Silicon
+FROM ghcr.io/foundry-rs/foundry:nightly-267e14fab654d9ce955dce64c0eb09f01c8538ee
 
-# Install node (local foundry is a debian based image)
-RUN apt-get update \
-  && apt-get install -y curl wget \
-  && curl --silent --location https://deb.nodesource.com/setup_18.x | bash - \
-  && apt-get update \
-  && apt-get install -y nodejs git busybox jq \
+RUN apk update
+
+# Install node (use edge repo to get latest version)
+RUN apk add --update --no-cache curl wget bash git busybox jq openssl \
+  && apk add nodejs --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main --allow-untrusted \
+  && apk add npm \
   && node -v
 
-RUN corepack enable \
+# Add corepack for yarn and pnpm
+RUN npm install -g corepack && corepack enable \
   && yarn --version
 
 WORKDIR /app
diff --git a/container-build/cerc-optimism-op-node/Dockerfile b/container-build/cerc-optimism-op-node/Dockerfile
index d5ed87d..2044f33 100644
--- a/container-build/cerc-optimism-op-node/Dockerfile
+++ b/container-build/cerc-optimism-op-node/Dockerfile
@@ -25,7 +25,7 @@ RUN make op-node VERSION="$VERSION" GOOS=$TARGETOS GOARCH=$TARGETARCH
 
 FROM alpine:3.18
 
-RUN apk add --no-cache openssl jq
+RUN apk add --no-cache openssl jq bash curl
 
 COPY --from=builder /app/op-node/bin/op-node /usr/local/bin