diff --git a/app/data/stacks/chain-chunker/stack.yml b/app/data/stacks/chain-chunker/stack.yml
index 671859c4..2d36330b 100644
--- a/app/data/stacks/chain-chunker/stack.yml
+++ b/app/data/stacks/chain-chunker/stack.yml
@@ -2,10 +2,10 @@ version: "1.0"
 name: chain-chunker
 decription: "Stack to build containers for chain-chunker"
 repos:
-  - github.com/cerc-io/ipld-eth-state-snapshot
-  - github.com/cerc-io/eth-statediff-service
-  - github.com/cerc-io/ipld-eth-db
-  - github.com/cerc-io/ipld-eth-server
+  - github.com/cerc-io/ipld-eth-state-snapshot@v5
+  - github.com/cerc-io/eth-statediff-service@v5
+  - github.com/cerc-io/ipld-eth-db@v5
+  - github.com/cerc-io/ipld-eth-server@v5
 containers:
   - cerc/ipld-eth-state-snapshot
   - cerc/eth-statediff-service
diff --git a/app/setup_repositories.py b/app/setup_repositories.py
index f6ee1e02..bfcbe0ec 100644
--- a/app/setup_repositories.py
+++ b/app/setup_repositories.py
@@ -121,9 +121,8 @@ def process_repo(verbose, quiet, dry_run, pull, check_only, git_ssh, dev_root_pa
     else:
         branch_to_checkout = repo_branch
 
-    print(f"branch_to_checkout: {branch_to_checkout}")
     if branch_to_checkout:
-        if current_repo_branch and (current_repo_branch != branch_to_checkout):
+        if current_repo_branch is None or (current_repo_branch and (current_repo_branch != branch_to_checkout)):
             if not quiet:
                 print(f"switching to branch {branch_to_checkout} in repo {repo_path}")
             git_repo = git.Repo(full_filesystem_repo_path)