diff --git a/pkg/tool/helmclient/helmclient.go b/pkg/tool/helmclient/helmclient.go
index 6840ffc93c..16aac8b804 100644
--- a/pkg/tool/helmclient/helmclient.go
+++ b/pkg/tool/helmclient/helmclient.go
@@ -296,7 +296,7 @@ func (hClient *HelmClient) upgradeCRDs(ctx context.Context, chartInstance *chart
 	return nil
 }
 
-// upgradeCRDV1Beta1 upgrades a CRD of the v1 API version using the provided k8s client and CRD yaml.
+// upgradeCRDV1 upgrades a CRD of the v1 API version using the provided k8s client and CRD yaml.
 func (hClient *HelmClient) upgradeCRDV1(ctx context.Context, cl *clientset.Clientset, rawCRD []byte) error {
 	var crdObj v1.CustomResourceDefinition
 	if err := yaml.Unmarshal(rawCRD, &crdObj); err != nil {
@@ -721,8 +721,8 @@ func (hClient *HelmClient) DownloadChart(repoEntry *repo.Entry, chartRef string,
 	}
 
 	pull := action.NewPullWithOpts(action.WithConfig(&action.Configuration{}))
-	pull.Password = repoEntry.Username
-	pull.Username = repoEntry.Password
+	pull.Username = repoEntry.Username
+	pull.Password = repoEntry.Password
 	pull.Version = chartVersion
 	pull.Settings = generalSettings
 	pull.DestDir = destDir
@@ -749,8 +749,8 @@ func (hClient *HelmClient) downloadOCIChart(repoEntry *repo.Entry, chartRef stri
 		return err
 	}
 	pull := action.NewPullWithOpts(action.WithConfig(pullConfig))
-	pull.Password = repoEntry.Username
-	pull.Username = repoEntry.Password
+	pull.Username = repoEntry.Username
+	pull.Password = repoEntry.Password
 	pull.Version = chartVersion
 	pull.Settings = generalSettings
 	pull.DestDir = destDir