diff --git a/.bazelci/examples.yml b/.bazelci/examples.yml
index 638d13360..1a7e49280 100644
--- a/.bazelci/examples.yml
+++ b/.bazelci/examples.yml
@@ -2,13 +2,13 @@
 tasks:
   android-kotlin-linux:
     name: "Android Kotlin example"
-    platform: ubuntu1804
+    platform: ubuntu2204
     working_directory: examples/android_kotlin_app
     build_targets:
       - "//:app"
   android-kotlin-macos:
     name: "Android Kotlin example"
-    platform: macos
+    platform: macos_arm64
     working_directory: examples/android_kotlin_app
     build_targets:
       - "//:app"
@@ -20,13 +20,13 @@ tasks:
       - "//:app"
   android-local-test-linux:
     name: "Android Robolectric test example"
-    platform: ubuntu1804
+    platform: ubuntu2204
     working_directory: examples/android_local_test
     test_targets:
       - "//..."
   android-local-test-macos:
     name: "Android Robolectric test example"
-    platform: macos
+    platform: macos_arm64
     working_directory: examples/android_local_test
     test_targets:
       - "//..."
@@ -38,13 +38,13 @@ tasks:
       - "//..."
   bzlmod-linux:
     name: "bzlmod example"
-    platform: ubuntu1804
+    platform: ubuntu2204
     working_directory: examples/bzlmod
     build_targets:
       - "//..."
   bzlmod-macos:
     name: "bzlmod example"
-    platform: macos
+    platform: macos_arm64
     working_directory: examples/bzlmod
     build_targets:
       - "//..."
@@ -56,13 +56,13 @@ tasks:
       - "//..."
   java-export-linux:
     name: "java-export example"
-    platform: ubuntu1804
+    platform: ubuntu2204
     working_directory: examples/java-export
     build_targets:
       - "//..."
   java-export-macos:
     name: "java-export example"
-    platform: macos
+    platform: macos_arm64
     working_directory: examples/java-export
     build_targets:
       - "//..."
@@ -74,7 +74,7 @@ tasks:
       - "//..."
   kotlin-android-local-test-linux:
     name: "Kotlin Android Robolectric test example"
-    platform: ubuntu1804
+    platform: ubuntu2204
     working_directory: examples/kt_android_local_test
     test_targets:
       - "//..."
@@ -92,13 +92,13 @@ tasks:
       - "//..."
   kotlin-jvm-export-linux:
     name: "kt_jvm_export example"
-    platform: ubuntu1804
+    platform: ubuntu2204
     working_directory: examples/kt_jvm_export
     build_targets:
       - "//..."
   kotlin-jvm-export-macos:
     name: "kt_jvm_export example"
-    platform: macos
+    platform: macos_arm64
     working_directory: examples/kt_jvm_export
     build_targets:
       - "//..."
@@ -112,13 +112,13 @@ tasks:
   #      - "//..."
   pom-file-generation-linux:
     name: "POM file generation example"
-    platform: ubuntu1804
+    platform: ubuntu2204
     working_directory: examples/pom_file_generation
     build_targets:
       - "//..."
   pom-file-generation-macos:
     name: "POM file generation example"
-    platform: macos
+    platform: macos_arm64
     working_directory: examples/pom_file_generation
     build_targets:
       - "//..."
@@ -130,13 +130,13 @@ tasks:
       - "//..."
   protobuf-java-linux:
     name: "Protobuf Java example"
-    platform: ubuntu1804
+    platform: ubuntu2204
     working_directory: examples/protobuf-java
     test_targets:
       - "//..."
   protobuf-java-macos:
     name: "Protobuf Java example"
-    platform: macos
+    platform: macos_arm64
     working_directory: examples/protobuf-java
     test_targets:
       - "//..."
@@ -150,7 +150,7 @@ tasks:
       - "//..."
   scala-akka-linux:
     name: "Scala example"
-    platform: ubuntu1804
+    platform: ubuntu2204
     working_directory: examples/scala_akka
     build_targets:
       - "//..."
@@ -158,7 +158,7 @@ tasks:
       - "//..."
   scala-akka-macos:
     name: "Scala example"
-    platform: macos
+    platform: macos_arm64
     working_directory: examples/scala_akka
     build_targets:
       - "//..."
@@ -175,7 +175,7 @@ tasks:
     # - "//..."
   simple-linux:
     name: "Simple example"
-    platform: ubuntu1804
+    platform: ubuntu2204
     working_directory: examples/simple
     shell_command:
       - "bazel run @maven//:pin"
@@ -183,7 +183,7 @@ tasks:
       - "//..."
   simple-macos:
     name: "Simple example"
-    platform: macos
+    platform: macos_arm64
     working_directory: examples/simple
     shell_command:
       - "bazel run @maven//:pin"
@@ -197,7 +197,7 @@ tasks:
       - "//..."
   spring-boot-linux:
     name: "Spring boot example"
-    platform: ubuntu1804
+    platform: ubuntu2204
     working_directory: examples/spring_boot
     build_targets:
       - "//..."
@@ -205,7 +205,7 @@ tasks:
       - "//..."
   spring-boot-macos:
     name: "Spring boot example"
