diff --git a/tensorboard/BUILD b/tensorboard/BUILD
index 1a0a9ecfdf..6d0badb125 100644
--- a/tensorboard/BUILD
+++ b/tensorboard/BUILD
@@ -1,12 +1,12 @@
 # Description:
 # TensorBoard, a dashboard for investigating TensorFlow
 
-load("@rules_python//python:py_binary.bzl", "py_binary")
-load("@rules_python//python:py_library.bzl", "py_library")
-load("@rules_python//python:py_test.bzl", "py_test")
 load("//tensorboard/defs:py_repl.bzl", "py_repl")
 load("//tensorboard/defs:web.bzl", "tf_web_library")
 load("//tensorboard/defs:zipper.bzl", "tensorboard_zip_file")
+load("@rules_python//python:py_binary.bzl", "py_binary")
+load("@rules_python//python:py_library.bzl", "py_library")
+load("@rules_python//python:py_test.bzl", "py_test")
 
 package(default_visibility = [":internal"])
 
diff --git a/tensorboard/defs/BUILD b/tensorboard/defs/BUILD
index f4a9e99bc4..54cdd450e2 100644
--- a/tensorboard/defs/BUILD
+++ b/tensorboard/defs/BUILD
@@ -1,8 +1,8 @@
-load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
-load("@npm//@bazel/concatjs:index.bzl", "ts_library")
+load("//tensorboard/defs:protos.bzl", "tb_proto_library")
 load("@rules_python//python:py_binary.bzl", "py_binary")
 load("@rules_python//python:py_test.bzl", "py_test")
-load("//tensorboard/defs:protos.bzl", "tb_proto_library")
+load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
+load("@npm//@bazel/concatjs:index.bzl", "ts_library")
 
 package(default_visibility = ["//tensorboard:internal"])
 
diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/BUILD b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/BUILD
index 5d5426180d..b849cc35c7 100644
--- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/BUILD
+++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/BUILD
@@ -1,5 +1,5 @@
-load("@rules_python//python:py_binary.bzl", "py_binary")
 load("//tensorboard/defs:defs.bzl", "tf_ng_module", "tf_ng_web_test_suite", "tf_sass_binary", "tf_ts_library")
+load("@rules_python//python:py_binary.bzl", "py_binary")
 
 package(default_visibility = ["//tensorboard:internal"])
 
diff --git a/tensorboard/plugins/histogram/BUILD b/tensorboard/plugins/histogram/BUILD
index 0f652342aa..77fa2d1f0f 100644
--- a/tensorboard/plugins/histogram/BUILD
+++ b/tensorboard/plugins/histogram/BUILD
@@ -1,10 +1,10 @@
 # Description:
 # TensorBoard plugin for histograms
 
+load("//tensorboard/defs:protos.bzl", "tb_proto_library")
 load("@rules_python//python:py_binary.bzl", "py_binary")
 load("@rules_python//python:py_library.bzl", "py_library")
 load("@rules_python//python:py_test.bzl", "py_test")
-load("//tensorboard/defs:protos.bzl", "tb_proto_library")
 
 package(default_visibility = ["//tensorboard:internal"])
 
diff --git a/tensorboard/plugins/hparams/BUILD b/tensorboard/plugins/hparams/BUILD
index 15fa8486e8..74667a2819 100644
--- a/tensorboard/plugins/hparams/BUILD
+++ b/tensorboard/plugins/hparams/BUILD
@@ -1,12 +1,12 @@
 # Description:
 # TensorBoard plugin for hparams
 
+load("//tensorboard/defs:defs.bzl", "tf_ts_library")
+load("//tensorboard/defs:web.bzl", "tf_web_library")
+load("//tensorboard/defs:protos.bzl", "tb_proto_library")
 load("@rules_python//python:py_binary.bzl", "py_binary")
 load("@rules_python//python:py_library.bzl", "py_library")
 load("@rules_python//python:py_test.bzl", "py_test")
-load("//tensorboard/defs:defs.bzl", "tf_ts_library")
-load("//tensorboard/defs:protos.bzl", "tb_proto_library")
-load("//tensorboard/defs:web.bzl", "tf_web_library")
 
 package(default_visibility = ["//tensorboard:internal"])
 
diff --git a/tensorboard/plugins/image/BUILD b/tensorboard/plugins/image/BUILD
index 092873ace4..4ced32d711 100644
--- a/tensorboard/plugins/image/BUILD
+++ b/tensorboard/plugins/image/BUILD
@@ -1,10 +1,10 @@
 # Description:
 # TensorBoard plugin for images
 
+load("//tensorboard/defs:protos.bzl", "tb_proto_library")
 load("@rules_python//python:py_binary.bzl", "py_binary")
 load("@rules_python//python:py_library.bzl", "py_library")
 load("@rules_python//python:py_test.bzl", "py_test")
-load("//tensorboard/defs:protos.bzl", "tb_proto_library")
 
 package(default_visibility = ["//tensorboard:internal"])
 
diff --git a/tensorboard/plugins/mesh/BUILD b/tensorboard/plugins/mesh/BUILD
index a042c328b1..14cc2d6459 100644
--- a/tensorboard/plugins/mesh/BUILD
+++ b/tensorboard/plugins/mesh/BUILD
@@ -1,7 +1,7 @@
+load("//tensorboard/defs:protos.bzl", "tb_proto_library")
 load("@rules_python//python:py_binary.bzl", "py_binary")
 load("@rules_python//python:py_library.bzl", "py_library")
 load("@rules_python//python:py_test.bzl", "py_test")
