diff --git a/geth/Dockerfile b/geth/Dockerfile
index d3d8aab..acc27b5 100644
--- a/geth/Dockerfile
+++ b/geth/Dockerfile
@@ -6,7 +6,7 @@ WORKDIR /op-geth
 
 ARG OPGETH_VERSION
 
-RUN git checkout $OPGETH_VERSION
+RUN git fetch --tags && git checkout "tags/${OPGETH_VERSION}"
 
 RUN make geth
 # -------------------------------------------------------------------------
diff --git a/node/Dockerfile b/node/Dockerfile
index 7612f4a..19471be 100644
--- a/node/Dockerfile
+++ b/node/Dockerfile
@@ -13,7 +13,7 @@ WORKDIR /optimism
 
 ARG OPNODE_VERSION
 
-RUN git checkout op-node/$OPNODE_VERSION
+RUN git fetch --tags && git checkout op-node/$OPNODE_VERSION
 
 COPY --from=just-builder /app/just /usr/local/bin/