-    platform: macos
+    platform: macos_arm64
     working_directory: examples/spring_boot
     build_targets:
       - "//..."
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index c69362066..ac559866b 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -67,7 +67,7 @@ tasks:
     test_targets:
       - "--"
       - "//..."
-  macos:
+  macos_arm64:
     environment:
       # This tests custom cache locations.
       # https://github.com/bazelbuild/rules_jvm_external/pull/316
diff --git a/private/rules/coursier.bzl b/private/rules/coursier.bzl
index 3d74e635d..e002d1465 100644
--- a/private/rules/coursier.bzl
+++ b/private/rules/coursier.bzl
@@ -1014,7 +1014,7 @@ def filter_dependencies_if_necessary(repository_ctx, dep_tree):
                 if _is_verbose(repository_ctx):
                     print("Removing source artifact with no file: %s" % dep["coord"])
             else:
-              amended_deps.append(dep)
+                amended_deps.append(dep)
             continue
 
         # You'd think we could use skylib here to do the heavy lifting, but
diff --git a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/BUILD.bazel b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/BUILD.bazel
index 0974c0e02..af0442b71 100644
--- a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/BUILD.bazel
+++ b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_java//java:java_binary.bzl", "java_binary")
 load("@rules_jvm_external//:defs.bzl", "artifact")
 
 java_library(
diff --git a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/maven/BUILD b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/maven/BUILD
index d23974aac..5a5caf210 100644
--- a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/maven/BUILD
+++ b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/maven/BUILD
@@ -1,4 +1,5 @@
 load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_java//java:java_binary.bzl", "java_binary")
 load("@rules_jvm_external//:defs.bzl", "artifact")
 
 java_library(
diff --git a/scripts/BUILD b/scripts/BUILD
index bb26c864d..221404e66 100644
--- a/scripts/BUILD
+++ b/scripts/BUILD
@@ -1,4 +1,5 @@
 load("@rules_java//java:defs.bzl", "java_binary")
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 load("//private:versions.bzl", "COURSIER_CLI_HTTP_FILE_NAME")
 load("//private/rules:artifact.bzl", "artifact")
 
diff --git a/tests/integration/duplicates_in_java_export/BUILD b/tests/integration/duplicates_in_java_export/BUILD
index 778166f55..07717f53a 100644
--- a/tests/integration/duplicates_in_java_export/BUILD
+++ b/tests/integration/duplicates_in_java_export/BUILD
@@ -1,3 +1,5 @@
+load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library")
+load("@protobuf//bazel:proto_library.bzl", "proto_library")
 load("@rules_java//java:defs.bzl", "java_library", "java_test")
 load("//:defs.bzl", "artifact", "java_export")
 
diff --git a/tests/integration/java_export/BUILD b/tests/integration/java_export/BUILD
index f1c01c75c..b3ca18a23 100644
--- a/tests/integration/java_export/BUILD
+++ b/tests/integration/java_export/BUILD
@@ -1,5 +1,9 @@
 load("@aspect_bazel_lib//lib:diff_test.bzl", "diff_test")
+load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library")
+load("@protobuf//bazel:proto_library.bzl", "proto_library")
 load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_java//java:java_test.bzl", "java_test")
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 load("//:defs.bzl", "artifact", "java_export")
 load("//private/rules:maven_project_jar.bzl", "maven_project_jar")
 
@@ -164,7 +168,7 @@ proto_library(
     name = "example_proto",
     srcs = ["example.proto"],
     deps = [
-        # It's important that we pull our dep from `@com_google_protobuf`
+        # It's important that we pull our dep from `@protobuf`
         "@protobuf//:wrappers_proto",
     ],
 )
diff --git a/tests/integration/kt_jvm_export/BUILD b/tests/integration/kt_jvm_export/BUILD
index 6fa02f588..d9c473bef 100644
--- a/tests/integration/kt_jvm_export/BUILD
+++ b/tests/integration/kt_jvm_export/BUILD
@@ -1,3 +1,4 @@
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 load("//:kt_defs.bzl", "kt_jvm_export")
 
 kt_jvm_export(
diff --git a/tests/integration/override_targets/BUILD b/tests/integration/override_targets/BUILD
index db096358a..c0ad093a7 100644
--- a/tests/integration/override_targets/BUILD
+++ b/tests/integration/override_targets/BUILD
@@ -3,6 +3,7 @@ load("@bazel_skylib//rules:build_test.bzl", "build_test")
 load("@bazel_skylib//rules:diff_test.bzl", "diff_test")
 load("@rules_android//android:rules.bzl", "aar_import")
 load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 load("//tests/integration:is_bzlmod_enabled.bzl", "is_bzlmod_enabled")
 
 aar_import(
diff --git a/tests/integration/pom_file/BUILD b/tests/integration/pom_file/BUILD
index 6c3e81c00..c5629c7f0 100644
--- a/tests/integration/pom_file/BUILD
+++ b/tests/integration/pom_file/BUILD
@@ -1,5 +1,5 @@
-load("@rules_java//java:defs.bzl", "java_library")
 load("@aspect_bazel_lib//lib:diff_test.bzl", "diff_test")
+load("@rules_java//java:defs.bzl", "java_library")
 load("//:defs.bzl", "artifact", "java_export")
 
 java_export(