diff --git a/op/Dockerfile.debug b/op/Dockerfile.debug
index 3185b062..9efc76de 100644
--- a/op/Dockerfile.debug
+++ b/op/Dockerfile.debug
@@ -27,11 +27,11 @@ RUN apt-get update && apt-get install -y \
 
 
 # Clone the repository and checkout the specific commit
-ENV OP_NODE_REPO=https://github.com/ethereum-optimism/optimism.git
+ARG OP_NODE_REPO=https://github.com/ethereum-optimism/optimism.git
 ARG OP_NODE_VERSION
 ARG OP_NODE_COMMIT 
 RUN git clone $OP_NODE_REPO --branch op-node/$OP_NODE_VERSION --single-branch . && \
-    git switch -c $OP_NODE_VERSION
+    git switch -c branch-$OP_NODE_VERSION
 
 # Install pnpm
 RUN npm install -g pnpm && \
@@ -70,13 +70,13 @@ RUN  cd op-wheel && \
 FROM golang:1.22 as geth
 
 WORKDIR /app
-ENV OP_GETH_REPO=https://github.com/ethereum-optimism/op-geth.git
+ARG OP_GETH_REPO=https://github.com/ethereum-optimism/op-geth.git
 ARG OP_GETH_VERSION
 ARG OP_GETH_COMMIT
 
 # avoid depth=1, so the geth build can read tags
 RUN git clone $OP_GETH_REPO --branch $OP_GETH_VERSION --single-branch . && \
-    git switch -c $OP_GETH_VERSION
+    git switch -c branch-$OP_GETH_VERSION
 
 RUN go run build/ci.go install -static ./cmd/geth