-load("//tensorboard/defs:protos.bzl", "tb_proto_library")
 
 package(default_visibility = ["//tensorboard:internal"])
 
diff --git a/tensorboard/plugins/pr_curve/BUILD b/tensorboard/plugins/pr_curve/BUILD
index 6afb48c119..49ef760827 100644
--- a/tensorboard/plugins/pr_curve/BUILD
+++ b/tensorboard/plugins/pr_curve/BUILD
@@ -1,10 +1,10 @@
 # Description:
 # TensorBoard plugin for precision-recall curves.
 
+load("//tensorboard/defs:protos.bzl", "tb_proto_library")
 load("@rules_python//python:py_binary.bzl", "py_binary")
 load("@rules_python//python:py_library.bzl", "py_library")
 load("@rules_python//python:py_test.bzl", "py_test")
-load("//tensorboard/defs:protos.bzl", "tb_proto_library")
 
 package(default_visibility = ["//tensorboard:internal"])
 
diff --git a/tensorboard/plugins/projector/BUILD b/tensorboard/plugins/projector/BUILD
index e7962837e2..bad14aa188 100644
--- a/tensorboard/plugins/projector/BUILD
+++ b/tensorboard/plugins/projector/BUILD
@@ -1,9 +1,9 @@
 # Embedding Projector plugin.
 
+load("//tensorboard/defs:protos.bzl", "tb_proto_library")
 load("@rules_python//python:py_binary.bzl", "py_binary")
 load("@rules_python//python:py_library.bzl", "py_library")
 load("@rules_python//python:py_test.bzl", "py_test")
-load("//tensorboard/defs:protos.bzl", "tb_proto_library")
 
 package(default_visibility = ["//tensorboard:internal"])
 
diff --git a/tensorboard/plugins/scalar/BUILD b/tensorboard/plugins/scalar/BUILD
index c7879cb725..6a6d044f4e 100644
--- a/tensorboard/plugins/scalar/BUILD
+++ b/tensorboard/plugins/scalar/BUILD
@@ -1,10 +1,10 @@
 # Description:
 # TensorBoard plugin for scalars
 
+load("//tensorboard/defs:protos.bzl", "tb_proto_library")
 load("@rules_python//python:py_binary.bzl", "py_binary")
 load("@rules_python//python:py_library.bzl", "py_library")
 load("@rules_python//python:py_test.bzl", "py_test")
-load("//tensorboard/defs:protos.bzl", "tb_proto_library")
 
 package(default_visibility = ["//tensorboard:internal"])
 
diff --git a/tensorboard/plugins/text/BUILD b/tensorboard/plugins/text/BUILD
index 433bf21a69..8476737993 100644
--- a/tensorboard/plugins/text/BUILD
+++ b/tensorboard/plugins/text/BUILD
@@ -1,10 +1,10 @@
 # Description:
 # TensorBoard plugin for the Text
 
+load("//tensorboard/defs:protos.bzl", "tb_proto_library")
 load("@rules_python//python:py_binary.bzl", "py_binary")
 load("@rules_python//python:py_library.bzl", "py_library")
 load("@rules_python//python:py_test.bzl", "py_test")
-load("//tensorboard/defs:protos.bzl", "tb_proto_library")
 
 package(default_visibility = ["//tensorboard:internal"])
 
diff --git a/tensorboard/summary/BUILD b/tensorboard/summary/BUILD
index 2eec391962..aeddf61a3b 100644
--- a/tensorboard/summary/BUILD
+++ b/tensorboard/summary/BUILD
@@ -1,9 +1,9 @@
 # Description:
 # Summary API for TensorBoard.
 
+load("//tensorboard/defs:py_repl.bzl", "py_repl")
 load("@rules_python//python:py_library.bzl", "py_library")
 load("@rules_python//python:py_test.bzl", "py_test")
-load("//tensorboard/defs:py_repl.bzl", "py_repl")
 
 package(default_visibility = ["//tensorboard:internal"])
 
diff --git a/tensorboard/util/BUILD b/tensorboard/util/BUILD
index c8c40f44b3..2ff3470d04 100644
--- a/tensorboard/util/BUILD
+++ b/tensorboard/util/BUILD
@@ -1,6 +1,6 @@
+load("//tensorboard/defs:protos.bzl", "tb_proto_library")
 load("@rules_python//python:py_library.bzl", "py_library")
 load("@rules_python//python:py_test.bzl", "py_test")
-load("//tensorboard/defs:protos.bzl", "tb_proto_library")
 
 package(default_visibility = ["//tensorboard:internal"])
 
diff --git a/third_party/workspace.bzl b/third_party/workspace.bzl
index 634fbc261f..9f15e0b3b0 100644
--- a/third_party/workspace.bzl
+++ b/third_party/workspace.bzl
@@ -20,8 +20,8 @@ load("@bazel_tools//tools/build_defs/repo:java.bzl", "java_import_external")
 load("@io_bazel_rules_webtesting//web:web.bzl", "platform_archive")
 load("@io_bazel_rules_webtesting//web/versioned:browsers-0.3.3.bzl", "browser_repositories")
 load("//third_party:fonts.bzl", "tensorboard_fonts_workspace")
-load("//third_party:js.bzl", "tensorboard_js_workspace")
 load("//third_party:python.bzl", "tensorboard_python_workspace")
+load("//third_party:js.bzl", "tensorboard_js_workspace")
 load("//third_party:rust.bzl", "tensorboard_rust_workspace")
 
 def tensorboard_workspace(name = ""):