diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 9b895a02b6..92c793d088 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -48,16 +48,16 @@ tasks:
     platform: windows
     shell_commands:
     - "bash test_rules_scala.sh"
-  test_coverage_linux_7_1_2:
+  test_coverage_linux_7_2_1:
     name: "./test_coverage"
     platform: ubuntu2004
-    bazel: 7.1.2
+    bazel: 7.2.1
     shell_commands:
       - "./test_coverage.sh"
-  test_coverage_macos_7.1.2:
+  test_coverage_macos_7.2.1:
     name: "./test_coverage"
     platform: macos
-    bazel: 7.1.2
+    bazel: 7.2.1
     shell_commands:
       - "./test_coverage.sh"
   test_reproducibility_linux:
@@ -83,13 +83,13 @@ tasks:
   examples_linux:
     name: "./test_examples"
     platform: ubuntu2004
-    bazel: 7.1.2
+    bazel: 7.2.1
     shell_commands:
       - "./test_examples.sh"
   cross_build_linux:
     name: "./test_cross_build"
     platform: ubuntu2004
-    bazel: 7.1.2
+    bazel: 7.2.1
     shell_commands:
       - "./test_cross_build.sh"
   lint_linux:
diff --git a/.bazelversion b/.bazelversion
index a8a1887568..b26a34e470 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-7.1.2
+7.2.1
diff --git a/WORKSPACE b/WORKSPACE
index 8dbb66defb..08eb52097f 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -155,19 +155,6 @@ go_rules_dependencies()
 
 go_register_toolchains(version = "1.19.5")
 
-# Explicitly pull in a different (newer) version of rules_java for remote jdks
-rules_java_extra_version = "5.1.0"
-
-rules_java_extra_sha = "d974a2d6e1a534856d1b60ad6a15e57f3970d8596fbb0bb17b9ee26ca209332a"
-
-rules_java_extra_url = "https://github.com/bazelbuild/rules_java/releases/download/{}/rules_java-{}.tar.gz".format(rules_java_extra_version, rules_java_extra_version)
-
-http_archive(
-    name = "rules_java_extra",
-    sha256 = rules_java_extra_sha,
-    url = rules_java_extra_url,
-)
-
 load("@rules_java//java:repositories.bzl", "remote_jdk8_repos")
 
 # We need to select based on platform when we use these
diff --git a/scala/private/macros/scala_repositories.bzl b/scala/private/macros/scala_repositories.bzl
index e11f199d5d..204fd56298 100644
--- a/scala/private/macros/scala_repositories.bzl
+++ b/scala/private/macros/scala_repositories.bzl
@@ -104,9 +104,9 @@ def rules_scala_setup(scala_compiler_srcjar = None):
         http_archive(
             name = "rules_java",
             urls = [
-                "https://github.com/bazelbuild/rules_java/releases/download/5.4.1/rules_java-5.4.1.tar.gz",
+                "https://github.com/bazelbuild/rules_java/releases/download/7.9.0/rules_java-7.9.0.tar.gz",
             ],
-            sha256 = "a1f82b730b9c6395d3653032bd7e3a660f9d5ddb1099f427c1e1fe768f92e395",
+            sha256 = "41131de4417de70b9597e6ebd515168ed0ba843a325dc54a81b92d7af9a7b3ea",
         )
 
     if not native.existing_rule("rules_proto"):
diff --git a/test/shell/test_scala_library.sh b/test/shell/test_scala_library.sh
index 0ae758a466..ec43e1e7db 100755
--- a/test/shell/test_scala_library.sh
+++ b/test/shell/test_scala_library.sh
@@ -59,14 +59,14 @@ test_scala_library_expect_failure_on_missing_direct_internal_deps() {
 }
 
 test_scala_library_expect_failure_on_missing_direct_external_deps_jar() {
-  dependenecy_target='@@com_google_guava_guava_21_0//:com_google_guava_guava_21_0'
+  dependenecy_target='@com_google_guava_guava_21_0//:com_google_guava_guava_21_0'
   test_target='test_expect_failure/missing_direct_deps/external_deps:transitive_external_dependency_user'
 
   test_scala_library_expect_failure_on_missing_direct_deps $dependenecy_target $test_target
 }
 
 test_scala_library_expect_failure_on_missing_direct_external_deps_file_group() {
-  dependenecy_target='@@com_google_guava_guava_21_0_with_file//:com_google_guava_guava_21_0_with_file'
+  dependenecy_target='@com_google_guava_guava_21_0_with_file//:com_google_guava_guava_21_0_with_file'
   test_target='test_expect_failure/missing_direct_deps/external_deps:transitive_external_dependency_user_file_group'
 
   test_scala_library_expect_failure_on_missing_direct_deps $dependenecy_target $test_target
diff --git a/test/shell/test_strict_dependency.sh b/test/shell/test_strict_dependency.sh
index 2c331c5f18..01a0d40295 100755
--- a/test/shell/test_strict_dependency.sh
+++ b/test/shell/test_strict_dependency.sh
@@ -44,7 +44,7 @@ test_plus_one_ast_analyzer_strict_deps() {
 
 test_stamped_target_label_loading() {
   local test_target="//test_expect_failure/missing_direct_deps/external_deps:java_lib_with_a_transitive_external_dep"
-  local expected_message="buildozer 'add deps @@io_bazel_rules_scala_guava//:io_bazel_rules_scala_guava' ${test_target}"
+  local expected_message="buildozer 'add deps @io_bazel_rules_scala_guava//:io_bazel_rules_scala_guava' ${test_target}"
 
   test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message \
     "${expected_message}" ${test_target} \
@@ -59,7 +59,7 @@ test_strict_deps_filter_excluded_target() {
 
 test_strict_deps_filter_included_target() {
   local test_target="//test_expect_failure/missing_direct_deps/filtering:b"
-  local expected_message="buildozer 'add deps @@com_google_guava_guava_21_0//:com_google_guava_guava_21_0' ${test_target}"
+  local expected_message="buildozer 'add deps @com_google_guava_guava_21_0//:com_google_guava_guava_21_0' ${test_target}"
 
   test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message \
     "${expected_message}" ${test_target} \
diff --git a/test/shell/test_unused_dependency.sh b/test/shell/test_unused_dependency.sh
index 4224b42a6d..815968fc8f 100755
--- a/test/shell/test_unused_dependency.sh
+++ b/test/shell/test_unused_dependency.sh
@@ -79,7 +79,7 @@ test_unused_deps_filter_excluded_target() {
 
 test_unused_deps_filter_included_target() {
   local test_target="//test_expect_failure/unused_dependency_checker/filtering:b"
-  local expected_message="buildozer 'remove deps @@com_google_guava_guava_21_0//:com_google_guava_guava_21_0' ${test_target}"
+  local expected_message="buildozer 'remove deps @com_google_guava_guava_21_0//:com_google_guava_guava_21_0' ${test_target}"
 
   test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message \
     "${expected_message}" ${test_target} \