@@ -200,7 +200,7 @@ func newROLayerForImage(ctx context.Context, imgDesc *ocispec.Descriptor, i *Ima

 		return nil, errors.New("can't make an RO layer for a nil image :'(")

 	}

-	platMatcher := platforms.Default()

+	platMatcher := i.hostPlatformMatcher()

 	if platform != nil {

 		platMatcher = platforms.Only(*platform)

 	}

@@ -449,7 +449,7 @@ func (i *ImageService) CreateImage(ctx context.Context, config []byte, parent st

 		if err != nil {

 			return nil, err

 		}

-		parentImageManifest, err := c8dimages.Manifest(ctx, i.content, parentDesc, platforms.Default())

+		parentImageManifest, err := c8dimages.Manifest(ctx, i.content, parentDesc, i.hostPlatformMatcher())

 		if err != nil {

 			return nil, err

 		}

@@ -424,7 +424,7 @@ func (i *ImageService) refreshImageIdentityCacheKey(ctx context.Context, cacheKe

 		return nil

 	}

-	platformMatcher, err := imageIdentityPlatformMatcher(bestPlatform)

+	platformMatcher, err := i.imageIdentityPlatformMatcher(bestPlatform)

 	if err != nil {

 		return err

 	}

@@ -448,9 +448,9 @@ func (i *ImageService) refreshImageIdentityCacheKey(ctx context.Context, cacheKe

 	return nil

 }

-func imageIdentityPlatformMatcher(platform string) (platforms.MatchComparer, error) {

+func (i *ImageService) imageIdentityPlatformMatcher(platform string) (platforms.MatchComparer, error) {

 	if platform == "" {

-		return matchAnyWithPreference(platforms.Default(), nil), nil

+		return matchAnyWithPreference(i.hostPlatformMatcher(), nil), nil

 	}

 	parsed, err := platforms.Parse(platform)

 	if err != nil {

@@ -541,7 +541,7 @@ func (i *ImageService) warmImageIdentityCache(ctx context.Context, img c8dimages

 	go func() {

 		warmCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), imageIdentityWarmupTimeout)

 		defer cancel()

-		multi, err := i.multiPlatformSummary(warmCtx, img, matchAnyWithPreference(platforms.Default(), nil))

+		multi, err := i.multiPlatformSummary(warmCtx, img, matchAnyWithPreference(i.hostPlatformMatcher(), nil))

 		if err != nil {

 			log.G(warmCtx).WithError(err).WithField("image", img.Name).Debug("failed to build image identity cache in background")

 			return

@@ -107,7 +107,7 @@ func (i *ImageService) Images(ctx context.Context, opts imagebackend.ListOptions

 	}

 	// TODO: Allow platform override?

-	platformMatcher := matchAnyWithPreference(platforms.Default(), nil)

+	platformMatcher := matchAnyWithPreference(i.hostPlatformMatcher(), nil)

 	for _, img := range imgs {

 		isDangling := isDanglingImage(img)

@@ -138,7 +138,7 @@ func (i *ImageService) pullTag(ctx context.Context, ref reference.Named, platfor

 		}()

 	}

-	p := platforms.Default()

+	p := i.hostPlatformMatcher()

 	if platform != nil {

 		p = platforms.Only(*platform)

 	}

@@ -252,7 +252,7 @@ func (i *ImageService) pullTag(ctx context.Context, ref reference.Named, platfor

 			// the same message as the graphdrivers backend.

 			// The one returned by containerd doesn't contain the platform and is much less informative.

 			if strings.Contains(err.Error(), "platform") {

-				platformStr := platforms.DefaultString()

+				platformStr := platforms.FormatAll(i.hostPlatformSpec())

 				if platform != nil {

 					platformStr = platforms.FormatAll(*platform)

 				}

@@ -65,9 +65,14 @@ func (i *ImageService) matchRequestedOrDefault(

 // hostPlatformMatcher returns a platform match comparer that matches the host platform.

 func (i *ImageService) hostPlatformMatcher() platforms.MatchComparer {

-	// Allow to override the host platform for testing purposes.

+	return platforms.Only(i.hostPlatformSpec())

+}

+

+// hostPlatformSpec returns the host platform specification.

+func (i *ImageService) hostPlatformSpec() ocispec.Platform {

+	// Allow tests to override the host platform before constructing matchers.

 	if i.defaultPlatformOverride != nil {

-		return platforms.Only(*i.defaultPlatformOverride)

+		return *i.defaultPlatformOverride

 	}

-	return platforms.Default()

+	return platforms.DefaultSpec()

 }