diff --git a/Dockerfile.ubi b/Dockerfile.release.ubi
similarity index 100%
rename from Dockerfile.ubi
rename to Dockerfile.release.ubi
diff --git a/docker-buildx-ubi.sh b/docker-buildx-ubi.sh
new file mode 100755
index 000000000..83bab36ac
--- /dev/null
+++ b/docker-buildx-ubi.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+sudo sysctl net.ipv6.conf.wlp59s0.disable_ipv6=1
+
+release=$(git describe --abbrev=0 --tags)
+docker buildx build --push --no-cache -t "minio/minio:${release}-ubi" \
+       --platform=linux/arm64,linux/amd64,linux/ppc64le,linux/s390x \
+       -f Dockerfile.release.ubi .
+
+docker buildx prune -f
+
+sudo sysctl net.ipv6.conf.wlp59s0.disable_ipv6=0
+
diff --git a/docker-buildx.sh b/docker-buildx.sh
index cbbf41398..0ad93e03c 100755
--- a/docker-buildx.sh
+++ b/docker-buildx.sh
@@ -1,17 +1,17 @@
 #!/bin/bash
 
-set -x
-
 sudo sysctl net.ipv6.conf.wlp59s0.disable_ipv6=1
 
 release=$(git describe --abbrev=0 --tags)
-sudo docker buildx build --push --no-cache -t "minio/minio:latest" \
-     --platform=linux/arm,linux/arm64,linux/amd64,linux/ppc64le,linux/s390x \
-     -f Dockerfile.release .
+docker buildx build --push --no-cache -t "minio/minio:latest" \
+       --platform=linux/arm,linux/arm64,linux/amd64,linux/ppc64le,linux/s390x \
+       -f Dockerfile.release .
+
+docker buildx build --push --no-cache -t "minio/minio:${release}" \
+       --platform=linux/arm,linux/arm64,linux/amd64,linux/ppc64le,linux/s390x \
+       -f Dockerfile.release .
 
-sudo docker buildx build --push -t "minio/minio:${release}" \
-     --platform=linux/arm,linux/arm64,linux/amd64,linux/ppc64le,linux/s390x \
-     -f Dockerfile.release .
+docker buildx prune -f
 
 sudo sysctl net.ipv6.conf.wlp59s0.disable_ipv6=0
 
diff --git a/mint/build/minio-java/install.sh b/mint/build/minio-java/install.sh
index 399934d8c..361c36792 100755
--- a/mint/build/minio-java/install.sh
+++ b/mint/build/minio-java/install.sh
@@ -15,6 +15,7 @@
 #  limitations under the License.
 #
 
+SPOTBUGS_VERSION="4.1.2" ## needed since 8.0.2 release
 MINIO_JAVA_VERSION=$(curl --retry 10 -s "https://repo1.maven.org/maven2/io/minio/minio/maven-metadata.xml" | sed -n "/<latest>/{s/<.[^>]*>//g;p;q}" | sed "s/  *//g")
 if [ -z "$MINIO_JAVA_VERSION" ]; then
     echo "unable to get latest minio-java version from maven"
@@ -25,6 +26,7 @@ test_run_dir="$MINT_RUN_CORE_DIR/minio-java"
 git clone --quiet https://github.com/minio/minio-java.git "$test_run_dir/minio-java.git"
 (cd "$test_run_dir/minio-java.git"; git checkout --quiet "tags/${MINIO_JAVA_VERSION}")
 $WGET --output-document="$test_run_dir/minio-${MINIO_JAVA_VERSION}-all.jar" "https://repo1.maven.org/maven2/io/minio/minio/${MINIO_JAVA_VERSION}/minio-${MINIO_JAVA_VERSION}-all.jar"
-javac -cp "$test_run_dir/minio-${MINIO_JAVA_VERSION}-all.jar" "${test_run_dir}/minio-java.git/functional"/*.java
+$WGET --output-document="$test_run_dir/spotbugs-annotations-${SPOTBUGS_VERSION}.jar" "https://repo1.maven.org/maven2/com/github/spotbugs/spotbugs-annotations/${SPOTBUGS_VERSION}/spotbugs-annotations-${SPOTBUGS_VERSION}.jar"
+javac -cp "$test_run_dir/minio-${MINIO_JAVA_VERSION}-all.jar:$test_run_dir/spotbugs-annotations-${SPOTBUGS_VERSION}.jar" "${test_run_dir}/minio-java.git/functional"/*.java
 cp -a "${test_run_dir}/minio-java.git/functional"/*.class "$test_run_dir/"
 rm -fr "$test_run_dir/minio-java.git"