diff --git a/Dockerfile b/Dockerfile
index bbaff927dd074..1f53a3d8ad8d4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@
 # thrift
 # maven
 # java8
-FROM apachehudi/hudi-ci-bundle-validation-base:azure_ci_test_base_java11
+FROM apachehudi/hudi-ci-bundle-validation-base:azure_ci_test_base_java11_v2
 
 CMD ["java", "-version"]
 
diff --git a/packaging/bundle-validation/azure/Dockerfile b/packaging/bundle-validation/azure/Dockerfile
index d183caad28461..56c98b245f159 100644
--- a/packaging/bundle-validation/azure/Dockerfile
+++ b/packaging/bundle-validation/azure/Dockerfile
@@ -14,9 +14,9 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-FROM --platform=linux/amd64 adoptopenjdk/openjdk11:alpine
+FROM --platform=linux/amd64 maven:3.9-eclipse-temurin-11-alpine
 
-RUN apk add --no-cache --upgrade bash curl jq git maven
+RUN apk add --no-cache --upgrade bash curl jq git
 
 # Install thrift 0.13.0 from source (compiler only, skip library)
 RUN apk add --no-cache libstdc++ \
diff --git a/packaging/bundle-validation/azure/build.sh b/packaging/bundle-validation/azure/build.sh
index 89bd7c63da12b..e7aecce3972e1 100755
--- a/packaging/bundle-validation/azure/build.sh
+++ b/packaging/bundle-validation/azure/build.sh
@@ -17,5 +17,5 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-docker build -t hudi-ci-bundle-validation-base:azure_ci_test_base_java11 .
-docker image tag hudi-ci-bundle-validation-base:azure_ci_test_base_java11 apachehudi/hudi-ci-bundle-validation-base:azure_ci_test_base_java11
+docker build -t hudi-ci-bundle-validation-base:azure_ci_test_base_java11_v2 .
+docker image tag hudi-ci-bundle-validation-base:azure_ci_test_base_java11_v2 apachehudi/hudi-ci-bundle-validation-base:azure_ci_test_base_java11_v2