diff --git a/ci-runner/Dockerfile b/ci-runner/Dockerfile
index c33563bb9..4b5a222f0 100644
--- a/ci-runner/Dockerfile
+++ b/ci-runner/Dockerfile
@@ -5,42 +5,40 @@ RUN apk add --no-cache git gcc musl-dev && \
 
 WORKDIR /go/src/github.com/devtron-labs/cirunner
 
-# ADD . /go/src/github.com/devtron-labs/cirunner/
-COPY . .
+ADD . /go/src/github.com/devtron-labs/cirunner/
 
+COPY . .
 # Build the binary
 RUN CGO_ENABLED=0 GOOS=linux go build -buildvcs=false -a -installsuffix cgo -o /go/bin/cirunner
 
-FROM docker:20.10.24-dind
+
+FROM docker:27.3-dind
 # All these steps will be cached
 #RUN apk add --no-cache ca-certificates
 
 RUN apk update && apk add --no-cache --virtual .build-deps && apk add bash && apk add make && apk add curl && apk add git && apk add zip && apk add jq && \
     ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
-    apk -Uuv add groff less python3 py3-pip && \
-    pip3 install awscli==1.38.11 && \
+    apk -Uuv add groff less python3 py3-pip pipx && \
+    pipx ensurepath && pipx install awscli==1.38.11 && \
+    cp /root/.local/bin/aws* /usr/local/bin && \
     apk --purge -v del py-pip && \
     rm /var/cache/apk/*
 
-COPY --from=docker/compose:latest /usr/local/bin/docker-compose /usr/bin/docker-compose
+COPY --from=docker/compose:1.29.2 /usr/local/bin/docker-compose /usr/bin/docker-compose
 
-COPY ./buildpack.json ./git-ask-pass.sh /
-# COPY ./git-ask-pass.sh /git-ask-pass.sh
+COPY ./buildpack.json /git-ask-pass.sh /
 
+# COPY ./git-ask-pass.sh /git-ask-pass.sh
 RUN chmod +x /git-ask-pass.sh && \
     (curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.27.0/pack-v0.27.0-linux.tgz" | tar -C /usr/local/bin/ --no-same-owner -xzv pack)
 
 COPY --from=build-env /go/bin/cirunner .
-
 COPY ./ssh-config /root/.ssh/config
+RUN chmod 644 /root/.ssh/config
 
-RUN chmod 644 /root/.ssh/config && \
-    mkdir -p /etc/docker && \
-    mkdir -p /root/.docker/buildx
-
+RUN mkdir -p /etc/docker
 COPY docker-daemon.json /etc/docker/daemon.json
-
-
+RUN mkdir -p /root/.docker/buildx
 COPY buildkitd.default.toml /root/.docker/buildx/buildkitd.default.toml
 
 # passing PARENT_MODE as argument to cirunner as default behavior
diff --git a/ci-runner/Dockerfile-v27 b/ci-runner/Dockerfile-v20
similarity index 73%
rename from ci-runner/Dockerfile-v27
rename to ci-runner/Dockerfile-v20
index 4b5a222f0..c33563bb9 100644
--- a/ci-runner/Dockerfile-v27
+++ b/ci-runner/Dockerfile-v20
@@ -5,40 +5,42 @@ RUN apk add --no-cache git gcc musl-dev && \
 
 WORKDIR /go/src/github.com/devtron-labs/cirunner
 
-ADD . /go/src/github.com/devtron-labs/cirunner/
-
+# ADD . /go/src/github.com/devtron-labs/cirunner/
 COPY . .
+
 # Build the binary
 RUN CGO_ENABLED=0 GOOS=linux go build -buildvcs=false -a -installsuffix cgo -o /go/bin/cirunner
 
-
-FROM docker:27.3-dind
+FROM docker:20.10.24-dind
 # All these steps will be cached
 #RUN apk add --no-cache ca-certificates
 
 RUN apk update && apk add --no-cache --virtual .build-deps && apk add bash && apk add make && apk add curl && apk add git && apk add zip && apk add jq && \
     ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
-    apk -Uuv add groff less python3 py3-pip pipx && \
-    pipx ensurepath && pipx install awscli==1.38.11 && \
-    cp /root/.local/bin/aws* /usr/local/bin && \
+    apk -Uuv add groff less python3 py3-pip && \
+    pip3 install awscli==1.38.11 && \
     apk --purge -v del py-pip && \
     rm /var/cache/apk/*
 
-COPY --from=docker/compose:1.29.2 /usr/local/bin/docker-compose /usr/bin/docker-compose
-
-COPY ./buildpack.json /git-ask-pass.sh /
+COPY --from=docker/compose:latest /usr/local/bin/docker-compose /usr/bin/docker-compose
 
+COPY ./buildpack.json ./git-ask-pass.sh /
 # COPY ./git-ask-pass.sh /git-ask-pass.sh
+
 RUN chmod +x /git-ask-pass.sh && \
     (curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.27.0/pack-v0.27.0-linux.tgz" | tar -C /usr/local/bin/ --no-same-owner -xzv pack)
 
 COPY --from=build-env /go/bin/cirunner .
+
 COPY ./ssh-config /root/.ssh/config
-RUN chmod 644 /root/.ssh/config
 
-RUN mkdir -p /etc/docker
+RUN chmod 644 /root/.ssh/config && \
+    mkdir -p /etc/docker && \
+    mkdir -p /root/.docker/buildx
+
 COPY docker-daemon.json /etc/docker/daemon.json
-RUN mkdir -p /root/.docker/buildx
+
+
 COPY buildkitd.default.toml /root/.docker/buildx/buildkitd.default.toml
 
 # passing PARENT_MODE as argument to cirunner as default behavior