diff --git a/cache/remotecache/export.go b/cache/remotecache/export.go
index 40a36759d884..0536ba2a846e 100644
--- a/cache/remotecache/export.go
+++ b/cache/remotecache/export.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/containerd/containerd/content"
 	"github.com/containerd/containerd/images"
-	"github.com/docker/distribution/manifest"
 	v1 "github.com/moby/buildkit/cache/remotecache/v1"
 	"github.com/moby/buildkit/session"
 	"github.com/moby/buildkit/solver"
@@ -17,6 +16,7 @@ import (
 	"github.com/moby/buildkit/util/progress"
 	"github.com/moby/buildkit/util/push"
 	digest "github.com/opencontainers/go-digest"
+	specs "github.com/opencontainers/image-spec/specs-go"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
 )
@@ -46,7 +46,9 @@ func (ce *CacheExporter) Finalize(ctx context.Context, cc *v1.CacheChains, targe
 
 	// own type because oci type can't be pushed and docker type doesn't have annotations
 	type manifestList struct {
-		manifest.Versioned
+		specs.Versioned
+
+		MediaType string `json:"mediaType,omitempty"`
 
 		// Manifests references platform specific manifests.
 		Manifests []ocispec.Descriptor `json:"manifests"`
diff --git a/client/client_test.go b/client/client_test.go
index c8e90e77a53c..8f55dd391b2d 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -22,7 +22,6 @@ import (
 	"github.com/containerd/containerd/namespaces"
 	"github.com/containerd/containerd/snapshots"
 	"github.com/containerd/continuity/fs/fstest"
-	"github.com/docker/distribution/manifest/schema2"
 	"github.com/moby/buildkit/client/llb"
 	"github.com/moby/buildkit/identity"
 	"github.com/moby/buildkit/util/testutil/httpserver"
@@ -612,11 +611,15 @@ func testBuildPushAndValidate(t *testing.T, sb integration.Sandbox) {
 	dt, err = content.ReadBlob(ctx, img.ContentStore(), img.Target())
 	require.NoError(t, err)
 
-	var mfst schema2.Manifest
+	var mfst = struct {
+		MediaType string `json:"mediaType,omitempty"`
+		ocispec.Manifest
+	}{}
+
 	err = json.Unmarshal(dt, &mfst)
 	require.NoError(t, err)
 
-	require.Equal(t, schema2.MediaTypeManifest, mfst.MediaType)
+	require.Equal(t, images.MediaTypeDockerSchema2Manifest, mfst.MediaType)
 	require.Equal(t, 2, len(mfst.Layers))
 
 	dt, err = content.ReadBlob(ctx, img.ContentStore(), ocispec.Descriptor{Digest: mfst.Layers[0].Digest})
diff --git a/exporter/containerimage/export.go b/exporter/containerimage/export.go
index 40aa992bd530..820993490eff 100644
--- a/exporter/containerimage/export.go
+++ b/exporter/containerimage/export.go
@@ -20,6 +20,7 @@ const (
 	keyPush             = "push"
 	keyInsecure         = "registry.insecure"
 	exporterImageConfig = "containerimage.config"
+	ociTypes            = "oci-mediatypes"
 )
 
 type Opt struct {
@@ -69,6 +70,16 @@ func (e *imageExporter) Resolve(ctx context.Context, opt map[string]string) (exp
 			i.insecure = b
 		case exporterImageConfig:
 			i.config = []byte(v)
+		case ociTypes:
+			if v == "" {
+				i.ociTypes = true
+				continue
+			}
+			b, err := strconv.ParseBool(v)
+			if err != nil {
+				return nil, errors.Wrapf(err, "non-bool value specified for %s", k)
+			}
+			i.ociTypes = b
 		default:
 			logrus.Warnf("image exporter: unknown option %s", k)
 		}
@@ -81,6 +92,7 @@ type imageExporterInstance struct {
 	targetName string
 	push       bool
 	insecure   bool
+	ociTypes   bool
 	config     []byte
 }
 
@@ -92,7 +104,7 @@ func (e *imageExporterInstance) Export(ctx context.Context, ref cache.ImmutableR
 	if config, ok := opt[exporterImageConfig]; ok {
 		e.config = config
 	}
-	desc, err := e.opt.ImageWriter.Commit(ctx, ref, e.config)
+	desc, err := e.opt.ImageWriter.Commit(ctx, ref, e.config, e.ociTypes)
 	if err != nil {
 		return nil, err
 	}
diff --git a/exporter/containerimage/writer.go b/exporter/containerimage/writer.go
index 6ab4851aa9ac..8570ebef2223 100644
--- a/exporter/containerimage/writer.go
+++ b/exporter/containerimage/writer.go
@@ -10,14 +10,14 @@ import (
 
 	"github.com/containerd/containerd/content"
 	"github.com/containerd/containerd/diff"
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/manifest/schema2"
+	"github.com/containerd/containerd/images"
 	"github.com/moby/buildkit/cache"
 	"github.com/moby/buildkit/cache/blobs"
 	"github.com/moby/buildkit/snapshot"
 	"github.com/moby/buildkit/util/progress"
 	"github.com/moby/buildkit/util/system"
 	digest "github.com/opencontainers/go-digest"
+	specs "github.com/opencontainers/image-spec/specs-go"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -41,7 +41,7 @@ type ImageWriter struct {
 	opt WriterOpt
 }
 
-func (ic *ImageWriter) Commit(ctx context.Context, ref cache.ImmutableRef, config []byte) (*ocispec.Descriptor, error) {
+func (ic *ImageWriter) Commit(ctx context.Context, ref cache.ImmutableRef, config []byte, oci bool) (*ocispec.Descriptor, error) {
 	layersDone := oneOffProgress(ctx, "exporting layers")
 	diffPairs, err := blobs.GetDiffPairs(ctx, ic.opt.ContentStore, ic.opt.Snapshotter, ic.opt.Differ, ref, true)
 	if err != nil {
@@ -68,17 +68,39 @@ func (ic *ImageWriter) Commit(ctx context.Context, ref cache.ImmutableRef, confi
 		return nil, err
 	}
 
-	configDigest := digest.FromBytes(config)
-
-	mfst := schema2.Manifest{
-		Config: distribution.Descriptor{
-			Digest:    configDigest,
-			Size:      int64(len(config)),
-			MediaType: schema2.MediaTypeImageConfig,
+	var (
+		configDigest = digest.FromBytes(config)
+		manifestType = ocispec.MediaTypeImageManifest
+		configType   = ocispec.MediaTypeImageConfig
+		layerType    = ocispec.MediaTypeImageLayerGzip
+	)
+
+	// Use docker media types for older Docker versions and registries
+	if !oci {
+		manifestType = images.MediaTypeDockerSchema2Manifest
+		configType = images.MediaTypeDockerSchema2Config
+		layerType = images.MediaTypeDockerSchema2LayerGzip
+	}
+
+	mfst := struct {
+		// MediaType is reserved in the OCI spec but
+		// excluded from go types.
+		MediaType string `json:"mediaType,omitempty"`
+
+		ocispec.Manifest
+	}{
+		MediaType: manifestType,
+		Manifest: ocispec.Manifest{
+			Versioned: specs.Versioned{
+				SchemaVersion: 2,
+			},
+			Config: ocispec.Descriptor{
+				Digest:    configDigest,
+				Size:      int64(len(config)),
+				MediaType: configType,
+			},
 		},
 	}
-	mfst.SchemaVersion = 2
-	mfst.MediaType = schema2.MediaTypeManifest
 
 	labels := map[string]string{
 		"containerd.io/gc.ref.content.0": configDigest.String(),
@@ -89,15 +111,15 @@ func (ic *ImageWriter) Commit(ctx context.Context, ref cache.ImmutableRef, confi
 		if err != nil {
 			return nil, errors.Wrapf(err, "could not find blob %s from contentstore", dp.Blobsum)
 		}
-		mfst.Layers = append(mfst.Layers, distribution.Descriptor{
+		mfst.Layers = append(mfst.Layers, ocispec.Descriptor{
 			Digest:    dp.Blobsum,
 			Size:      info.Size,
-			MediaType: schema2.MediaTypeLayer,
+			MediaType: layerType,
 		})
 		labels[fmt.Sprintf("containerd.io/gc.ref.content.%d", i+1)] = dp.Blobsum.String()
 	}
 
-	mfstJSON, err := json.Marshal(mfst)
+	mfstJSON, err := json.MarshalIndent(mfst, "", "   ")
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to marshal manifest")
 	}
@@ -115,8 +137,9 @@ func (ic *ImageWriter) Commit(ctx context.Context, ref cache.ImmutableRef, confi
 	mfstDone(nil)
 
 	configDesc := ocispec.Descriptor{
-		Digest: configDigest,
-		Size:   int64(len(config)),
+		Digest:    configDigest,
+		Size:      int64(len(config)),
+		MediaType: configType,
 	}
 	configDone := oneOffProgress(ctx, "exporting config "+configDigest.String())
 
@@ -133,7 +156,7 @@ func (ic *ImageWriter) Commit(ctx context.Context, ref cache.ImmutableRef, confi
 	return &ocispec.Descriptor{
 		Digest:    mfstDigest,
 		Size:      int64(len(mfstJSON)),
-		MediaType: ocispec.MediaTypeImageManifest,
+		MediaType: manifestType,
 	}, nil
 }
 
diff --git a/exporter/oci/export.go b/exporter/oci/export.go
index d800ea852b89..948a29d49b08 100644
--- a/exporter/oci/export.go
+++ b/exporter/oci/export.go
@@ -2,6 +2,7 @@ package oci
 
 import (
 	"context"
+	"strconv"
 	"time"
 
 	"github.com/containerd/containerd/images"
@@ -26,6 +27,7 @@ const (
 	keyImageName        = "name"
 	VariantOCI          = "oci"
 	VariantDocker       = "docker"
+	ociTypes            = "oci-mediatypes"
 )
 
 type Opt struct {
@@ -57,6 +59,7 @@ func (e *imageExporter) Resolve(ctx context.Context, opt map[string]string) (exp
 		return nil, err
 	}
 
+	var ot *bool
 	i := &imageExporterInstance{imageExporter: e, caller: caller}
 	for k, v := range opt {
 		switch k {
@@ -68,18 +71,35 @@ func (e *imageExporter) Resolve(ctx context.Context, opt map[string]string) (exp
 				return nil, errors.Wrapf(err, "failed to parse %s", v)
 			}
 			i.name = reference.TagNameOnly(parsed).String()
+		case ociTypes:
+			ot = new(bool)
+			if v == "" {
+				*ot = true
+				continue
+			}
+			b, err := strconv.ParseBool(v)
+			if err != nil {
+				return nil, errors.Wrapf(err, "non-bool value specified for %s", k)
+			}
+			*ot = b
 		default:
 			logrus.Warnf("oci exporter: unknown option %s", k)
 		}
 	}
+	if ot == nil {
+		i.ociTypes = e.opt.Variant == VariantOCI
+	} else {
+		i.ociTypes = *ot
+	}
 	return i, nil
 }
 
 type imageExporterInstance struct {
 	*imageExporter
-	config []byte
-	caller session.Caller
-	name   string
+	config   []byte
+	caller   session.Caller
+	name     string
+	ociTypes bool
 }
 
 func (e *imageExporterInstance) Name() string {
@@ -90,7 +110,7 @@ func (e *imageExporterInstance) Export(ctx context.Context, ref cache.ImmutableR
 	if config, ok := opt[exporterImageConfig]; ok {
 		e.config = config
 	}
-	desc, err := e.opt.ImageWriter.Commit(ctx, ref, e.config)
+	desc, err := e.opt.ImageWriter.Commit(ctx, ref, e.config, e.ociTypes)
 	if err != nil {
 		return nil, err
 	}
diff --git a/util/imageutil/config.go b/util/imageutil/config.go
index c9d5e391ff4e..3e6f26a350e3 100644
--- a/util/imageutil/config.go
+++ b/util/imageutil/config.go
@@ -139,13 +139,17 @@ func DetectManifestMediaType(ra content.ReaderAt) (string, error) {
 	}
 
 	var mfst struct {
-		Config json.RawMessage `json:"config"`
+		MediaType string          `json:"mediaType"`
+		Config    json.RawMessage `json:"config"`
 	}
 
 	if err := json.Unmarshal(p, &mfst); err != nil {
 		return "", err
 	}
 
+	if mfst.MediaType != "" {
+		return mfst.MediaType, nil
+	}
 	if mfst.Config != nil {
 		return images.MediaTypeDockerSchema2Manifest, nil
 	}
diff --git a/vendor/github.com/docker/distribution/blobs.go b/vendor/github.com/docker/distribution/blobs.go
deleted file mode 100644
index 145b078532b8..000000000000
--- a/vendor/github.com/docker/distribution/blobs.go
+++ /dev/null
@@ -1,257 +0,0 @@
-package distribution
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"time"
-
-	"github.com/docker/distribution/reference"
-	"github.com/opencontainers/go-digest"
-)
-
-var (
-	// ErrBlobExists returned when blob already exists
-	ErrBlobExists = errors.New("blob exists")
-
-	// ErrBlobDigestUnsupported when blob digest is an unsupported version.
-	ErrBlobDigestUnsupported = errors.New("unsupported blob digest")
-
-	// ErrBlobUnknown when blob is not found.
-	ErrBlobUnknown = errors.New("unknown blob")
-
-	// ErrBlobUploadUnknown returned when upload is not found.
-	ErrBlobUploadUnknown = errors.New("blob upload unknown")
-
-	// ErrBlobInvalidLength returned when the blob has an expected length on
-	// commit, meaning mismatched with the descriptor or an invalid value.
-	ErrBlobInvalidLength = errors.New("blob invalid length")
-)
-
-// ErrBlobInvalidDigest returned when digest check fails.
-type ErrBlobInvalidDigest struct {
-	Digest digest.Digest
-	Reason error
-}
-
-func (err ErrBlobInvalidDigest) Error() string {
-	return fmt.Sprintf("invalid digest for referenced layer: %v, %v",
-		err.Digest, err.Reason)
-}
-
-// ErrBlobMounted returned when a blob is mounted from another repository
-// instead of initiating an upload session.
-type ErrBlobMounted struct {
-	From       reference.Canonical
-	Descriptor Descriptor
-}
-
-func (err ErrBlobMounted) Error() string {
-	return fmt.Sprintf("blob mounted from: %v to: %v",
-		err.From, err.Descriptor)
-}
-
-// Descriptor describes targeted content. Used in conjunction with a blob
-// store, a descriptor can be used to fetch, store and target any kind of
-// blob. The struct also describes the wire protocol format. Fields should
-// only be added but never changed.
-type Descriptor struct {
-	// MediaType describe the type of the content. All text based formats are
-	// encoded as utf-8.
-	MediaType string `json:"mediaType,omitempty"`
-
-	// Size in bytes of content.
-	Size int64 `json:"size,omitempty"`
-
-	// Digest uniquely identifies the content. A byte stream can be verified
-	// against against this digest.
-	Digest digest.Digest `json:"digest,omitempty"`
-
-	// URLs contains the source URLs of this content.
-	URLs []string `json:"urls,omitempty"`
-
-	// NOTE: Before adding a field here, please ensure that all
-	// other options have been exhausted. Much of the type relationships
-	// depend on the simplicity of this type.
-}
-
-// Descriptor returns the descriptor, to make it satisfy the Describable
-// interface. Note that implementations of Describable are generally objects
-// which can be described, not simply descriptors; this exception is in place
-// to make it more convenient to pass actual descriptors to functions that
-// expect Describable objects.
-func (d Descriptor) Descriptor() Descriptor {
-	return d
-}
-
-// BlobStatter makes blob descriptors available by digest. The service may
-// provide a descriptor of a different digest if the provided digest is not
-// canonical.
-type BlobStatter interface {
-	// Stat provides metadata about a blob identified by the digest. If the
-	// blob is unknown to the describer, ErrBlobUnknown will be returned.
-	Stat(ctx context.Context, dgst digest.Digest) (Descriptor, error)
-}
-
-// BlobDeleter enables deleting blobs from storage.
-type BlobDeleter interface {
-	Delete(ctx context.Context, dgst digest.Digest) error
-}
-
-// BlobEnumerator enables iterating over blobs from storage
-type BlobEnumerator interface {
-	Enumerate(ctx context.Context, ingester func(dgst digest.Digest) error) error
-}
-
-// BlobDescriptorService manages metadata about a blob by digest. Most
-// implementations will not expose such an interface explicitly. Such mappings
-// should be maintained by interacting with the BlobIngester. Hence, this is
-// left off of BlobService and BlobStore.
-type BlobDescriptorService interface {
-	BlobStatter
-
-	// SetDescriptor assigns the descriptor to the digest. The provided digest and
-	// the digest in the descriptor must map to identical content but they may
-	// differ on their algorithm. The descriptor must have the canonical
-	// digest of the content and the digest algorithm must match the
-	// annotators canonical algorithm.
-	//
-	// Such a facility can be used to map blobs between digest domains, with
-	// the restriction that the algorithm of the descriptor must match the
-	// canonical algorithm (ie sha256) of the annotator.
-	SetDescriptor(ctx context.Context, dgst digest.Digest, desc Descriptor) error
-
-	// Clear enables descriptors to be unlinked
-	Clear(ctx context.Context, dgst digest.Digest) error
-}
-
-// BlobDescriptorServiceFactory creates middleware for BlobDescriptorService.
-type BlobDescriptorServiceFactory interface {
-	BlobAccessController(svc BlobDescriptorService) BlobDescriptorService
-}
-
-// ReadSeekCloser is the primary reader type for blob data, combining
-// io.ReadSeeker with io.Closer.
-type ReadSeekCloser interface {
-	io.ReadSeeker
-	io.Closer
-}
-
-// BlobProvider describes operations for getting blob data.
-type BlobProvider interface {
-	// Get returns the entire blob identified by digest along with the descriptor.
-	Get(ctx context.Context, dgst digest.Digest) ([]byte, error)
-
-	// Open provides a ReadSeekCloser to the blob identified by the provided
-	// descriptor. If the blob is not known to the service, an error will be
-	// returned.
-	Open(ctx context.Context, dgst digest.Digest) (ReadSeekCloser, error)
-}
-
-// BlobServer can serve blobs via http.
-type BlobServer interface {
-	// ServeBlob attempts to serve the blob, identified by dgst, via http. The
-	// service may decide to redirect the client elsewhere or serve the data
-	// directly.
-	//
-	// This handler only issues successful responses, such as 2xx or 3xx,
-	// meaning it serves data or issues a redirect. If the blob is not
-	// available, an error will be returned and the caller may still issue a
-	// response.
-	//
-	// The implementation may serve the same blob from a different digest
-	// domain. The appropriate headers will be set for the blob, unless they
-	// have already been set by the caller.
-	ServeBlob(ctx context.Context, w http.ResponseWriter, r *http.Request, dgst digest.Digest) error
-}
-
-// BlobIngester ingests blob data.
-type BlobIngester interface {
-	// Put inserts the content p into the blob service, returning a descriptor
-	// or an error.
-	Put(ctx context.Context, mediaType string, p []byte) (Descriptor, error)
-
-	// Create allocates a new blob writer to add a blob to this service. The
-	// returned handle can be written to and later resumed using an opaque
-	// identifier. With this approach, one can Close and Resume a BlobWriter
-	// multiple times until the BlobWriter is committed or cancelled.
-	Create(ctx context.Context, options ...BlobCreateOption) (BlobWriter, error)
-
-	// Resume attempts to resume a write to a blob, identified by an id.
-	Resume(ctx context.Context, id string) (BlobWriter, error)
-}
-
-// BlobCreateOption is a general extensible function argument for blob creation
-// methods. A BlobIngester may choose to honor any or none of the given
-// BlobCreateOptions, which can be specific to the implementation of the
-// BlobIngester receiving them.
-// TODO (brianbland): unify this with ManifestServiceOption in the future
-type BlobCreateOption interface {
-	Apply(interface{}) error
-}
-
-// CreateOptions is a collection of blob creation modifiers relevant to general
-// blob storage intended to be configured by the BlobCreateOption.Apply method.
-type CreateOptions struct {
-	Mount struct {
-		ShouldMount bool
-		From        reference.Canonical
-		// Stat allows to pass precalculated descriptor to link and return.
-		// Blob access check will be skipped if set.
-		Stat *Descriptor
-	}
-}
-
-// BlobWriter provides a handle for inserting data into a blob store.
-// Instances should be obtained from BlobWriteService.Writer and
-// BlobWriteService.Resume. If supported by the store, a writer can be
-// recovered with the id.
-type BlobWriter interface {
-	io.WriteCloser
-	io.ReaderFrom
-
-	// Size returns the number of bytes written to this blob.
-	Size() int64
-
-	// ID returns the identifier for this writer. The ID can be used with the
-	// Blob service to later resume the write.
-	ID() string
-
-	// StartedAt returns the time this blob write was started.
-	StartedAt() time.Time
-
-	// Commit completes the blob writer process. The content is verified
-	// against the provided provisional descriptor, which may result in an
-	// error. Depending on the implementation, written data may be validated
-	// against the provisional descriptor fields. If MediaType is not present,
-	// the implementation may reject the commit or assign "application/octet-
-	// stream" to the blob. The returned descriptor may have a different
-	// digest depending on the blob store, referred to as the canonical
-	// descriptor.
-	Commit(ctx context.Context, provisional Descriptor) (canonical Descriptor, err error)
-
-	// Cancel ends the blob write without storing any data and frees any
-	// associated resources. Any data written thus far will be lost. Cancel
-	// implementations should allow multiple calls even after a commit that
-	// result in a no-op. This allows use of Cancel in a defer statement,
-	// increasing the assurance that it is correctly called.
-	Cancel(ctx context.Context) error
-}
-
-// BlobService combines the operations to access, read and write blobs. This
-// can be used to describe remote blob services.
-type BlobService interface {
-	BlobStatter
-	BlobProvider
-	BlobIngester
-}
-
-// BlobStore represent the entire suite of blob related operations. Such an
-// implementation can access, read, write, delete and serve blobs.
-type BlobStore interface {
-	BlobService
-	BlobServer
-	BlobDeleter
-}
diff --git a/vendor/github.com/docker/distribution/doc.go b/vendor/github.com/docker/distribution/doc.go
deleted file mode 100644
index bdd8cb708e5d..000000000000
--- a/vendor/github.com/docker/distribution/doc.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// Package distribution will define the interfaces for the components of
-// docker distribution. The goal is to allow users to reliably package, ship
-// and store content related to docker images.
-//
-// This is currently a work in progress. More details are available in the
-// README.md.
-package distribution
diff --git a/vendor/github.com/docker/distribution/errors.go b/vendor/github.com/docker/distribution/errors.go
deleted file mode 100644
index 020d33258b91..000000000000
--- a/vendor/github.com/docker/distribution/errors.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package distribution
-
-import (
-	"errors"
-	"fmt"
-	"strings"
-
-	"github.com/opencontainers/go-digest"
-)
-
-// ErrAccessDenied is returned when an access to a requested resource is
-// denied.
-var ErrAccessDenied = errors.New("access denied")
-
-// ErrManifestNotModified is returned when a conditional manifest GetByTag
-// returns nil due to the client indicating it has the latest version
-var ErrManifestNotModified = errors.New("manifest not modified")
-
-// ErrUnsupported is returned when an unimplemented or unsupported action is
-// performed
-var ErrUnsupported = errors.New("operation unsupported")
-
-// ErrTagUnknown is returned if the given tag is not known by the tag service
-type ErrTagUnknown struct {
-	Tag string
-}
-
-func (err ErrTagUnknown) Error() string {
-	return fmt.Sprintf("unknown tag=%s", err.Tag)
-}
-
-// ErrRepositoryUnknown is returned if the named repository is not known by
-// the registry.
-type ErrRepositoryUnknown struct {
-	Name string
-}
-
-func (err ErrRepositoryUnknown) Error() string {
-	return fmt.Sprintf("unknown repository name=%s", err.Name)
-}
-
-// ErrRepositoryNameInvalid should be used to denote an invalid repository
-// name. Reason may set, indicating the cause of invalidity.
-type ErrRepositoryNameInvalid struct {
-	Name   string
-	Reason error
-}
-
-func (err ErrRepositoryNameInvalid) Error() string {
-	return fmt.Sprintf("repository name %q invalid: %v", err.Name, err.Reason)
-}
-
-// ErrManifestUnknown is returned if the manifest is not known by the
-// registry.
-type ErrManifestUnknown struct {
-	Name string
-	Tag  string
-}
-
-func (err ErrManifestUnknown) Error() string {
-	return fmt.Sprintf("unknown manifest name=%s tag=%s", err.Name, err.Tag)
-}
-
-// ErrManifestUnknownRevision is returned when a manifest cannot be found by
-// revision within a repository.
-type ErrManifestUnknownRevision struct {
-	Name     string
-	Revision digest.Digest
-}
-
-func (err ErrManifestUnknownRevision) Error() string {
-	return fmt.Sprintf("unknown manifest name=%s revision=%s", err.Name, err.Revision)
-}
-
-// ErrManifestUnverified is returned when the registry is unable to verify
-// the manifest.
-type ErrManifestUnverified struct{}
-
-func (ErrManifestUnverified) Error() string {
-	return "unverified manifest"
-}
-
-// ErrManifestVerification provides a type to collect errors encountered
-// during manifest verification. Currently, it accepts errors of all types,
-// but it may be narrowed to those involving manifest verification.
-type ErrManifestVerification []error
-
-func (errs ErrManifestVerification) Error() string {
-	var parts []string
-	for _, err := range errs {
-		parts = append(parts, err.Error())
-	}
-
-	return fmt.Sprintf("errors verifying manifest: %v", strings.Join(parts, ","))
-}
-
-// ErrManifestBlobUnknown returned when a referenced blob cannot be found.
-type ErrManifestBlobUnknown struct {
-	Digest digest.Digest
-}
-
-func (err ErrManifestBlobUnknown) Error() string {
-	return fmt.Sprintf("unknown blob %v on manifest", err.Digest)
-}
-
-// ErrManifestNameInvalid should be used to denote an invalid manifest
-// name. Reason may set, indicating the cause of invalidity.
-type ErrManifestNameInvalid struct {
-	Name   string
-	Reason error
-}
-
-func (err ErrManifestNameInvalid) Error() string {
-	return fmt.Sprintf("manifest name %q invalid: %v", err.Name, err.Reason)
-}
diff --git a/vendor/github.com/docker/distribution/manifest/doc.go b/vendor/github.com/docker/distribution/manifest/doc.go
deleted file mode 100644
index 88367b0a05ff..000000000000
--- a/vendor/github.com/docker/distribution/manifest/doc.go
+++ /dev/null
@@ -1 +0,0 @@
-package manifest
diff --git a/vendor/github.com/docker/distribution/manifest/schema2/builder.go b/vendor/github.com/docker/distribution/manifest/schema2/builder.go
deleted file mode 100644
index 3facaae62e6f..000000000000
--- a/vendor/github.com/docker/distribution/manifest/schema2/builder.go
+++ /dev/null
@@ -1,85 +0,0 @@
-package schema2
-
-import (
-	"context"
-
-	"github.com/docker/distribution"
-	"github.com/opencontainers/go-digest"
-)
-
-// builder is a type for constructing manifests.
-type builder struct {
-	// bs is a BlobService used to publish the configuration blob.
-	bs distribution.BlobService
-
-	// configMediaType is media type used to describe configuration
-	configMediaType string
-
-	// configJSON references
-	configJSON []byte
-
-	// dependencies is a list of descriptors that gets built by successive
-	// calls to AppendReference. In case of image configuration these are layers.
-	dependencies []distribution.Descriptor
-}
-
-// NewManifestBuilder is used to build new manifests for the current schema
-// version. It takes a BlobService so it can publish the configuration blob
-// as part of the Build process.
-func NewManifestBuilder(bs distribution.BlobService, configMediaType string, configJSON []byte) distribution.ManifestBuilder {
-	mb := &builder{
-		bs:              bs,
-		configMediaType: configMediaType,
-		configJSON:      make([]byte, len(configJSON)),
-	}
-	copy(mb.configJSON, configJSON)
-
-	return mb
-}
-
-// Build produces a final manifest from the given references.
-func (mb *builder) Build(ctx context.Context) (distribution.Manifest, error) {
-	m := Manifest{
-		Versioned: SchemaVersion,
-		Layers:    make([]distribution.Descriptor, len(mb.dependencies)),
-	}
-	copy(m.Layers, mb.dependencies)
-
-	configDigest := digest.FromBytes(mb.configJSON)
-
-	var err error
-	m.Config, err = mb.bs.Stat(ctx, configDigest)
-	switch err {
-	case nil:
-		// Override MediaType, since Put always replaces the specified media
-		// type with application/octet-stream in the descriptor it returns.
-		m.Config.MediaType = mb.configMediaType
-		return FromStruct(m)
-	case distribution.ErrBlobUnknown:
-		// nop
-	default:
-		return nil, err
-	}
-
-	// Add config to the blob store
-	m.Config, err = mb.bs.Put(ctx, mb.configMediaType, mb.configJSON)
-	// Override MediaType, since Put always replaces the specified media
-	// type with application/octet-stream in the descriptor it returns.
-	m.Config.MediaType = mb.configMediaType
-	if err != nil {
-		return nil, err
-	}
-
-	return FromStruct(m)
-}
-
-// AppendReference adds a reference to the current ManifestBuilder.
-func (mb *builder) AppendReference(d distribution.Describable) error {
-	mb.dependencies = append(mb.dependencies, d.Descriptor())
-	return nil
-}
-
-// References returns the current references added to this builder.
-func (mb *builder) References() []distribution.Descriptor {
-	return mb.dependencies
-}
diff --git a/vendor/github.com/docker/distribution/manifest/schema2/manifest.go b/vendor/github.com/docker/distribution/manifest/schema2/manifest.go
deleted file mode 100644
index a2708c75098e..000000000000
--- a/vendor/github.com/docker/distribution/manifest/schema2/manifest.go
+++ /dev/null
@@ -1,138 +0,0 @@
-package schema2
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/manifest"
-	"github.com/opencontainers/go-digest"
-)
-
-const (
-	// MediaTypeManifest specifies the mediaType for the current version.
-	MediaTypeManifest = "application/vnd.docker.distribution.manifest.v2+json"
-
-	// MediaTypeImageConfig specifies the mediaType for the image configuration.
-	MediaTypeImageConfig = "application/vnd.docker.container.image.v1+json"
-
-	// MediaTypePluginConfig specifies the mediaType for plugin configuration.
-	MediaTypePluginConfig = "application/vnd.docker.plugin.v1+json"
-
-	// MediaTypeLayer is the mediaType used for layers referenced by the
-	// manifest.
-	MediaTypeLayer = "application/vnd.docker.image.rootfs.diff.tar.gzip"
-
-	// MediaTypeForeignLayer is the mediaType used for layers that must be
-	// downloaded from foreign URLs.
-	MediaTypeForeignLayer = "application/vnd.docker.image.rootfs.foreign.diff.tar.gzip"
-
-	// MediaTypeUncompressedLayer is the mediaType used for layers which
-	// are not compressed.
-	MediaTypeUncompressedLayer = "application/vnd.docker.image.rootfs.diff.tar"
-)
-
-var (
-	// SchemaVersion provides a pre-initialized version structure for this
-	// packages version of the manifest.
-	SchemaVersion = manifest.Versioned{
-		SchemaVersion: 2,
-		MediaType:     MediaTypeManifest,
-	}
-)
-
-func init() {
-	schema2Func := func(b []byte) (distribution.Manifest, distribution.Descriptor, error) {
-		m := new(DeserializedManifest)
-		err := m.UnmarshalJSON(b)
-		if err != nil {
-			return nil, distribution.Descriptor{}, err
-		}
-
-		dgst := digest.FromBytes(b)
-		return m, distribution.Descriptor{Digest: dgst, Size: int64(len(b)), MediaType: MediaTypeManifest}, err
-	}
-	err := distribution.RegisterManifestSchema(MediaTypeManifest, schema2Func)
-	if err != nil {
-		panic(fmt.Sprintf("Unable to register manifest: %s", err))
-	}
-}
-
-// Manifest defines a schema2 manifest.
-type Manifest struct {
-	manifest.Versioned
-
-	// Config references the image configuration as a blob.
-	Config distribution.Descriptor `json:"config"`
-
-	// Layers lists descriptors for the layers referenced by the
-	// configuration.
-	Layers []distribution.Descriptor `json:"layers"`
-}
-
-// References returnes the descriptors of this manifests references.
-func (m Manifest) References() []distribution.Descriptor {
-	references := make([]distribution.Descriptor, 0, 1+len(m.Layers))
-	references = append(references, m.Config)
-	references = append(references, m.Layers...)
-	return references
-}
-
-// Target returns the target of this signed manifest.
-func (m Manifest) Target() distribution.Descriptor {
-	return m.Config
-}
-
-// DeserializedManifest wraps Manifest with a copy of the original JSON.
-// It satisfies the distribution.Manifest interface.
-type DeserializedManifest struct {
-	Manifest
-
-	// canonical is the canonical byte representation of the Manifest.
-	canonical []byte
-}
-
-// FromStruct takes a Manifest structure, marshals it to JSON, and returns a
-// DeserializedManifest which contains the manifest and its JSON representation.
-func FromStruct(m Manifest) (*DeserializedManifest, error) {
-	var deserialized DeserializedManifest
-	deserialized.Manifest = m
-
-	var err error
-	deserialized.canonical, err = json.MarshalIndent(&m, "", "   ")
-	return &deserialized, err
-}
-
-// UnmarshalJSON populates a new Manifest struct from JSON data.
-func (m *DeserializedManifest) UnmarshalJSON(b []byte) error {
-	m.canonical = make([]byte, len(b), len(b))
-	// store manifest in canonical
-	copy(m.canonical, b)
-
-	// Unmarshal canonical JSON into Manifest object
-	var manifest Manifest
-	if err := json.Unmarshal(m.canonical, &manifest); err != nil {
-		return err
-	}
-
-	m.Manifest = manifest
-
-	return nil
-}
-
-// MarshalJSON returns the contents of canonical. If canonical is empty,
-// marshals the inner contents.
-func (m *DeserializedManifest) MarshalJSON() ([]byte, error) {
-	if len(m.canonical) > 0 {
-		return m.canonical, nil
-	}
-
-	return nil, errors.New("JSON representation not initialized in DeserializedManifest")
-}
-
-// Payload returns the raw content of the manifest. The contents can be used to
-// calculate the content identifier.
-func (m DeserializedManifest) Payload() (string, []byte, error) {
-	return m.MediaType, m.canonical, nil
-}
diff --git a/vendor/github.com/docker/distribution/manifest/versioned.go b/vendor/github.com/docker/distribution/manifest/versioned.go
deleted file mode 100644
index caa6b14e8850..000000000000
--- a/vendor/github.com/docker/distribution/manifest/versioned.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package manifest
-
-// Versioned provides a struct with the manifest schemaVersion and mediaType.
-// Incoming content with unknown schema version can be decoded against this
-// struct to check the version.
-type Versioned struct {
-	// SchemaVersion is the image manifest schema that this image follows
-	SchemaVersion int `json:"schemaVersion"`
-
-	// MediaType is the media type of this schema.
-	MediaType string `json:"mediaType,omitempty"`
-}
diff --git a/vendor/github.com/docker/distribution/manifests.go b/vendor/github.com/docker/distribution/manifests.go
deleted file mode 100644
index 1816baea1d65..000000000000
--- a/vendor/github.com/docker/distribution/manifests.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package distribution
-
-import (
-	"context"
-	"fmt"
-	"mime"
-
-	"github.com/opencontainers/go-digest"
-)
-
-// Manifest represents a registry object specifying a set of
-// references and an optional target
-type Manifest interface {
-	// References returns a list of objects which make up this manifest.
-	// A reference is anything which can be represented by a
-	// distribution.Descriptor. These can consist of layers, resources or other
-	// manifests.
-	//
-	// While no particular order is required, implementations should return
-	// them from highest to lowest priority. For example, one might want to
-	// return the base layer before the top layer.
-	References() []Descriptor
-
-	// Payload provides the serialized format of the manifest, in addition to
-	// the media type.
-	Payload() (mediaType string, payload []byte, err error)
-}
-
-// ManifestBuilder creates a manifest allowing one to include dependencies.
-// Instances can be obtained from a version-specific manifest package.  Manifest
-// specific data is passed into the function which creates the builder.
-type ManifestBuilder interface {
-	// Build creates the manifest from his builder.
-	Build(ctx context.Context) (Manifest, error)
-
-	// References returns a list of objects which have been added to this
-	// builder. The dependencies are returned in the order they were added,
-	// which should be from base to head.
-	References() []Descriptor
-
-	// AppendReference includes the given object in the manifest after any
-	// existing dependencies. If the add fails, such as when adding an
-	// unsupported dependency, an error may be returned.
-	//
-	// The destination of the reference is dependent on the manifest type and
-	// the dependency type.
-	AppendReference(dependency Describable) error
-}
-
-// ManifestService describes operations on image manifests.
-type ManifestService interface {
-	// Exists returns true if the manifest exists.
-	Exists(ctx context.Context, dgst digest.Digest) (bool, error)
-
-	// Get retrieves the manifest specified by the given digest
-	Get(ctx context.Context, dgst digest.Digest, options ...ManifestServiceOption) (Manifest, error)
-
-	// Put creates or updates the given manifest returning the manifest digest
-	Put(ctx context.Context, manifest Manifest, options ...ManifestServiceOption) (digest.Digest, error)
-
-	// Delete removes the manifest specified by the given digest. Deleting
-	// a manifest that doesn't exist will return ErrManifestNotFound
-	Delete(ctx context.Context, dgst digest.Digest) error
-}
-
-// ManifestEnumerator enables iterating over manifests
-type ManifestEnumerator interface {
-	// Enumerate calls ingester for each manifest.
-	Enumerate(ctx context.Context, ingester func(digest.Digest) error) error
-}
-
-// Describable is an interface for descriptors
-type Describable interface {
-	Descriptor() Descriptor
-}
-
-// ManifestMediaTypes returns the supported media types for manifests.
-func ManifestMediaTypes() (mediaTypes []string) {
-	for t := range mappings {
-		if t != "" {
-			mediaTypes = append(mediaTypes, t)
-		}
-	}
-	return
-}
-
-// UnmarshalFunc implements manifest unmarshalling a given MediaType
-type UnmarshalFunc func([]byte) (Manifest, Descriptor, error)
-
-var mappings = make(map[string]UnmarshalFunc, 0)
-
-// UnmarshalManifest looks up manifest unmarshal functions based on
-// MediaType
-func UnmarshalManifest(ctHeader string, p []byte) (Manifest, Descriptor, error) {
-	// Need to look up by the actual media type, not the raw contents of
-	// the header. Strip semicolons and anything following them.
-	var mediaType string
-	if ctHeader != "" {
-		var err error
-		mediaType, _, err = mime.ParseMediaType(ctHeader)
-		if err != nil {
-			return nil, Descriptor{}, err
-		}
-	}
-
-	unmarshalFunc, ok := mappings[mediaType]
-	if !ok {
-		unmarshalFunc, ok = mappings[""]
-		if !ok {
-			return nil, Descriptor{}, fmt.Errorf("unsupported manifest media type and no default available: %s", mediaType)
-		}
-	}
-
-	return unmarshalFunc(p)
-}
-
-// RegisterManifestSchema registers an UnmarshalFunc for a given schema type.  This
-// should be called from specific
-func RegisterManifestSchema(mediaType string, u UnmarshalFunc) error {
-	if _, ok := mappings[mediaType]; ok {
-		return fmt.Errorf("manifest media type registration would overwrite existing: %s", mediaType)
-	}
-	mappings[mediaType] = u
-	return nil
-}
diff --git a/vendor/github.com/docker/distribution/registry.go b/vendor/github.com/docker/distribution/registry.go
deleted file mode 100644
index c34207d030b4..000000000000
--- a/vendor/github.com/docker/distribution/registry.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package distribution
-
-import (
-	"context"
-
-	"github.com/docker/distribution/reference"
-)
-
-// Scope defines the set of items that match a namespace.
-type Scope interface {
-	// Contains returns true if the name belongs to the namespace.
-	Contains(name string) bool
-}
-
-type fullScope struct{}
-
-func (f fullScope) Contains(string) bool {
-	return true
-}
-
-// GlobalScope represents the full namespace scope which contains
-// all other scopes.
-var GlobalScope = Scope(fullScope{})
-
-// Namespace represents a collection of repositories, addressable by name.
-// Generally, a namespace is backed by a set of one or more services,
-// providing facilities such as registry access, trust, and indexing.
-type Namespace interface {
-	// Scope describes the names that can be used with this Namespace. The
-	// global namespace will have a scope that matches all names. The scope
-	// effectively provides an identity for the namespace.
-	Scope() Scope
-
-	// Repository should return a reference to the named repository. The
-	// registry may or may not have the repository but should always return a
-	// reference.
-	Repository(ctx context.Context, name reference.Named) (Repository, error)
-
-	// Repositories fills 'repos' with a lexicographically sorted catalog of repositories
-	// up to the size of 'repos' and returns the value 'n' for the number of entries
-	// which were filled.  'last' contains an offset in the catalog, and 'err' will be
-	// set to io.EOF if there are no more entries to obtain.
-	Repositories(ctx context.Context, repos []string, last string) (n int, err error)
-
-	// Blobs returns a blob enumerator to access all blobs
-	Blobs() BlobEnumerator
-
-	// BlobStatter returns a BlobStatter to control
-	BlobStatter() BlobStatter
-}
-
-// RepositoryEnumerator describes an operation to enumerate repositories
-type RepositoryEnumerator interface {
-	Enumerate(ctx context.Context, ingester func(string) error) error
-}
-
-// ManifestServiceOption is a function argument for Manifest Service methods
-type ManifestServiceOption interface {
-	Apply(ManifestService) error
-}
-
-// WithTag allows a tag to be passed into Put
-func WithTag(tag string) ManifestServiceOption {
-	return WithTagOption{tag}
-}
-
-// WithTagOption holds a tag
-type WithTagOption struct{ Tag string }
-
-// Apply conforms to the ManifestServiceOption interface
-func (o WithTagOption) Apply(m ManifestService) error {
-	// no implementation
-	return nil
-}
-
-// Repository is a named collection of manifests and layers.
-type Repository interface {
-	// Named returns the name of the repository.
-	Named() reference.Named
-
-	// Manifests returns a reference to this repository's manifest service.
-	// with the supplied options applied.
-	Manifests(ctx context.Context, options ...ManifestServiceOption) (ManifestService, error)
-
-	// Blobs returns a reference to this repository's blob service.
-	Blobs(ctx context.Context) BlobStore
-
-	// TODO(stevvooe): The above BlobStore return can probably be relaxed to
-	// be a BlobService for use with clients. This will allow such
-	// implementations to avoid implementing ServeBlob.
-
-	// Tags returns a reference to this repositories tag service
-	Tags(ctx context.Context) TagService
-}
-
-// TODO(stevvooe): Must add close methods to all these. May want to change the
-// way instances are created to better reflect internal dependency
-// relationships.
diff --git a/vendor/github.com/docker/distribution/tags.go b/vendor/github.com/docker/distribution/tags.go
deleted file mode 100644
index f22df2b850e1..000000000000
--- a/vendor/github.com/docker/distribution/tags.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package distribution
-
-import (
-	"context"
-)
-
-// TagService provides access to information about tagged objects.
-type TagService interface {
-	// Get retrieves the descriptor identified by the tag. Some
-	// implementations may differentiate between "trusted" tags and
-	// "untrusted" tags. If a tag is "untrusted", the mapping will be returned
-	// as an ErrTagUntrusted error, with the target descriptor.
-	Get(ctx context.Context, tag string) (Descriptor, error)
-
-	// Tag associates the tag with the provided descriptor, updating the
-	// current association, if needed.
-	Tag(ctx context.Context, tag string, desc Descriptor) error
-
-	// Untag removes the given tag association
-	Untag(ctx context.Context, tag string) error
-
-	// All returns the set of tags managed by this tag service
-	All(ctx context.Context) ([]string, error)
-
-	// Lookup returns the set of tags referencing the given digest.
-	Lookup(ctx context.Context, digest Descriptor) ([]string, error)
-}
diff --git a/worker/base/worker.go b/worker/base/worker.go
index 9e4e817e0566..7c882eafbbf8 100644
--- a/worker/base/worker.go
+++ b/worker/base/worker.go
@@ -14,7 +14,6 @@ import (
 	"github.com/containerd/containerd/images"
 	"github.com/containerd/containerd/rootfs"
 	cdsnapshot "github.com/containerd/containerd/snapshots"
-	"github.com/docker/distribution/manifest/schema2"
 	"github.com/moby/buildkit/cache"
 	"github.com/moby/buildkit/cache/blobs"
 	"github.com/moby/buildkit/cache/metadata"
@@ -293,7 +292,7 @@ func (w *Worker) GetRemote(ctx context.Context, ref cache.ImmutableRef, createIf
 		descs[i] = ocispec.Descriptor{
 			Digest:    dp.Blobsum,
 			Size:      info.Size,
-			MediaType: schema2.MediaTypeLayer,
+			MediaType: images.MediaTypeDockerSchema2LayerGzip,
 			Annotations: map[string]string{
 				"containerd.io/uncompressed": dp.DiffID.String(),
 				labelCreatedAt:               string(tm),