diff --git a/Dockerfile.cicd b/Dockerfile.cicd
index 118ab0329..3c7d18969 100644
--- a/Dockerfile.cicd
+++ b/Dockerfile.cicd
@@ -1,3 +1,3 @@
-FROM minio/minio:edge
+FROM minio/minio:latest
 
 CMD ["minio", "server", "/data"]
diff --git a/docker-buildx.sh b/docker-buildx.sh
index d77dd6186..c862f2b93 100755
--- a/docker-buildx.sh
+++ b/docker-buildx.sh
@@ -4,8 +4,8 @@ sudo sysctl net.ipv6.conf.all.disable_ipv6=0
 
 remote=$(git remote get-url upstream)
 if test "$remote" != "git@github.com:minio/minio.git"; then
-	echo "Script requires that the 'upstream' remote is set to git@github.com:minio/minio.git"
-	exit 1
+  echo "Script requires that the 'upstream' remote is set to git@github.com:minio/minio.git"
+  exit 1
 fi
 
 git remote update upstream && git checkout master && git rebase upstream/master
@@ -13,24 +13,29 @@ git remote update upstream && git checkout master && git rebase upstream/master
 release=$(git describe --abbrev=0 --tags)
 
 docker buildx build --push --no-cache \
-	--build-arg RELEASE="${release}" \
-	-t "minio/minio:latest" \
-	-t "minio/minio:latest-cicd" \
-	-t "quay.io/minio/minio:latest" \
-	-t "quay.io/minio/minio:latest-cicd" \
-	-t "minio/minio:${release}" \
-	-t "quay.io/minio/minio:${release}" \
-	--platform=linux/arm64,linux/amd64,linux/ppc64le \
-	-f Dockerfile.release .
+    --build-arg RELEASE="${release}" \
+    -t "minio/minio:latest" \
+    -t "quay.io/minio/minio:latest" \
+    -t "minio/minio:${release}" \
+    -t "quay.io/minio/minio:${release}" \
+    --platform=linux/arm64,linux/amd64,linux/ppc64le \
+    -f Dockerfile.release .
+
+docker buildx build --push --no-cache \
+    --build-arg RELEASE="${release}" \
+    -t "minio/minio:latest-cicd" \
+    -t "quay.io/minio/minio:latest-cicd" \
+    --platform=linux/arm64,linux/amd64,linux/ppc64le \
+    -f Dockerfile.cicd .
 
 docker buildx prune -f
 
 docker buildx build --push --no-cache \
-	--build-arg RELEASE="${release}" \
-	-t "minio/minio:${release}-cpuv1" \
-	-t "quay.io/minio/minio:${release}-cpuv1" \
-	--platform=linux/arm64,linux/amd64,linux/ppc64le \
-	-f Dockerfile.release.old_cpu .
+    --build-arg RELEASE="${release}" \
+    -t "minio/minio:${release}-cpuv1" \
+    -t "quay.io/minio/minio:${release}-cpuv1" \
+    --platform=linux/arm64,linux/amd64,linux/ppc64le \
+    -f Dockerfile.release.old_cpu .
 
 docker buildx prune -f