diff --git a/app/build_containers.py b/app/build_containers.py
index 6cd8f2b8..1ed3cb16 100644
--- a/app/build_containers.py
+++ b/app/build_containers.py
@@ -115,7 +115,7 @@ def command(ctx, include, exclude, force_rebuild, extra_build_args):
             # TODO: make this less of a hack -- should be specified in some metadata somewhere
             # Check if we have a repo for this container. If not, set the context dir to the container-build subdir
             repo_full_path = os.path.join(dev_root_path, repo_dir)
-            repo_dir_or_build_dir = repo_dir if os.path.exists(repo_full_path) else build_dir
+            repo_dir_or_build_dir = repo_full_path if os.path.exists(repo_full_path) else build_dir
             build_command = os.path.join(container_build_dir, "default-build.sh") + f" {container}:local {repo_dir_or_build_dir}"
         if not dry_run:
             if verbose:
diff --git a/app/data/container-image-list.txt b/app/data/container-image-list.txt
index ba0eaf23..f3d9985f 100644
--- a/app/data/container-image-list.txt
+++ b/app/data/container-image-list.txt
@@ -38,3 +38,4 @@ cerc/optimism-op-node
 cerc/optimism-op-proposer
 cerc/pocket
 cerc/watcher-azimuth
+cerc/ipld-eth-state-snapshot
diff --git a/app/data/repository-list.txt b/app/data/repository-list.txt
index 7035de2a..4002d559 100644
--- a/app/data/repository-list.txt
+++ b/app/data/repository-list.txt
@@ -30,3 +30,4 @@ ethereum-optimism/optimism
 pokt-network/pocket-core
 pokt-network/pocket-core-deployments
 cerc-io/azimuth-watcher-ts
+cerc-io/ipld-eth-state-snapshot
diff --git a/app/data/stacks/chain-chunker/README.md b/app/data/stacks/chain-chunker/README.md
new file mode 100644
index 00000000..e69de29b
diff --git a/app/data/stacks/chain-chunker/stack.yml b/app/data/stacks/chain-chunker/stack.yml
new file mode 100644
index 00000000..f7676d34
--- /dev/null
+++ b/app/data/stacks/chain-chunker/stack.yml
@@ -0,0 +1,13 @@
+version: "1.0"
+name: chain-chunker
+decription: "Stack to build containers for chain-chunker"
+repos:
+  - cerc-io/ipld-eth-state-snapshot
+  - cerc-io/eth-statediff-service
+  - cerc-io/ipld-eth-db
+  - cerc-io/ipld-eth-server
+containers:
+  - cerc/ipld-eth-state-snapshot
+  - cerc/eth-statediff-service
+  - cerc/ipld-eth-db
+  - cerc/ipld-eth-server