diff --git a/app/data/container-build/cerc-fixturenet-eth-lighthouse/Dockerfile b/app/data/container-build/cerc-fixturenet-eth-lighthouse/Dockerfile
index 958d2b39..87f9bb60 100644
--- a/app/data/container-build/cerc-fixturenet-eth-lighthouse/Dockerfile
+++ b/app/data/container-build/cerc-fixturenet-eth-lighthouse/Dockerfile
@@ -1,4 +1,4 @@
-FROM sigp/lcli:v4.1.0 AS lcli
+FROM cerc/lighthouse-cli:local AS lcli
 FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen
 FROM cerc/fixturenet-eth-geth:local AS fnetgeth
 
diff --git a/app/data/container-build/cerc-fixturenet-plugeth-lighthouse/Dockerfile b/app/data/container-build/cerc-fixturenet-plugeth-lighthouse/Dockerfile
index 8701fe2d..ba92294b 100644
--- a/app/data/container-build/cerc-fixturenet-plugeth-lighthouse/Dockerfile
+++ b/app/data/container-build/cerc-fixturenet-plugeth-lighthouse/Dockerfile
@@ -1,4 +1,4 @@
-FROM sigp/lcli:v4.1.0 AS lcli
+FROM cerc/lighthouse-cli:local AS lcli
 FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen
 FROM cerc/fixturenet-plugeth-plugeth:local AS fnetgeth
 
diff --git a/app/data/container-build/cerc-lighthouse-cli/build.sh b/app/data/container-build/cerc-lighthouse-cli/build.sh
new file mode 100755
index 00000000..75719ef4
--- /dev/null
+++ b/app/data/container-build/cerc-lighthouse-cli/build.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+# Build cerc/lighthouse-cli
+
+source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
+
+project_dir=${CERC_REPO_BASE_DIR}/lighthouse
+docker build -t cerc/lighthouse-cli:local --build-arg PORTABLE=true -f ${project_dir}/lcli/Dockerfile ${build_command_args} ${project_dir}
diff --git a/app/data/stacks/fixturenet-eth-loaded/stack.yml b/app/data/stacks/fixturenet-eth-loaded/stack.yml
index 676e95e2..dd7e05fd 100644
--- a/app/data/stacks/fixturenet-eth-loaded/stack.yml
+++ b/app/data/stacks/fixturenet-eth-loaded/stack.yml
@@ -6,9 +6,11 @@ repos:
   - github.com/cerc-io/tx-spammer
   - github.com/cerc-io/ipld-eth-server
   - github.com/cerc-io/ipld-eth-db
+  - github.com/cerc-io/lighthouse
 containers:
   - cerc/go-ethereum
   - cerc/lighthouse
+  - cerc/lighthouse-cli
   - cerc/fixturenet-eth-geth
   - cerc/fixturenet-eth-lighthouse
   - cerc/ipld-eth-server
diff --git a/app/data/stacks/fixturenet-eth-tx/stack.yml b/app/data/stacks/fixturenet-eth-tx/stack.yml
index 0281b262..35e43575 100644
--- a/app/data/stacks/fixturenet-eth-tx/stack.yml
+++ b/app/data/stacks/fixturenet-eth-tx/stack.yml
@@ -4,10 +4,12 @@ decription: "Ethereum Fixturenet w/ tx-spammer"
 repos:
   - github.com/cerc-io/go-ethereum
   - github.com/cerc-io/tx-spammer
-  - dboreham/foundry
+  - github.com/dboreham/foundry
+  - github.com/cerc-io/lighthouse
 containers:
   - cerc/go-ethereum
   - cerc/lighthouse
+  - cerc/lighthouse-cli
   - cerc/fixturenet-eth-geth
   - cerc/fixturenet-eth-lighthouse
   - cerc/tx-spammer
diff --git a/app/data/stacks/fixturenet-plugeth-tx/stack.yml b/app/data/stacks/fixturenet-plugeth-tx/stack.yml
index 49dea4c5..e6d8c615 100644
--- a/app/data/stacks/fixturenet-plugeth-tx/stack.yml
+++ b/app/data/stacks/fixturenet-plugeth-tx/stack.yml
@@ -3,9 +3,11 @@ name: fixturenet-plugeth-tx
 decription: "plugeth Ethereum Fixturenet w/ tx-spammer"
 repos:
   - github.com/cerc-io/tx-spammer
-  - dboreham/foundry
+  - github.com/dboreham/foundry
+  - github.com/cerc-io/lighthouse
 containers:
   - cerc/lighthouse
+  - cerc/lighthouse-cli
   - cerc/fixturenet-plugeth-plugeth
   - cerc/fixturenet-plugeth-lighthouse
   - cerc/tx-spammer