@@ -392,9 +392,14 @@ func (p *v2Puller) pullV2Tag(ctx context.Context, ref reference.Named, platform

 		if p.config.RequireSchema2 {

 			return false, fmt.Errorf("invalid manifest: not schema2")

 		}

-		msg := schema1DeprecationMessage(ref)

-		logrus.Warn(msg)

-		progress.Message(p.config.ProgressOutput, "", msg)

+

+		// give registries time to upgrade to schema2 and only warn if we know a registry has been upgraded long time ago

+		// TODO: condition to be removed

+		if reference.Domain(ref) == "docker.io" {

+			msg := fmt.Sprintf("Image %s uses outdated schema1 manifest format. Please upgrade to a schema2 image for better future compatibility. More information at https://docs.docker.com/registry/spec/deprecated-schema-v1/", ref)

+			logrus.Warn(msg)

+			progress.Message(p.config.ProgressOutput, "", msg)

+		}

 		id, manifestDigest, err = p.pullSchema1(ctx, ref, v, platform)

 		if err != nil {

@@ -791,7 +796,7 @@ func (p *v2Puller) pullManifestList(ctx context.Context, ref reference.Named, mf

 	switch v := manifest.(type) {

 	case *schema1.SignedManifest:

-		msg := schema1DeprecationMessage(ref)

+		msg := fmt.Sprintf("[DEPRECATION NOTICE] v2 schema1 manifests in manifest lists are not supported and will break in a future release. Suggest author of %s to upgrade to v2 schema2. More information at https://docs.docker.com/registry/spec/deprecated-schema-v1/", ref)

 		logrus.Warn(msg)

 		progress.Message(p.config.ProgressOutput, "", msg)

@@ -188,7 +188,7 @@ func (p *v2Pusher) pushV2Tag(ctx context.Context, ref reference.NamedTagged, id

 		logrus.Warnf("failed to upload schema2 manifest: %v - falling back to schema1", err)

-		msg := schema1DeprecationMessage(ref)

+		msg := fmt.Sprintf("[DEPRECATION NOTICE] registry v2 schema1 support will be removed in an upcoming release. Please contact admins of the %s registry NOW to avoid future disruption. More information at https://docs.docker.com/registry/spec/deprecated-schema-v1/", reference.Domain(ref))

 		logrus.Warn(msg)

 		progress.Message(p.config.ProgressOutput, "", msg)

@@ -156,7 +156,3 @@ func (th *existingTokenHandler) AuthorizeRequest(req *http.Request, params map[s

 	req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", th.token))

 	return nil

 }

-

-func schema1DeprecationMessage(ref reference.Named) string {

-	return fmt.Sprintf("[DEPRECATION NOTICE] registry v2 schema1 support will be removed in an upcoming release. Please contact admins of the %s registry NOW to avoid future disruption.", reference.Domain(ref))

-}