diff --git a/examples/helloworld/BUILD b/examples/helloworld/BUILD
index 32edb945..2fff4c0c 100644
--- a/examples/helloworld/BUILD
+++ b/examples/helloworld/BUILD
@@ -8,9 +8,9 @@
 # OF ANY KIND, either express or implied. See the License for the specific language
 # governing permissions and limitations under the License.
 
+load("@com_adobe_rules_gitops//gitops:defs.bzl", "k8s_deploy")
 load("@io_bazel_rules_docker//go:image.bzl", "go_image")
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library", "go_test")
-load("@com_adobe_rules_gitops//gitops:defs.bzl", "k8s_deploy")
 
 licenses(["notice"])  # Apache 2.0
 
diff --git a/gitops/defs.bzl b/gitops/defs.bzl
index a0d01186..9ca1fd33 100644
--- a/gitops/defs.bzl
+++ b/gitops/defs.bzl
@@ -12,8 +12,8 @@
 GitOps rules public interface
 """
 
-load("@com_adobe_rules_gitops//skylib:k8s.bzl", _k8s_deploy = "k8s_deploy", _k8s_test_setup = "k8s_test_setup")
 load("@com_adobe_rules_gitops//skylib:external_image.bzl", _external_iamge = "external_image")
+load("@com_adobe_rules_gitops//skylib:k8s.bzl", _k8s_deploy = "k8s_deploy", _k8s_test_setup = "k8s_test_setup")
 
 k8s_deploy = _k8s_deploy
 k8s_test_setup = _k8s_test_setup
diff --git a/gitops/repositories.bzl b/gitops/repositories.bzl
index f633b5c4..0339b279 100644
--- a/gitops/repositories.bzl
+++ b/gitops/repositories.bzl
@@ -12,11 +12,11 @@
 GtiOps rules repositories initialization
 """
 
-load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
 load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
-load("@io_bazel_rules_docker//repositories:repositories.bzl", container_repositories = "repositories")
-load("@io_bazel_rules_docker//repositories:go_repositories.bzl", container_go_deps = "go_deps")
+load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
 load("@com_adobe_rules_gitops//skylib/kustomize:kustomize.bzl", "kustomize_setup")
+load("@io_bazel_rules_docker//repositories:go_repositories.bzl", container_go_deps = "go_deps")
+load("@io_bazel_rules_docker//repositories:repositories.bzl", container_repositories = "repositories")
 
 def rules_gitops_repositories():
     """Initializes Declares workspaces the GitOps rules depend on.
diff --git a/skylib/k8s.bzl b/skylib/k8s.bzl
index 68b1287f..8391fa94 100644
--- a/skylib/k8s.bzl
+++ b/skylib/k8s.bzl
@@ -8,10 +8,6 @@
 # OF ANY KIND, either express or implied. See the License for the specific language
 # governing permissions and limitations under the License.
 
-load(
-    "@io_bazel_rules_docker//skylib:path.bzl",
-    _get_runfile_path = "runfile",
-)
 load(
     "@com_adobe_rules_gitops//skylib/kustomize:kustomize.bzl",
     "KustomizeInfo",
@@ -20,6 +16,10 @@ load(
     "kustomize",
     kustomize_gitops = "gitops",
 )
+load(
+    "@io_bazel_rules_docker//skylib:path.bzl",
+    _get_runfile_path = "runfile",
+)
 load("//skylib:push.bzl", "k8s_container_push")
 
 def _runfiles(ctx, f):
diff --git a/skylib/kustomize/tests/BUILD b/skylib/kustomize/tests/BUILD
index 9b28a8bd..27a96a17 100644
--- a/skylib/kustomize/tests/BUILD
+++ b/skylib/kustomize/tests/BUILD
@@ -13,9 +13,9 @@ load(
     "@io_bazel_rules_docker//container:container.bzl",
     "container_image",
 )
-load("//skylib/kustomize:kustomize.bzl", "gitops", "kubectl", "kustomize", "push_all")
 load("//skylib:push.bzl", "k8s_container_push")
 load("//skylib:test_rules.bzl", "file_compare_test")
+load("//skylib/kustomize:kustomize.bzl", "gitops", "kubectl", "kustomize", "push_all")
 
 # to generate new test data if needed:
 # bazel run //skylib/kustomize:set_namespace newnamespace-1 <test.yaml >test_expected.yaml
diff --git a/skylib/push.bzl b/skylib/push.bzl
index 1f02335d..ec73b542 100644
--- a/skylib/push.bzl
+++ b/skylib/push.bzl
@@ -17,13 +17,13 @@ Bazel rule for publishing images.
 """
 
 load("@bazel_skylib//lib:dicts.bzl", "dicts")
-load("@io_bazel_rules_docker//container:providers.bzl", "PushInfo")
 load(
     "@io_bazel_rules_docker//container:layer_tools.bzl",
     _gen_img_args = "generate_args_for_image",
     _get_layers = "get_from_target",
     _layer_tools = "tools",
 )
+load("@io_bazel_rules_docker//container:providers.bzl", "PushInfo")
 load(
     "@io_bazel_rules_docker//skylib:path.bzl",
     "runfile",