diff --git a/‎pkg/registry/client.go‎
Lines changed: 2 additions & 2 deletions b/‎pkg/registry/client.go‎
Lines changed: 2 additions & 2 deletions
@@ -301,8 +301,6 @@ func (c *Client) Login(host string, options ...LoginOption) error {
 		return fmt.Errorf("authenticating to %q: %w", host, err)
 	}
 
-	key := credentials.ServerAddressFromRegistry(host)
-
 	// The credentialsStore loader does not handle empty files. So, there is a workaround.
 	// This can be removed when the credentials loader can handle empty files.
 	// When Helm catches an empty file error it causes the loader to trigger its fault
@@ -327,6 +325,8 @@ func (c *Client) Login(host string, options ...LoginOption) error {
 		c.credentialsFileTemp = false
 	}
 
+	key := credentials.ServerAddressFromRegistry(host)
+	key = credentials.ServerAddressFromHostname(key)
 	if err := c.credentialsStore.Put(ctx, key, cred); err != nil {
 		return err
 	}
Original file line number	Diff line number	Diff line change
`@@ -301,8 +301,6 @@ func (c *Client) Login(host string, options ...LoginOption) error {`
`301`	`301`	`return fmt.Errorf("authenticating to %q: %w", host, err)`
`302`	`302`	`}`
`303`	`303`
`304`		`- key := credentials.ServerAddressFromRegistry(host)`
`305`		`-`
`306`	`304`	`// The credentialsStore loader does not handle empty files. So, there is a workaround.`
`307`	`305`	`// This can be removed when the credentials loader can handle empty files.`
`308`	`306`	`// When Helm catches an empty file error it causes the loader to trigger its fault`
`@@ -327,6 +325,8 @@ func (c *Client) Login(host string, options ...LoginOption) error {`
`327`	`325`	`c.credentialsFileTemp = false`
`328`	`326`	`}`
`329`	`327`
	`328`	`+ key := credentials.ServerAddressFromRegistry(host)`
	`329`	`+ key = credentials.ServerAddressFromHostname(key)`
`330`	`330`	`if err := c.credentialsStore.Put(ctx, key, cred); err != nil {`
`331`	`331`	`return err`
`332`	`332`	`}`