diff --git a/WORKSPACE b/WORKSPACE
index 96cd58916..e22a95493 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -50,6 +50,7 @@ load("//scala:toolchains.bzl", "scala_toolchains")
 
 scala_toolchains(
     fetch_sources = True,
+    scalafmt = True,
     testing = True,
 )
 
@@ -71,12 +72,6 @@ load("//scala_proto:scala_proto.bzl", "scala_proto_repositories")
 
 scala_proto_repositories()
 
-load("//scala/scalafmt:scalafmt_repositories.bzl", "scalafmt_default_config", "scalafmt_repositories")
-
-scalafmt_default_config()
-
-scalafmt_repositories()
-
 # needed for the cross repo proto test
 local_repository(
     name = "proto_cross_repo_boundary",
diff --git a/scala/scalafmt/BUILD b/scala/scalafmt/BUILD
index 31439f16e..0ab7ba90d 100644
--- a/scala/scalafmt/BUILD
+++ b/scala/scalafmt/BUILD
@@ -1,4 +1,3 @@
-load("//scala/scalafmt/toolchain:setup_scalafmt_toolchain.bzl", "setup_scalafmt_toolchains")
 load("//scala/scalafmt/toolchain:toolchain.bzl", "export_scalafmt_deps")
 load("//scala/scalafmt:phase_scalafmt_ext.bzl", "scalafmt_singleton")
 load("//scala:scala.bzl", "scala_binary")
@@ -37,12 +36,13 @@ scalafmt_singleton(
     visibility = ["//visibility:public"],
 )
 
-setup_scalafmt_toolchains()
-
 # Alias for backward compatibility:
 alias(
     name = "scalafmt_toolchain",
-    actual = "scalafmt_toolchain" + version_suffix(SCALA_VERSION),
+    actual = (
+        "@io_bazel_rules_scala_toolchains//scalafmt:scalafmt_toolchain" +
+        version_suffix(SCALA_VERSION)
+    ),
 )
 
 export_scalafmt_deps(
diff --git a/scala/scalafmt/phase_scalafmt_ext.bzl b/scala/scalafmt/phase_scalafmt_ext.bzl
index 0f32f87a8..be3656413 100644
--- a/scala/scalafmt/phase_scalafmt_ext.bzl
+++ b/scala/scalafmt/phase_scalafmt_ext.bzl
@@ -20,7 +20,7 @@ ext_scalafmt = {
         ),
         "_fmt": attr.label(
             cfg = "exec",
-            default = "//scala/scalafmt",
+            default = Label("//scala/scalafmt"),
             executable = True,
         ),
         "_java_host_runtime": attr.label(
@@ -30,11 +30,11 @@ ext_scalafmt = {
         ),
         "_runner": attr.label(
             allow_single_file = True,
-            default = "//scala/scalafmt:runner",
+            default = Label("//scala/scalafmt:runner"),
         ),
         "_testrunner": attr.label(
             allow_single_file = True,
-            default = "//scala/scalafmt:testrunner",
+            default = Label("//scala/scalafmt:testrunner"),
         ),
     },
     "outputs": {
@@ -42,7 +42,7 @@ ext_scalafmt = {
         "scalafmt_testrunner": "%{name}.format-test",
     },
     "phase_providers": [
-        "//scala/scalafmt:phase_scalafmt",
+        Label("//scala/scalafmt:phase_scalafmt"),
     ],
 }
 
diff --git a/scala/scalafmt/scalafmt_repositories.bzl b/scala/scalafmt/scalafmt_repositories.bzl
index de3668596..3254f18f9 100644
--- a/scala/scalafmt/scalafmt_repositories.bzl
+++ b/scala/scalafmt/scalafmt_repositories.bzl
@@ -4,6 +4,10 @@ load(
     "version_suffix",
     _default_maven_server_urls = "default_maven_server_urls",
 )
+load(
+    "//scala_proto/default:repositories.bzl",
+    "SCALAPB_COMPILE_ARTIFACT_IDS",
+)
 load("//third_party/repositories:repositories.bzl", "repositories")
 load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSIONS")
 
@@ -32,12 +36,8 @@ def scalafmt_default_config(path = ".scalafmt.conf", **kwargs):
 _SCALAFMT_DEPS = [
     "com_geirsson_metaconfig_core",
     "com_geirsson_metaconfig_typesafe_config",
-    "com_google_protobuf_protobuf_java",
     "com_lihaoyi_fansi",
-    "com_lihaoyi_fastparse",
-    "com_lihaoyi_sourcecode",
     "com_typesafe_config",
-    "org_scala_lang_modules_scala_collection_compat",
     "org_scala_lang_scalap",
     "org_scalameta_common",
     "org_scalameta_parsers",
@@ -45,9 +45,7 @@ _SCALAFMT_DEPS = [
     "org_scalameta_scalameta",
     "org_scalameta_trees",
     "org_typelevel_paiges_core",
-    "scala_proto_rules_scalapb_lenses",
-    "scala_proto_rules_scalapb_runtime",
-]
+] + SCALAPB_COMPILE_ARTIFACT_IDS
 
 _SCALAFMT_DEPS_2_11 = [
     "com_lihaoyi_pprint",
@@ -79,8 +77,7 @@ def scalafmt_artifact_ids(scala_version):
 
 def scalafmt_repositories(
         maven_servers = _default_maven_server_urls(),
-        overriden_artifacts = {},
-        bzlmod_enabled = False):
+        overriden_artifacts = {}):
     for scala_version in SCALA_VERSIONS:
         repositories(
             scala_version = scala_version,
@@ -89,11 +86,6 @@ def scalafmt_repositories(
             overriden_artifacts = overriden_artifacts,
         )
 
-    if not bzlmod_enabled:
-        _register_scalafmt_toolchains()
-
-def _register_scalafmt_toolchains():
-    for scala_version in SCALA_VERSIONS:
         native.register_toolchains(str(Label(
             "//scala/scalafmt:scalafmt_toolchain" +
             version_suffix(scala_version),
diff --git a/scala/scalafmt/toolchain/setup_scalafmt_toolchain.bzl b/scala/scalafmt/toolchain/setup_scalafmt_toolchain.bzl
index 4ae92857e..ed91563cc 100644
--- a/scala/scalafmt/toolchain/setup_scalafmt_toolchain.bzl
+++ b/scala/scalafmt/toolchain/setup_scalafmt_toolchain.bzl
@@ -1,4 +1,8 @@
-load("//scala/scalafmt/toolchain:toolchain.bzl", "scalafmt_toolchain")
+load(
+    "//scala/scalafmt/toolchain:toolchain.bzl",
+    "SCALAFMT_TOOLCHAIN_TYPE",
+    "scalafmt_toolchain",
+)
 load("//scala/scalafmt:scalafmt_repositories.bzl", "scalafmt_artifact_ids")
 load("//scala:providers.bzl", "declare_deps_provider")
 load("//scala:scala_cross_version.bzl", "version_suffix")
@@ -28,9 +32,7 @@ def setup_scalafmt_toolchain(
             version_suffix(scala_version),
         ],
         toolchain = ":%s_impl" % name,
-        toolchain_type = Label(
-            "//scala/scalafmt/toolchain:scalafmt_toolchain_type",
-        ),
+        toolchain_type = SCALAFMT_TOOLCHAIN_TYPE,
         visibility = visibility,
     )
 
diff --git a/scala/scalafmt/toolchain/toolchain.bzl b/scala/scalafmt/toolchain/toolchain.bzl
index 367df61f6..8278c564c 100644
--- a/scala/scalafmt/toolchain/toolchain.bzl
+++ b/scala/scalafmt/toolchain/toolchain.bzl
@@ -1,6 +1,10 @@
 load("@io_bazel_rules_scala//scala:providers.bzl", _DepsInfo = "DepsInfo")
 load("//scala/private/toolchain_deps:toolchain_deps.bzl", "expose_toolchain_deps")
 
+SCALAFMT_TOOLCHAIN_TYPE = Label(
+    "//scala/scalafmt/toolchain:scalafmt_toolchain_type",
+)
+
 def _scalafmt_toolchain_impl(ctx):
     toolchain = platform_common.ToolchainInfo(
         dep_providers = ctx.attr.dep_providers,
@@ -10,20 +14,12 @@ def _scalafmt_toolchain_impl(ctx):
 scalafmt_toolchain = rule(
     _scalafmt_toolchain_impl,
     attrs = {
-        "dep_providers": attr.label_list(
-            default = [
-                "@io_bazel_rules_scala//scala/scalafmt:scalafmt_classpath_provider",
-            ],
-            providers = [_DepsInfo],
-        ),
+        "dep_providers": attr.label_list(providers = [_DepsInfo]),
     },
 )
 
 def _export_scalafmt_deps_impl(ctx):
-    return expose_toolchain_deps(
-        ctx,
-        "@io_bazel_rules_scala//scala/scalafmt/toolchain:scalafmt_toolchain_type",
-    )
+    return expose_toolchain_deps(ctx, SCALAFMT_TOOLCHAIN_TYPE)
 
 export_scalafmt_deps = rule(
     _export_scalafmt_deps_impl,
@@ -32,6 +28,6 @@ export_scalafmt_deps = rule(
             mandatory = True,
         ),
     },
-    toolchains = ["@io_bazel_rules_scala//scala/scalafmt/toolchain:scalafmt_toolchain_type"],
+    toolchains = [SCALAFMT_TOOLCHAIN_TYPE],
     incompatible_use_toolchain_transition = True,
 )
diff --git a/scala/toolchains.bzl b/scala/toolchains.bzl
index 07816e384..5996b6054 100644
--- a/scala/toolchains.bzl
+++ b/scala/toolchains.bzl
@@ -2,8 +2,13 @@
 
 load("//junit:junit.bzl", "junit_artifact_ids")
 load("//scala/private:macros/scala_repositories.bzl", "scala_repositories")
-load("//scala:toolchains_repo.bzl", "scala_toolchains_repo")
+load(
+    "//scala/scalafmt:scalafmt_repositories.bzl",
+    "scalafmt_artifact_ids",
+    "scalafmt_default_config",
+)
 load("//scala:scala_cross_version.bzl", "default_maven_server_urls")
+load("//scala:toolchains_repo.bzl", "scala_toolchains_repo")
 load("//scalatest:scalatest.bzl", "scalatest_artifact_ids")
 load("//specs2:specs2.bzl", "specs2_artifact_ids")
 load("//specs2:specs2_junit.bzl", "specs2_junit_artifact_ids")
@@ -21,7 +26,9 @@ def scala_toolchains(
         scalatest = False,
         junit = False,
         specs2 = False,
-        testing = False):
+        testing = False,
+        scalafmt = False,
+        scalafmt_default_config_path = ".scalafmt.conf"):
     """Instantiates @io_bazel_rules_scala_toolchains and all its dependencies.
 
     Provides a unified interface to configuring rules_scala both directly in a
@@ -66,6 +73,9 @@ def scala_toolchains(
         specs2: whether to instantiate the Specs2 JUnit toolchain
         testing: whether to instantiate the Scalatest, JUnit, and Specs2 JUnit
             toolchains combined
+        scalafmt: whether to instantiate the Scalafmt toolchain
+        scalafmt_default_config_path: the relative path to the default Scalafmt
+            config file within the repository
     """
     scala_repositories(
         maven_servers = maven_servers,
@@ -78,6 +88,9 @@ def scala_toolchains(
         scala_compiler_srcjars = scala_compiler_srcjars,
     )
 
+    if scalafmt:
+        scalafmt_default_config(scalafmt_default_config_path)
+
     if testing:
         scalatest = True
         junit = True
@@ -106,6 +119,12 @@ def scala_toolchains(
     for scala_version in SCALA_VERSIONS:
         version_specific_artifact_ids = {}
 
+        if scalafmt:
+            version_specific_artifact_ids.update({
+                id: fetch_sources
+                for id in scalafmt_artifact_ids(scala_version)
+            })
+
         all_artifacts = (
             artifact_ids_to_fetch_sources | version_specific_artifact_ids
         )
@@ -125,6 +144,7 @@ def scala_toolchains(
         junit = junit,
         specs2 = specs2,
         testing = testing,
+        scalafmt = scalafmt,
     )
 
 def scala_register_toolchains():
diff --git a/scala/toolchains_repo.bzl b/scala/toolchains_repo.bzl
index 8234d5c94..d013698b7 100644
--- a/scala/toolchains_repo.bzl
+++ b/scala/toolchains_repo.bzl
@@ -50,6 +50,9 @@ def _scala_toolchains_repo_impl(repository_ctx):
         format_args.update(testing_build_args)
         toolchains["testing"] = _TESTING_TOOLCHAIN_BUILD
 
+    if repo_attr.scalafmt:
+        toolchains["scalafmt"] = _SCALAFMT_TOOLCHAIN_BUILD
+
     if len(toolchains) == 0:
         fail("no toolchains specified")
 
@@ -69,6 +72,7 @@ _scala_toolchains_repo = repository_rule(
         "junit": attr.bool(),
         "specs2": attr.bool(),
         "testing": attr.bool(),
+        "scalafmt": attr.bool(),
     },
 )
 
@@ -143,3 +147,12 @@ load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSIONS")
     for scala_version in SCALA_VERSIONS
 ]
 """
+
+_SCALAFMT_TOOLCHAIN_BUILD = """
+load(
+    "@@{rules_scala_repo}//scala/scalafmt/toolchain:setup_scalafmt_toolchain.bzl",
+    "setup_scalafmt_toolchains",
+)
+
+setup_scalafmt_toolchains()
+"""
diff --git a/test/shell/test_scala_library.sh b/test/shell/test_scala_library.sh
index a850cc687..4df86c38d 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='@[a-z_.~+-]*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='@[a-z_.~+-]*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 2d45c2b16..82feb8ddf 100755
--- a/test/shell/test_strict_dependency.sh
+++ b/test/shell/test_strict_dependency.sh
@@ -60,7 +60,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 @[a-z_.~+-]*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 815968fc8..94a4ecdc6 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 @[a-z_.~+-]*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_cross_build/WORKSPACE b/test_cross_build/WORKSPACE
index 6886e8cc7..65af9be5e 100644
--- a/test_cross_build/WORKSPACE
+++ b/test_cross_build/WORKSPACE
@@ -66,11 +66,8 @@ scala_config(
 load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_toolchains")
 
 scala_toolchains(
+    scalafmt = True,
     scalatest = True,
 )
 
 register_toolchains("@io_bazel_rules_scala_toolchains//...:all")
-
-load("@io_bazel_rules_scala//scala/scalafmt:scalafmt_repositories.bzl", "scalafmt_repositories")
-
-scalafmt_repositories()
diff --git a/test_reproducibility.sh b/test_reproducibility.sh
index bde425077..cffa5be09 100755
--- a/test_reproducibility.sh
+++ b/test_reproducibility.sh
@@ -20,11 +20,18 @@ non_deploy_jar_md5_sum() {
     find bazel-bin/test -name "*.jar" ! -name "*_deploy.jar" ! -path 'bazel-bin/test/jmh/*' | xargs -n 1 -P 5 $(md5_util) | sort
 }
 
+
 test_build_is_identical() {
+    local test_coverage_packages=()
+
+    for package_dir in test/coverage_*; do
+        test_coverage_packages+=("//${package_dir}/...")
+    done
+
     bazel clean #ensure we are starting from square one
     bazel build test/...
     # Also build instrumented jars.
-    bazel build --collect_code_coverage -- //test/coverage/...
+    bazel build --collect_code_coverage -- "${test_coverage_packages[@]}"
     non_deploy_jar_md5_sum > hash1
     bazel clean
     sleep 10 # to make sure that if timestamps slip in we get different ones
@@ -37,7 +44,8 @@ test_build_is_identical() {
     fi
 
     bazel build --disk_cache $random_dir test/...
-    bazel build --disk_cache $random_dir --collect_code_coverage -- //test/coverage/...
+    bazel build --disk_cache $random_dir --collect_code_coverage -- \
+        "${test_coverage_packages[@]}"
     non_deploy_jar_md5_sum > hash2
     diff hash1 hash2
 }
diff --git a/third_party/dependency_analyzer/src/test/analyzer_test.bzl b/third_party/dependency_analyzer/src/test/analyzer_test.bzl
index 38581d847..c7c8d8c5b 100644
--- a/third_party/dependency_analyzer/src/test/analyzer_test.bzl
+++ b/third_party/dependency_analyzer/src/test/analyzer_test.bzl
@@ -57,7 +57,7 @@ def tests():
         ],
         jvm_flags = common_jvm_flags + [
             "-Dguava.jar.location=$(rootpath @com_google_guava_guava_21_0_with_file//jar)",
-            "-Dapache.commons.jar.location=$(location @org_apache_commons_commons_lang_3_5_without_file//:linkable_org_apache_commons_commons_lang_3_5_without_file)",
+            "-Dapache.commons.jar.location=$(rootpath @org_apache_commons_commons_lang_3_5_without_file//:linkable_org_apache_commons_commons_lang_3_5_without_file)",
         ],
         unused_dependency_checker_mode = "off",
         deps = scala_std_dependencies + [
@@ -76,7 +76,7 @@ def tests():
             "io/bazel/rulesscala/dependencyanalyzer/UnusedDependencyCheckerTest.scala",
         ],
         jvm_flags = common_jvm_flags + [
-            "-Dapache.commons.jar.location=$(location @org_apache_commons_commons_lang_3_5_without_file//:linkable_org_apache_commons_commons_lang_3_5_without_file)",
+            "-Dapache.commons.jar.location=$(rootpath @org_apache_commons_commons_lang_3_5_without_file//:linkable_org_apache_commons_commons_lang_3_5_without_file)",
         ],
         unused_dependency_checker_mode = "off",
         deps = scala_std_dependencies + [