diff --git a/chroot_version_hooks.d/180_select_jvm b/chroot_version_hooks.d/180_select_jvm
new file mode 100644
index 0000000..e76d71c
--- /dev/null
+++ b/chroot_version_hooks.d/180_select_jvm
@@ -0,0 +1,15 @@
+# Copyright 2020 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Specify JDK as openjdk-bin-11 upon entering chroot.
+# See crrev.com/c/2335921 for more details.
+
+# Make sure dependencies are installed for older SDKs.
+sudo emerge -qug '>=virtual/jdk-9'
+
+sudo eselect java-vm set system openjdk-bin-11
+
+# Log current state for debugging issues.
+eselect java-vm list
+whereis java
diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh
index 037b190..3af93b3 100755
--- a/sdk_lib/make_chroot.sh
+++ b/sdk_lib/make_chroot.sh
@@ -626,7 +626,7 @@
 
 # The java-config package atm does not support $ROOT.  Select a default
 # VM ourselves until that gets fixed upstream.
-enter_chroot sudo java-config --set-system-vm 1
+enter_chroot sudo eselect java-vm set system openjdk-bin-11
 
 CHROOT_EXAMPLE_OPT=""
 if [[ "$FLAGS_chroot" != "$DEFAULT_CHROOT_DIR" ]]; then