diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
index 18d838404b5..7d07aedfad8 100644
--- a/.github/workflows/e2e-test.yml
+++ b/.github/workflows/e2e-test.yml
@@ -53,6 +53,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
       - name: Build KServe images
         run: |
           sudo mkdir -p ${DOCKER_IMAGES_PATH}
diff --git a/test/scripts/gh-actions/build-images.sh b/test/scripts/gh-actions/build-images.sh
index 9e6398d4412..f2070d8ac2f 100755
--- a/test/scripts/gh-actions/build-images.sh
+++ b/test/scripts/gh-actions/build-images.sh
@@ -29,21 +29,25 @@ AGENT_IMG_TAG=${DOCKER_REPO}/${AGENT_IMG}:${GITHUB_SHA}
 ROUTER_IMG_TAG=${DOCKER_REPO}/${ROUTER_IMG}:${GITHUB_SHA}
 
 echo "Building Kserve controller image"
-docker buildx build . -t "${CONTROLLER_IMG_TAG}"
-docker image save -o "${DOCKER_IMAGES_PATH}/${CONTROLLER_IMG}-${GITHUB_SHA}" "${CONTROLLER_IMG_TAG}"
+docker buildx build . -t "${CONTROLLER_IMG_TAG}" -o type=docker,dest="${DOCKER_IMAGES_PATH}/${CONTROLLER_IMG}-${GITHUB_SHA}",compression-level=0
+#docker buildx build . -t "${CONTROLLER_IMG_TAG}"
+#docker image save -o "${DOCKER_IMAGES_PATH}/${CONTROLLER_IMG}-${GITHUB_SHA}" "${CONTROLLER_IMG_TAG}"
 
 echo "Building agent image"
-docker buildx build -f agent.Dockerfile . -t "${AGENT_IMG_TAG}"
-docker image save -o "${DOCKER_IMAGES_PATH}/${AGENT_IMG}-${GITHUB_SHA}" "${AGENT_IMG_TAG}"
+docker buildx build -f agent.Dockerfile . -t "${AGENT_IMG_TAG}" -o type=docker,dest="${DOCKER_IMAGES_PATH}/${AGENT_IMG}-${GITHUB_SHA}",compression-level=0
+#docker buildx build -f agent.Dockerfile . -t "${AGENT_IMG_TAG}"
+#docker image save -o "${DOCKER_IMAGES_PATH}/${AGENT_IMG}-${GITHUB_SHA}" "${AGENT_IMG_TAG}"
 
 echo "Building router image"
-docker buildx build -f router.Dockerfile . -t "${ROUTER_IMG_TAG}"
-docker image save -o "${DOCKER_IMAGES_PATH}/${ROUTER_IMG}-${GITHUB_SHA}" "${ROUTER_IMG_TAG}"
+docker buildx build -f router.Dockerfile . -t "${ROUTER_IMG_TAG}" -o type=docker,dest="${DOCKER_IMAGES_PATH}/${ROUTER_IMG}-${GITHUB_SHA}",compression-level=0
+#docker buildx build -f router.Dockerfile . -t "${ROUTER_IMG_TAG}"
+#docker image save -o "${DOCKER_IMAGES_PATH}/${ROUTER_IMG}-${GITHUB_SHA}" "${ROUTER_IMG_TAG}"
 
 pushd python >/dev/null
   echo "Building storage initializer"
-  docker buildx build -t "${STORAGE_INIT_IMG_TAG}" -f storage-initializer.Dockerfile .
-  docker image save -o "${DOCKER_IMAGES_PATH}/${STORAGE_INIT_IMG}-${GITHUB_SHA}" "${STORAGE_INIT_IMG_TAG}"
+  docker buildx build -f storage-initializer.Dockerfile . -t "${STORAGE_INIT_IMG_TAG}" -o type=docker,dest="${DOCKER_IMAGES_PATH}/${STORAGE_INIT_IMG}-${GITHUB_SHA}",compression-level=0
+#  docker buildx build -t "${STORAGE_INIT_IMG_TAG}" -f storage-initializer.Dockerfile .
+#  docker image save -o "${DOCKER_IMAGES_PATH}/${STORAGE_INIT_IMG}-${GITHUB_SHA}" "${STORAGE_INIT_IMG_TAG}"
 popd
 
 echo "Done building images"