diff --git a/cli-plugins/manager/manager.go b/cli-plugins/manager/manager.go
index 7b7f7a863d..57bd16b8e8 100644
--- a/cli-plugins/manager/manager.go
+++ b/cli-plugins/manager/manager.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/config"
+	"github.com/fvbommel/sortorder"
 	"github.com/spf13/cobra"
-	"vbom.ml/util/sortorder"
 )
 
 // ReexecEnvvar is the name of an ennvar which is set to the command
diff --git a/cli/command/config/ls.go b/cli/command/config/ls.go
index c004a718de..57bb13320b 100644
--- a/cli/command/config/ls.go
+++ b/cli/command/config/ls.go
@@ -9,8 +9,8 @@ import (
 	"github.com/docker/cli/cli/command/formatter"
 	"github.com/docker/cli/opts"
 	"github.com/docker/docker/api/types"
+	"github.com/fvbommel/sortorder"
 	"github.com/spf13/cobra"
-	"vbom.ml/util/sortorder"
 )
 
 // ListOptions contains options for the docker config ls command.
diff --git a/cli/command/context/list.go b/cli/command/context/list.go
index 4c540bb256..dbe4c13e17 100644
--- a/cli/command/context/list.go
+++ b/cli/command/context/list.go
@@ -10,8 +10,8 @@ import (
 	"github.com/docker/cli/cli/command/formatter"
 	"github.com/docker/cli/cli/context/docker"
 	kubecontext "github.com/docker/cli/cli/context/kubernetes"
+	"github.com/fvbommel/sortorder"
 	"github.com/spf13/cobra"
-	"vbom.ml/util/sortorder"
 )
 
 type listOptions struct {
diff --git a/cli/command/network/list.go b/cli/command/network/list.go
index b2700552e5..e72703b212 100644
--- a/cli/command/network/list.go
+++ b/cli/command/network/list.go
@@ -9,8 +9,8 @@ import (
 	"github.com/docker/cli/cli/command/formatter"
 	"github.com/docker/cli/opts"
 	"github.com/docker/docker/api/types"
+	"github.com/fvbommel/sortorder"
 	"github.com/spf13/cobra"
-	"vbom.ml/util/sortorder"
 )
 
 type listOptions struct {
diff --git a/cli/command/node/list.go b/cli/command/node/list.go
index fdea329dea..d67f54a042 100644
--- a/cli/command/node/list.go
+++ b/cli/command/node/list.go
@@ -9,8 +9,8 @@ import (
 	"github.com/docker/cli/cli/command/formatter"
 	"github.com/docker/cli/opts"
 	"github.com/docker/docker/api/types"
+	"github.com/fvbommel/sortorder"
 	"github.com/spf13/cobra"
-	"vbom.ml/util/sortorder"
 )
 
 type listOptions struct {
diff --git a/cli/command/plugin/list.go b/cli/command/plugin/list.go
index 16c7db6cf4..c05eefae79 100644
--- a/cli/command/plugin/list.go
+++ b/cli/command/plugin/list.go
@@ -8,8 +8,8 @@ import (
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/formatter"
 	"github.com/docker/cli/opts"
+	"github.com/fvbommel/sortorder"
 	"github.com/spf13/cobra"
-	"vbom.ml/util/sortorder"
 )
 
 type listOptions struct {
diff --git a/cli/command/secret/ls.go b/cli/command/secret/ls.go
index 878f6fe977..5d1d54150a 100644
--- a/cli/command/secret/ls.go
+++ b/cli/command/secret/ls.go
@@ -9,8 +9,8 @@ import (
 	"github.com/docker/cli/cli/command/formatter"
 	"github.com/docker/cli/opts"
 	"github.com/docker/docker/api/types"
+	"github.com/fvbommel/sortorder"
 	"github.com/spf13/cobra"
-	"vbom.ml/util/sortorder"
 )
 
 type listOptions struct {
diff --git a/cli/command/service/formatter.go b/cli/command/service/formatter.go
index 26bdd2994d..6d30be9427 100644
--- a/cli/command/service/formatter.go
+++ b/cli/command/service/formatter.go
@@ -15,8 +15,8 @@ import (
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/pkg/stringid"
 	units "github.com/docker/go-units"
+	"github.com/fvbommel/sortorder"
 	"github.com/pkg/errors"
-	"vbom.ml/util/sortorder"
 )
 
 const serviceInspectPrettyTemplate formatter.Format = `
diff --git a/cli/command/stack/list.go b/cli/command/stack/list.go
index 697cbcce1d..5793bfdca6 100644
--- a/cli/command/stack/list.go
+++ b/cli/command/stack/list.go
@@ -9,8 +9,8 @@ import (
 	"github.com/docker/cli/cli/command/stack/kubernetes"
 	"github.com/docker/cli/cli/command/stack/options"
 	"github.com/docker/cli/cli/command/stack/swarm"
+	"github.com/fvbommel/sortorder"
 	"github.com/spf13/cobra"
-	"vbom.ml/util/sortorder"
 )
 
 func newListCommand(dockerCli command.Cli, common *commonOptions) *cobra.Command {
diff --git a/cli/command/stack/services.go b/cli/command/stack/services.go
index ffcec6511a..24ad368887 100644
--- a/cli/command/stack/services.go
+++ b/cli/command/stack/services.go
@@ -13,9 +13,9 @@ import (
 	"github.com/docker/cli/cli/command/stack/swarm"
 	cliopts "github.com/docker/cli/opts"
 	swarmtypes "github.com/docker/docker/api/types/swarm"
+	"github.com/fvbommel/sortorder"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"vbom.ml/util/sortorder"
 )
 
 func newServicesCommand(dockerCli command.Cli, common *commonOptions) *cobra.Command {
diff --git a/cli/command/system/prune.go b/cli/command/system/prune.go
index 0e8f115c5a..c9de08d3a8 100644
--- a/cli/command/system/prune.go
+++ b/cli/command/system/prune.go
@@ -16,8 +16,8 @@ import (
 	"github.com/docker/cli/opts"
 	"github.com/docker/docker/api/types/versions"
 	"github.com/docker/go-units"
+	"github.com/fvbommel/sortorder"
 	"github.com/spf13/cobra"
-	"vbom.ml/util/sortorder"
 )
 
 type pruneOptions struct {
diff --git a/cli/command/task/print.go b/cli/command/task/print.go
index 3cb2d0b22f..da9645b72c 100644
--- a/cli/command/task/print.go
+++ b/cli/command/task/print.go
@@ -10,7 +10,7 @@ import (
 	"github.com/docker/cli/cli/command/idresolver"
 	"github.com/docker/cli/cli/config/configfile"
 	"github.com/docker/docker/api/types/swarm"
-	"vbom.ml/util/sortorder"
+	"github.com/fvbommel/sortorder"
 )
 
 type tasksSortable []swarm.Task
diff --git a/cli/command/trust/common.go b/cli/command/trust/common.go
index 0a5b54716a..1e22bc1fcb 100644
--- a/cli/command/trust/common.go
+++ b/cli/command/trust/common.go
@@ -10,11 +10,11 @@ import (
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/image"
 	"github.com/docker/cli/cli/trust"
+	"github.com/fvbommel/sortorder"
 	"github.com/sirupsen/logrus"
 	"github.com/theupdateframework/notary"
 	"github.com/theupdateframework/notary/client"
 	"github.com/theupdateframework/notary/tuf/data"
-	"vbom.ml/util/sortorder"
 )
 
 // trustTagKey represents a unique signed tag and hex-encoded hash pair
diff --git a/cli/command/trust/inspect_pretty.go b/cli/command/trust/inspect_pretty.go
index dbe0f795e2..0407549b44 100644
--- a/cli/command/trust/inspect_pretty.go
+++ b/cli/command/trust/inspect_pretty.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/formatter"
+	"github.com/fvbommel/sortorder"
 	"github.com/theupdateframework/notary/client"
-	"vbom.ml/util/sortorder"
 )
 
 func prettyPrintTrustInfo(cli command.Cli, remote string) error {
diff --git a/cli/command/volume/list.go b/cli/command/volume/list.go
index f9afef8bf6..4793e72d51 100644
--- a/cli/command/volume/list.go
+++ b/cli/command/volume/list.go
@@ -8,8 +8,8 @@ import (
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/formatter"
 	"github.com/docker/cli/opts"
+	"github.com/fvbommel/sortorder"
 	"github.com/spf13/cobra"
-	"vbom.ml/util/sortorder"
 )
 
 type listOptions struct {
diff --git a/cli/context/store/metadatastore.go b/cli/context/store/metadatastore.go
index df087164ff..0e9bc8889c 100644
--- a/cli/context/store/metadatastore.go
+++ b/cli/context/store/metadatastore.go
@@ -9,7 +9,7 @@ import (
 	"reflect"
 	"sort"
 
-	"vbom.ml/util/sortorder"
+	"github.com/fvbommel/sortorder"
 )
 
 const (
diff --git a/vendor.conf b/vendor.conf
index ec021569e9..a062c170ce 100755
--- a/vendor.conf
+++ b/vendor.conf
@@ -21,6 +21,7 @@ github.com/docker/go-metrics                        d466d4f6fd960e01820085bd7e1a
 github.com/docker/go-units                          519db1ee28dcc9fd2474ae59fca29a810482bfb1 # v0.4.0
 github.com/docker/swarmkit                          035d564a3686f5e348d861ec0c074ff26854c498
 github.com/evanphx/json-patch                       72bf35d0ff611848c1dc9df0f976c81192392fa5 # v4.1.0
+github.com/fvbommel/sortorder                       6b6b45a52fcc54f788363c1880630248b63402a1 # v1.0.0
 github.com/gofrs/flock                              392e7fae8f1b0bdbd67dad7237d23f618feb6dbb # v0.7.1
 github.com/gogo/googleapis                          01e0f9cca9b92166042241267ee2a5cdf5cff46c # v1.3.2
 github.com/gogo/protobuf                            5628607bb4c51c3157aacc3a50f0ab707582b805 # v1.3.1
@@ -95,6 +96,5 @@ k8s.io/kube-openapi                                 0270cf2f1c1d995d34b36019a6f6
 k8s.io/kubernetes                                   a17149e1a189050796ced469dbd78d380f2ed5ef # v1.16.9
 k8s.io/utils                                        69764acb6e8e900b7c05296c5d3c9c19545475f9
 sigs.k8s.io/yaml                                    fd68e9863619f6ec2fdd8625fe1f02e7c877e480 # v1.1.0
-vbom.ml/util                                        256737ac55c46798123f754ab7d2c784e2c71783
 
 # DO NOT EDIT BELOW THIS LINE -------- reserved for downstream projects --------
diff --git a/vendor/vbom.ml/util/LICENSE b/vendor/github.com/fvbommel/sortorder/LICENSE
similarity index 100%
rename from vendor/vbom.ml/util/LICENSE
rename to vendor/github.com/fvbommel/sortorder/LICENSE
diff --git a/vendor/github.com/fvbommel/sortorder/README.md b/vendor/github.com/fvbommel/sortorder/README.md
new file mode 100644
index 0000000000..1bb6324028
--- /dev/null
+++ b/vendor/github.com/fvbommel/sortorder/README.md
@@ -0,0 +1,5 @@
+# sortorder [![GoDoc](https://godoc.org/github.com/fvbommel/sortorder?status.svg)](https://godoc.org/github.com/fvbommel/sortorder)
+
+    import "github.com/fvbommel/sortorder"
+
+Sort orders and comparison functions.
diff --git a/vendor/vbom.ml/util/sortorder/doc.go b/vendor/github.com/fvbommel/sortorder/doc.go
similarity index 78%
rename from vendor/vbom.ml/util/sortorder/doc.go
rename to vendor/github.com/fvbommel/sortorder/doc.go
index 61b37a9374..75d5a2928f 100644
--- a/vendor/vbom.ml/util/sortorder/doc.go
+++ b/vendor/github.com/fvbommel/sortorder/doc.go
@@ -2,4 +2,4 @@
 //
 // Currently, it only implements so-called "natural order", where integers
 // embedded in strings are compared by value.
-package sortorder // import "vbom.ml/util/sortorder"
+package sortorder
diff --git a/vendor/github.com/fvbommel/sortorder/go.mod b/vendor/github.com/fvbommel/sortorder/go.mod
new file mode 100644
index 0000000000..36ab8fcdf4
--- /dev/null
+++ b/vendor/github.com/fvbommel/sortorder/go.mod
@@ -0,0 +1,5 @@
+module github.com/fvbommel/sortorder
+
+go 1.13
+
+require github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1
diff --git a/vendor/vbom.ml/util/sortorder/natsort.go b/vendor/github.com/fvbommel/sortorder/natsort.go
similarity index 97%
rename from vendor/vbom.ml/util/sortorder/natsort.go
rename to vendor/github.com/fvbommel/sortorder/natsort.go
index 1af08c1bd1..66a52c7125 100644
--- a/vendor/vbom.ml/util/sortorder/natsort.go
+++ b/vendor/github.com/fvbommel/sortorder/natsort.go
@@ -57,7 +57,7 @@ func NaturalLess(str1, str2 string) bool {
 			if len1, len2 := idx1-nonZero1, idx2-nonZero2; len1 != len2 {
 				return len1 < len2
 			}
-			// If they're not equal, string comparison is correct.
+			// If they're equal, string comparison is correct.
 			if nr1, nr2 := str1[nonZero1:idx1], str2[nonZero2:idx2]; nr1 != nr2 {
 				return nr1 < nr2
 			}
diff --git a/vendor/vbom.ml/util/README.md b/vendor/vbom.ml/util/README.md
deleted file mode 100644
index 72de507980..0000000000
--- a/vendor/vbom.ml/util/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-## util [![GoDoc](https://godoc.org/vbom.ml/util?status.svg)](https://godoc.org/vbom.ml/util)
-
-    import "vbom.ml/util"
-
-Go utility packages.
diff --git a/vendor/vbom.ml/util/sortorder/README.md b/vendor/vbom.ml/util/sortorder/README.md
deleted file mode 100644
index ed8da0e29b..0000000000
--- a/vendor/vbom.ml/util/sortorder/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-## sortorder [![GoDoc](https://godoc.org/vbom.ml/util/sortorder?status.svg)](https://godoc.org/vbom.ml/util/sortorder)
-
-    import "vbom.ml/util/sortorder"
-
-Sort orders and comparison functions.