diff --git a/pkg/auth/csp/tanzu.go b/pkg/auth/csp/tanzu.go
index f5a7fe66b..1e017d6f4 100644
--- a/pkg/auth/csp/tanzu.go
+++ b/pkg/auth/csp/tanzu.go
@@ -95,14 +95,12 @@ func GetOrgNameFromOrgID(orgID, accessToken, issuer string) (string, error) {
 func GetCSPMetadata() TanzuCSPMetadata {
 	cspMetaData := getCSPMetadataFromCentralConfig()
 	// If failed to get the CSP Metadata from central config,
-	// set the default Issuer URL of VCSP
-	// TODO(prkalle): Update the default Issuers to TCSP issuer URL( If TCSP is not stable in current release, update it next release)
-	//                This just defaults in the code, defaults in central config can be updated anytime
+	// set the default Issuer URL of TCSP
 	if cspMetaData.IssuerStaging == "" {
-		cspMetaData.IssuerStaging = StgIssuer
+		cspMetaData.IssuerStaging = StgIssuerTCSP
 	}
 	if cspMetaData.IssuerProduction == "" {
-		cspMetaData.IssuerProduction = ProdIssuer
+		cspMetaData.IssuerProduction = ProdIssuerTCSP
 	}
 
 	return cspMetaData
diff --git a/pkg/pluginmanager/default_discoveries_test.go b/pkg/pluginmanager/default_discoveries_test.go
index 7a180a40b..b700827a8 100644
--- a/pkg/pluginmanager/default_discoveries_test.go
+++ b/pkg/pluginmanager/default_discoveries_test.go
@@ -87,7 +87,7 @@ metadata:
   globalOpts:
     endpoint: https://localhost:8443
     auth:
-      issuer: https://console-stg.cloud.vmware.com/csp/gateway/am/api
+      issuer: https://console-stg.tanzu.broadcom.com/csp/gateway/am/api
       userName: anujc
       accessToken: eyJ
       IDToken: eyJ