diff --git a/MODULE.bazel b/MODULE.bazel
index f4354ac..087ca9b 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -1,6 +1,6 @@
 module(
     name = "rules_java",
-    version = "8.5.0-rc1",
+    version = "8.5.0-rc2",
     bazel_compatibility = [">=6.3.0"],
     compatibility_level = 1,
 )
diff --git a/distro/relnotes.bzl b/distro/relnotes.bzl
index 6cee2e3..4200e04 100644
--- a/distro/relnotes.bzl
+++ b/distro/relnotes.bzl
@@ -9,7 +9,7 @@
               changelog=$$(/usr/bin/git log tags/$$last_rel..origin/master --format=oneline --)
               sha=$$(/usr/bin/sha256sum $(SRCS) | cut -d ' '  -f1)
               cat > $@ <<EOF
-**Changes since $$last_rel
+**Changes since $$last_rel**
 $$changelog
 
 **MODULE.bazel setup**
diff --git a/java/common/BUILD b/java/common/BUILD
index 62e47db..ef669cc 100644
--- a/java/common/BUILD
+++ b/java/common/BUILD
@@ -16,7 +16,10 @@
     name = "common",
     srcs = glob(["*.bzl"]),
     visibility = ["//visibility:public"],
-    deps = ["//java/private:internals"],
+    deps = [
+        "//java/private:internals",
+        "@compatibility_proxy//:proxy_bzl",
+    ],
 )
 
 filegroup(
diff --git a/java/rules_java_deps.bzl b/java/rules_java_deps.bzl
index 5520ba1..8ed5857 100644
--- a/java/rules_java_deps.bzl
+++ b/java/rules_java_deps.bzl
@@ -6,22 +6,28 @@
 def _compatibility_proxy_repo_impl(rctx):
     # TODO: use @bazel_features
     bazel = native.bazel_version
-    rctx.file("BUILD.bazel", "")
+    rctx.file(
+        "BUILD.bazel",
+        """
+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+bzl_library(name = "proxy_bzl", srcs = ["proxy.bzl"], visibility = ["//visibility:public"])
+        """,
+    )
     if not bazel or bazel >= "8":
         rctx.file(
             "proxy.bzl",
             """
-load("@rules_java//java/bazel/rules:bazel_java_binary_wrapper.bzl", _java_binary = "java_binary") # copybara-use-repo-external-label
-load("@rules_java//java/bazel/rules:bazel_java_import.bzl", _java_import = "java_import") # copybara-use-repo-external-label
-load("@rules_java//java/bazel/rules:bazel_java_library.bzl", _java_library = "java_library") # copybara-use-repo-external-label
-load("@rules_java//java/bazel/rules:bazel_java_plugin.bzl", _java_plugin = "java_plugin") # copybara-use-repo-external-label
-load("@rules_java//java/bazel/rules:bazel_java_test.bzl", _java_test = "java_test") # copybara-use-repo-external-label
-load("@rules_java//java/common/rules:java_package_configuration.bzl", _java_package_configuration = "java_package_configuration") # copybara-use-repo-external-label
-load("@rules_java//java/common/rules:java_runtime.bzl", _java_runtime = "java_runtime") # copybara-use-repo-external-label
-load("@rules_java//java/common/rules:java_toolchain.bzl", _java_toolchain = "java_toolchain") # copybara-use-repo-external-label
-load("@rules_java//java/private:java_common.bzl", _java_common = "java_common") # copybara-use-repo-external-label
-load("@rules_java//java/private:java_info.bzl", _JavaInfo = "JavaInfo", _JavaPluginInfo = "JavaPluginInfo") # copybara-use-repo-external-label
-load("@rules_java//java:http_jar.bzl", _http_jar = "http_jar") # copybara-use-repo-external-label
+load("@rules_java//java/bazel/rules:bazel_java_binary_wrapper.bzl", _java_binary = "java_binary")
+load("@rules_java//java/bazel/rules:bazel_java_import.bzl", _java_import = "java_import")
+load("@rules_java//java/bazel/rules:bazel_java_library.bzl", _java_library = "java_library")
+load("@rules_java//java/bazel/rules:bazel_java_plugin.bzl", _java_plugin = "java_plugin")
+load("@rules_java//java/bazel/rules:bazel_java_test.bzl", _java_test = "java_test")
+load("@rules_java//java/common/rules:java_package_configuration.bzl", _java_package_configuration = "java_package_configuration")
+load("@rules_java//java/common/rules:java_runtime.bzl", _java_runtime = "java_runtime")
+load("@rules_java//java/common/rules:java_toolchain.bzl", _java_toolchain = "java_toolchain")
+load("@rules_java//java/private:java_common.bzl", _java_common = "java_common")
+load("@rules_java//java/private:java_info.bzl", _JavaInfo = "JavaInfo", _JavaPluginInfo = "JavaPluginInfo")
+load("@rules_java//java:http_jar.bzl", _http_jar = "http_jar")
 
 java_binary = _java_binary
 java_import = _java_import
@@ -43,7 +49,7 @@
             "proxy.bzl",
             """
 load("@bazel_tools//tools/build_defs/repo:http.bzl", _http_jar = "http_jar")
-load("@rules_java//java/private:native.bzl", "native_java_common", "NativeJavaInfo", "NativeJavaPluginInfo") # copybara-use-repo-external-label
+load("@rules_java//java/private:native.bzl", "native_java_common", "NativeJavaInfo", "NativeJavaPluginInfo")
 
 java_binary = native.java_binary
 java_import = native.java_import
diff --git a/java/toolchains/BUILD b/java/toolchains/BUILD
index 6b0fa91..adcd09a 100644
--- a/java/toolchains/BUILD
+++ b/java/toolchains/BUILD
@@ -14,7 +14,10 @@
     name = "toolchain_rules",
     srcs = glob(["*.bzl"]),
     visibility = ["//visibility:public"],
-    deps = ["//java/private:native_bzl"],
+    deps = [
+        "//java/private:native_bzl",
+        "@compatibility_proxy//:proxy_bzl",
+    ],
 )
 
 filegroup(