diff --git a/app/data/compose/docker-compose-foundry.yml b/app/data/compose/docker-compose-foundry.yml
index ed5a018a..e489611c 100644
--- a/app/data/compose/docker-compose-foundry.yml
+++ b/app/data/compose/docker-compose-foundry.yml
@@ -1,7 +1,7 @@
 # Add-on pod to include foundry tooling within a fixturenet
 services:
   foundry:
-    image: ghcr.io/foundry-rs/foundry:latest
+    image: cerc/foundry:local
     command: ["while :; do sleep 600; done"]
     volumes:
       - ../config/foundry/foundry.toml:/foundry.toml
diff --git a/app/data/container-build/cerc-foundry/build.sh b/app/data/container-build/cerc-foundry/build.sh
new file mode 100755
index 00000000..9dfad156
--- /dev/null
+++ b/app/data/container-build/cerc-foundry/build.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+# Build a local version of the foundry-rs/foundry image
+docker build -t cerc/foundry:local ${CERC_REPO_BASE_DIR}/foundry
diff --git a/app/data/container-build/foundry-rs-foundry/build.sh b/app/data/container-build/foundry-rs-foundry/build.sh
deleted file mode 100755
index 7bfbf873..00000000
--- a/app/data/container-build/foundry-rs-foundry/build.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-# Build foundry-rs/foundry
-# HACK below : TARGETARCH needs to be derived from the host environment
-docker build -t foundry-rs/foundry:local ${CERC_REPO_BASE_DIR}/foundry
diff --git a/app/data/container-image-list.txt b/app/data/container-image-list.txt
index f22b4543..9fe22a4a 100644
--- a/app/data/container-image-list.txt
+++ b/app/data/container-image-list.txt
@@ -1,4 +1,4 @@
-foundry-rs/foundry
+cerc/foundry
 cerc/test-contract
 cerc/eth-statediff-fill-service
 cerc/eth-statediff-service
diff --git a/app/data/repository-list.txt b/app/data/repository-list.txt
index 35f47c07..61b7290e 100644
--- a/app/data/repository-list.txt
+++ b/app/data/repository-list.txt
@@ -16,4 +16,4 @@ vulcanize/uniswap-v3-info
 vulcanize/assemblyscript
 cerc-io/eth-probe
 cerc-io/tx-spammer
-foundry-rs/foundry
+dboreham/foundry
diff --git a/app/data/stacks/fixturenet-eth/stack.yml b/app/data/stacks/fixturenet-eth/stack.yml
index f6c95e17..db3f4231 100644
--- a/app/data/stacks/fixturenet-eth/stack.yml
+++ b/app/data/stacks/fixturenet-eth/stack.yml
@@ -4,11 +4,13 @@ decription: "Ethereum Fixturenet"
 repos:
   - cerc-io/go-ethereum
   - cerc-io/tx-spammer
+  - dboreham/foundry
 containers:
   - cerc/go-ethereum
   - cerc/lighthouse
   - cerc/fixturenet-eth-geth
   - cerc/fixturenet-eth-lighthouse
+  - cerc/foundry
 pods:
   - fixturenet-eth
   - foundry