diff --git a/internal/experimental/registry/client.go b/internal/experimental/registry/client.go
index 2de348ccd..1b686b8ba 100644
--- a/internal/experimental/registry/client.go
+++ b/internal/experimental/registry/client.go
@@ -604,7 +604,9 @@ func (c *Client) Tags(ref string) ([]string, error) {
 
 	var tagVersions []*semver.Version
 	for _, tag := range registryTags {
-		tagVersion, err := semver.StrictNewVersion(tag)
+		// Change underscore (_) back to plus (+) for Helm
+		// See https://github.com/helm/helm/issues/10166
+		tagVersion, err := semver.StrictNewVersion(strings.ReplaceAll(tag, "_", "+"))
 		if err == nil {
 			tagVersions = append(tagVersions, tagVersion)
 		}