diff --git a/Dockerfile b/Dockerfile
index a855f8005..082443027 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -113,20 +113,25 @@ RUN cd $GOPATH/src/github.com/containerd/stargz-snapshotter && \
 FROM golang-base AS podman-dev
 ARG PODMAN_VERSION
 RUN apt-get update -y && apt-get install -y libseccomp-dev libgpgme-dev && \
-    git clone https://github.com/containers/podman $GOPATH/src/github.com/containers/podman && \
-    cd $GOPATH/src/github.com/containers/podman && \
-    git checkout ${PODMAN_VERSION} && \
-    make && make install PREFIX=/out/
+    git clone https://github.com/containers/podman $GOPATH/src/github.com/containers/podman
+WORKDIR $GOPATH/src/github.com/containers/podman
+RUN git checkout ${PODMAN_VERSION}
+RUN echo 'replace github.com/containers/image/v5 => github.com/ktock/image/v5 a1e2fff08e19601c260807d5f08c16ace8d18142' >> go.mod
+RUN echo 'replace github.com/containers/storage => github.com/containers/storage 7c30bb9b46a1' >> go.mod
+RUN make vendor && make && make install PREFIX=/out/
 
 # Build CRI-O
 # FROM golang-base AS cri-o-dev
 FROM golang:1.22-bullseye AS cri-o-dev
 ARG CRIO_VERSION
 RUN apt-get update -y && apt-get install -y libseccomp-dev libgpgme-dev && \
-    git clone https://github.com/cri-o/cri-o $GOPATH/src/github.com/cri-o/cri-o && \
-    cd $GOPATH/src/github.com/cri-o/cri-o && \
-    git checkout ${CRIO_VERSION} && \
-    make && make install PREFIX=/out/ && \
+    git clone https://github.com/cri-o/cri-o $GOPATH/src/github.com/cri-o/cri-o
+
+WORKDIR $GOPATH/src/github.com/cri-o/cri-o
+RUN git checkout ${CRIO_VERSION}
+RUN echo 'replace github.com/containers/image/v5 => github.com/ktock/image/v5 a1e2fff08e19601c260807d5f08c16ace8d18142' >> go.mod
+RUN echo 'replace github.com/containers/storage => github.com/containers/storage 7c30bb9b46a1' >> go.mod
+RUN make vendor && make && make install PREFIX=/out/ && \
     curl -sSL --output /out/crio.service https://raw.githubusercontent.com/cri-o/cri-o/${CRIO_VERSION}/contrib/systemd/crio.service
 
 # Build conmon