diff --git a/MODULE.bazel b/MODULE.bazel
index 62c41a795..dc122a102 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -6,7 +6,7 @@ bazel_dep(name = "rules_jvm_external", version = "7.0")
 bazel_dep(name = "aspect_rules_lint", version = "2.5.2")
 bazel_dep(name = "buildifier_prebuilt", version = "8.5.1.2")
 
-BAZEL_TOOLING_VERSION = "4bcf42cc81b574b91699d696b504637677640871"
+BAZEL_TOOLING_VERSION = "fbdfc66995360c408ecf94d34837a0355aa7ac4d"
 
 git_override(
     module_name = "bazel_tooling",
diff --git a/bazel/scala.bzl b/bazel/scala.bzl
index 00a561066..78a489705 100644
--- a/bazel/scala.bzl
+++ b/bazel/scala.bzl
@@ -11,6 +11,14 @@ _rules = make_scala_rules(
         "-deprecation",
         "-Wconf:msg=Implicit parameters should be provided with a `using` clause:s",
     ],
+    # Applies to the Java sources of mixed Java/Scala targets which rules_scala
+    # compiles in a separate Javac action that does not see the javacopts from
+    # bazel/java.bzl. Keep in sync with java_common_opts there.
+    common_javacopts = [
+        "--release",
+        "17",
+        "-XepDisableAllChecks",
+    ],
     common_scala_binary_runtime_deps = [],
     common_scala_test_runtime_deps = [],
 )