diff --git a/testing/bazel4/APKBUILD b/testing/bazel4/APKBUILD
index 92b2d45966ba6c7b9f4b8d826395b461ff6f97a9..cc285eac50a52fec8e4a0194cf090e33f08430bb 100644
--- a/testing/bazel4/APKBUILD
+++ b/testing/bazel4/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Jesse Chan <jc@linux.com>
 pkgname=bazel4
 pkgver=4.2.2
-pkgrel=0
+pkgrel=1
 pkgdesc="A fast, scalable, multi-language and extensible build system"
 url="https://bazel.build/"
 arch="all"
@@ -38,6 +38,10 @@ source="https://github.com/bazelbuild/bazel/releases/download/$pkgver/bazel-$pkg
 build() {
 	export JAVA_HOME="/usr/lib/jvm/default-jvm"
 
+	# Target Java version (minimum to run)
+	# should be the same as the upstream
+	export JAVA_VERSION="1.8"
+
 	# horrible of horribles, just to have python in the PATH
 	# https://github.com/bazelbuild/bazel/issues/8665
 	mkdir -p ./bin-hack
@@ -68,6 +72,7 @@ build() {
 		--stamp \
 		--embed_label $pkgver \
 		--distdir=derived/distdir \
+		--javacopt="-source $JAVA_VERSION -target $JAVA_VERSION" \
 		$EXTRA_BAZEL_ARGS \
 		//scripts/packages:without-jdk/install.sh
 	env HOME="$(pwd)/tmphome-stage2" ./output/bazel shutdown
@@ -134,5 +139,5 @@ e9d6e4642a25ce5323ba00e75172238fe52dc31e39ac91e97b5aae6deb9661c5426d763584e1b1b9
 a001b7fe0bc7b34a6aab73e7f88a2f52dc5e67fcf3dda15bc06a6a8709b6ffa8883f705eb22ef83705fe70dfdbef64c5ff8ba762ffb526366b033375501e05e9  patch_ftbfs_gcc11_3.patch
 b83b73b5ea7a2fc99d13567f881dcfac3f242510ab429e33fe4347024fb9fbbd464fb7ef7ee4d380452b17c459d84494f993ba134db65c13f2a27ae475a5d8cc  patch_ftbfs_gcc11_4.patch
 750c4ba2f41d61321db36c1d1154744e90d1b0f9ea39c75582edbdc28d16df2cee9c85fc4831114a414b6db8dba7b16d17b272b55a0308ac23a06242fc0c31db  patch_ftbfs_gcc11_5.patch
-44a942c842688e53a431994e2cd7070d72a757fde1c45d44f3c0b349fd050692f0cac11f8b72fcf10cd944753a0ebc2038053a359ac7a1676125cc8107f04144  patch_remove_illegal_reflective.patch
+47377bb1866d95c84e7e5a8709a3d95d424371697385a2e7cb9e2e1f8c50cf4e3e76dcc15eec0303466d999da24faf1682f858010c574a2373f1f077b4691426  patch_remove_illegal_reflective.patch
 "
diff --git a/testing/bazel4/patch_remove_illegal_reflective.patch b/testing/bazel4/patch_remove_illegal_reflective.patch
index ab5453fefcf3840ed40c264fc62312924dec26fe..1297133b67cf1fcdeb485c7e5b174466ce60425d 100644
--- a/testing/bazel4/patch_remove_illegal_reflective.patch
+++ b/testing/bazel4/patch_remove_illegal_reflective.patch
@@ -1,6 +1,6 @@
 --- a/src/main/cpp/blaze.cc
 +++ b/src/main/cpp/blaze.cc
-@@ -360,13 +360,10 @@ static vector<string> GetServerExeArgs(const blaze_util::Path &jvm_path,
+@@ -360,13 +360,6 @@ static vector<string> GetServerExeArgs(const blaze_util::Path &jvm_path,
    result.push_back("-XX:HeapDumpPath=" +
                     startup_options.output_base.AsJvmArgument());
  
@@ -11,10 +11,6 @@
 -    result.push_back("--add-opens=java.base/java.nio=ALL-UNNAMED");
 -    result.push_back("--add-opens=java.base/java.lang=ALL-UNNAMED");
 -  }
-+  // quiet warnings from com.google.protobuf.UnsafeUtil,
-+  // see: https://github.com/google/protobuf/issues/3781
-+  result.push_back("--add-opens=java.base/java.nio=ALL-UNNAMED");
-+  result.push_back("--add-opens=java.base/java.lang=ALL-UNNAMED");
  
    vector<string> user_options = startup_options.host_jvm_args;