diff --git a/build/dependencies.yaml b/build/dependencies.yaml
index b33748ba9ad69..94341f03ba21d 100644
--- a/build/dependencies.yaml
+++ b/build/dependencies.yaml
@@ -1,4 +1,14 @@
 dependencies:
+  # Bazel
+  - name: "repo-infra"
+    version: 0.0.8
+    refPaths:
+    - path: build/root/WORKSPACE
+      match: strip_prefix = "repo-infra-\d+.\d+.\d+"
+    - path: build/root/WORKSPACE
+      match: https://github.com/kubernetes/repo-infra/archive/v\d+.\d+.\d+.tar.gz
+
+  # CNI plugins
   - name: "cni"
     version: 0.8.6
     refPaths:
@@ -11,6 +21,7 @@ dependencies:
     - path: test/e2e_node/remote/utils.go
       match: cniVersion[\t\n\f\r ]*=
 
+  # CoreDNS
   - name: "coredns-kube-up"
     version: 1.7.0
     refPaths:
@@ -27,6 +38,7 @@ dependencies:
     - path: cmd/kubeadm/app/constants/constants.go
       match: CoreDNSVersion =
 
+  # CRI Tools
   - name: "crictl"
     version: 1.18.0
     refPaths:
@@ -37,12 +49,14 @@ dependencies:
     - path: cluster/gce/windows/k8s-node-setup.psm1
       match: CRICTL_VERSION =
 
+  # Docker
   - name: "docker"
     version: 19.03
     refPaths:
     - path: vendor/k8s.io/system-validators/validators/docker_validator.go
       match: latestValidatedDockerVersion
 
+  # etcd
   - name: "etcd"
     version: 3.4.9
     refPaths:
@@ -67,6 +81,7 @@ dependencies:
       match: BUNDLED_ETCD_VERSIONS\?|LATEST_ETCD_VERSION\?
     - path: cluster/images/etcd/migrate/options.go
 
+  # Golang
   - name: "golang"
     version: 1.14.6
     refPaths:
@@ -76,6 +91,14 @@ dependencies:
     - path: test/images/Makefile
       match: GOLANG_VERSION
 
+  - name: "k8s.gcr.io/kube-cross: dependents"
+    version: v1.14.6-1
+    refPaths:
+    - path: build/build-image/cross/VERSION
+    - path: test/images/sample-apiserver/Dockerfile
+      match: k8s\.gcr\.io\/build-image\/kube-cross:v\d+\.\d+\.\d+-\d+
+
+  # Base images
   - name: "k8s.gcr.io/debian-base"
     version: 2.1.0
     refPaths:
@@ -132,13 +155,6 @@ dependencies:
     - path: build/workspace.bzl
       match: tag =
 
-  - name: "k8s.gcr.io/kube-cross: dependents"
-    version: v1.14.6-1
-    refPaths:
-    - path: build/build-image/cross/VERSION
-    - path: test/images/sample-apiserver/Dockerfile
-      match: k8s\.gcr\.io\/build-image\/kube-cross:v\d+\.\d+\.\d+-\d+
-
   - name: "k8s.gcr.io/pause"
     version: 3.3
     refPaths:
@@ -196,11 +212,3 @@ dependencies:
       match: k8s.gcr.io\/pause:\d+\.\d+
     - path: test/utils/image/manifest.go
       match: configs\[Pause\] = Config{gcRegistry, "pause", "\d+\.\d+"}
-
-  - name: "repo-infra"
-    version: 0.0.8
-    refPaths:
-    - path: build/root/WORKSPACE
-      match: strip_prefix = "repo-infra-\d+.\d+.\d+"
-    - path: build/root/WORKSPACE
-      match: https://github.com/kubernetes/repo-infra/archive/v\d+.\d+.\d+.tar.gz