diff --git a/tools/jdk/BUILD.tools b/tools/jdk/BUILD.tools
index a8af76e90c23f0..6c869b23375e76 100644
--- a/tools/jdk/BUILD.tools
+++ b/tools/jdk/BUILD.tools
@@ -162,6 +162,7 @@ TARGET_NAMES = [
     "jni_md_header-windows",
     "platformclasspath",
     "remote_jdk11",
+    "remotejdk_17",
     "remote_toolchain",
     "ijar",
     "singlejar",
@@ -169,9 +170,15 @@ TARGET_NAMES = [
 ] + [
     "toolchain_java%d" % version
     for version in (8, 9, 10, 11)
+] + [
+    "toolchain_java%d_definition" % version
+    for version in (8, 9, 10, 11)
 ] + [
     "toolchain_jdk_%d" % version
     for version in (14, 15, 16, 17, 20)
+] + [
+     "toolchain_jdk_%d_definition" % version
+     for version in (14, 15, 16, 17, 20)
 ]
 
 [