diff --git a/cache/manager.go b/cache/manager.go
index 9d5d69e9..3d1e8843 100644
--- a/cache/manager.go
+++ b/cache/manager.go
@@ -16,7 +16,7 @@ import (
 	"github.com/moby/buildkit/client"
 	"github.com/moby/buildkit/identity"
 	"github.com/moby/buildkit/snapshot"
-	"github.com/opencontainers/go-digest"
+	digest "github.com/opencontainers/go-digest"
 	imagespecidentity "github.com/opencontainers/image-spec/identity"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
diff --git a/cache/manager_test.go b/cache/manager_test.go
index 77225b42..89ef3f20 100644
--- a/cache/manager_test.go
+++ b/cache/manager_test.go
@@ -24,7 +24,7 @@ import (
 	"github.com/moby/buildkit/snapshot"
 	containerdsnapshot "github.com/moby/buildkit/snapshot/containerd"
 	"github.com/moby/buildkit/util/leaseutil"
-	"github.com/opencontainers/go-digest"
+	digest "github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
diff --git a/cache/migrate_v2.go b/cache/migrate_v2.go
index 25c6d5be..e5bd8cee 100644
--- a/cache/migrate_v2.go
+++ b/cache/migrate_v2.go
@@ -13,7 +13,7 @@ import (
 	"github.com/containerd/containerd/snapshots"
 	"github.com/moby/buildkit/cache/metadata"
 	"github.com/moby/buildkit/snapshot"
-	"github.com/opencontainers/go-digest"
+	digest "github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/cache/refs.go b/cache/refs.go
index 83209348..91e41b14 100644
--- a/cache/refs.go
+++ b/cache/refs.go
@@ -17,7 +17,7 @@ import (
 	"github.com/moby/buildkit/snapshot"
 	"github.com/moby/buildkit/util/flightcontrol"
 	"github.com/moby/buildkit/util/leaseutil"
-	"github.com/opencontainers/go-digest"
+	digest "github.com/opencontainers/go-digest"
 	imagespecidentity "github.com/opencontainers/image-spec/identity"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
diff --git a/cache/remotecache/registry/registry.go b/cache/remotecache/registry/registry.go
index a172917a..7fe04e2d 100644
--- a/cache/remotecache/registry/registry.go
+++ b/cache/remotecache/registry/registry.go
@@ -10,7 +10,7 @@ import (
 	"github.com/moby/buildkit/session"
 	"github.com/moby/buildkit/util/contentutil"
 	"github.com/moby/buildkit/util/resolver"
-	"github.com/opencontainers/go-digest"
+	digest "github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
diff --git a/cmd/buildctl/build.go b/cmd/buildctl/build.go
index 1e882d5b..3150af11 100644
--- a/cmd/buildctl/build.go
+++ b/cmd/buildctl/build.go
@@ -16,7 +16,7 @@ import (
 	"github.com/moby/buildkit/session/sshforward/sshprovider"
 	"github.com/moby/buildkit/solver/pb"
 	"github.com/moby/buildkit/util/progress/progressui"
-	"github.com/opencontainers/go-digest"
+	digest "github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
diff --git a/executor/oci/user.go b/executor/oci/user.go
index 600d8a67..4f7cb107 100644
--- a/executor/oci/user.go
+++ b/executor/oci/user.go
@@ -10,7 +10,7 @@ import (
 	containerdoci "github.com/containerd/containerd/oci"
 	"github.com/containerd/continuity/fs"
 	"github.com/opencontainers/runc/libcontainer/user"
-	"github.com/opencontainers/runtime-spec/specs-go"
+	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
 )
 
diff --git a/session/content/content_test.go b/session/content/content_test.go
index a3cfc0b9..89f4ccd8 100644
--- a/session/content/content_test.go
+++ b/session/content/content_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/containerd/containerd/content/local"
 	"github.com/moby/buildkit/session"
 	"github.com/moby/buildkit/session/testutil"
-	"github.com/opencontainers/go-digest"
+	digest "github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/snapshot/containerd/content.go b/snapshot/containerd/content.go
index 8e42d425..1be21e90 100644
--- a/snapshot/containerd/content.go
+++ b/snapshot/containerd/content.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/containerd/containerd/content"
 	"github.com/containerd/containerd/namespaces"
-	"github.com/opencontainers/go-digest"
+	digest "github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
 )
diff --git a/solver/errdefs/vertex.go b/solver/errdefs/vertex.go
index adc5e378..ade10a4b 100644
--- a/solver/errdefs/vertex.go
+++ b/solver/errdefs/vertex.go
@@ -2,7 +2,7 @@ package errdefs
 
 import (
 	"github.com/moby/buildkit/util/grpcerrors"
-	"github.com/opencontainers/go-digest"
+	digest "github.com/opencontainers/go-digest"
 )
 
 type VertexError struct {
diff --git a/util/network/cniprovider/cni.go b/util/network/cniprovider/cni.go
index 29d5287f..a5e5c009 100644
--- a/util/network/cniprovider/cni.go
+++ b/util/network/cniprovider/cni.go
@@ -7,7 +7,7 @@ import (
 	"syscall"
 
 	"github.com/containerd/containerd/oci"
-	"github.com/containerd/go-cni"
+	cni "github.com/containerd/go-cni"
 	"github.com/gofrs/flock"
 	"github.com/moby/buildkit/identity"
 	"github.com/moby/buildkit/util/network"
diff --git a/util/rootless/specconv/specconv_linux.go b/util/rootless/specconv/specconv_linux.go
index 12646e43..7118f8d6 100644
--- a/util/rootless/specconv/specconv_linux.go
+++ b/util/rootless/specconv/specconv_linux.go
@@ -3,7 +3,7 @@ package specconv
 import (
 	"strings"
 
-	"github.com/opencontainers/runtime-spec/specs-go"
+	specs "github.com/opencontainers/runtime-spec/specs-go"
 )
 
 // ToRootless converts spec to be compatible with "rootless" runc.