diff --git a/cmd/admin_cluster_deploy.go b/cmd/admin_cluster_deploy.go
index 1cfdac98..5d63b193 100644
--- a/cmd/admin_cluster_deploy.go
+++ b/cmd/admin_cluster_deploy.go
@@ -101,7 +101,7 @@ func init() {
 func deployClusters() {
 	utils.GetAdminUrl()
 
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(1)
diff --git a/cmd/admin_cluster_status.go b/cmd/admin_cluster_status.go
index 894f9952..e0536c4c 100644
--- a/cmd/admin_cluster_status.go
+++ b/cmd/admin_cluster_status.go
@@ -62,7 +62,7 @@ func readClusterStatus(req ClusterStatusRequest) (*ClusterStatusDto, error) {
 	pattern := regexp.MustCompile("%5B([0-9]+)%5D=")
 	wsURL.RawQuery = pattern.ReplaceAllString(command.Encode(), "[${1}]=")
 
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		return nil, err
 	}
diff --git a/cmd/admin_cluster_update_kubeconfig.go b/cmd/admin_cluster_update_kubeconfig.go
index edf4d520..1b24e99f 100644
--- a/cmd/admin_cluster_update_kubeconfig.go
+++ b/cmd/admin_cluster_update_kubeconfig.go
@@ -28,7 +28,7 @@ func init() {
 }
 
 func updateClusterKubeconfig() {
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(1)
diff --git a/cmd/admin_demo_get_logs.go b/cmd/admin_demo_get_logs.go
index d7b21047..810876e3 100644
--- a/cmd/admin_demo_get_logs.go
+++ b/cmd/admin_demo_get_logs.go
@@ -30,7 +30,7 @@ var (
 				os.Exit(0)
 			}
 
-			tokenType, token, err := utils.GetAccessToken()
+			tokenType, token, err := utils.GetAccessToken(false)
 			if err != nil {
 				utils.PrintlnError(err)
 				os.Exit(1)
diff --git a/cmd/admin_demo_list_logs.go b/cmd/admin_demo_list_logs.go
index 00750752..ede4e9c0 100644
--- a/cmd/admin_demo_list_logs.go
+++ b/cmd/admin_demo_list_logs.go
@@ -25,7 +25,7 @@ var (
 		Run: func(cmd *cobra.Command, args []string) {
 			utils.Capture(cmd)
 
-			tokenType, token, err := utils.GetAccessToken()
+			tokenType, token, err := utils.GetAccessToken(false)
 			if err != nil {
 				utils.PrintlnError(err)
 				os.Exit(1)
diff --git a/cmd/admin_enable_user_connect.go b/cmd/admin_enable_user_connect.go
index c5dffd82..04d94aa0 100644
--- a/cmd/admin_enable_user_connect.go
+++ b/cmd/admin_enable_user_connect.go
@@ -99,7 +99,7 @@ func enableUserSignup() {
 	}
 
 	// Get access token
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(1)
diff --git a/cmd/admin_encrypt_secret.go b/cmd/admin_encrypt_secret.go
index ca3440e4..7d1dbb71 100644
--- a/cmd/admin_encrypt_secret.go
+++ b/cmd/admin_encrypt_secret.go
@@ -51,7 +51,7 @@ func encryptSecret() {
 }
 
 func callEncryptSecret(organizationId string, secret string) (string, error) {
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		return "", fmt.Errorf("failed to get access token: %w", err)
 	}
diff --git a/cmd/admin_enterprise_connection_create.go b/cmd/admin_enterprise_connection_create.go
index 419396d2..0962f786 100644
--- a/cmd/admin_enterprise_connection_create.go
+++ b/cmd/admin_enterprise_connection_create.go
@@ -35,7 +35,7 @@ func init() {
 
 func createEnterpriseConnection() {
 	// Retrieve access token for authorization
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	checkError(err)
 
 	// Prepare payload with required fields
diff --git a/cmd/admin_enterprise_connection_delete.go b/cmd/admin_enterprise_connection_delete.go
index 0fdde5e1..419c814b 100644
--- a/cmd/admin_enterprise_connection_delete.go
+++ b/cmd/admin_enterprise_connection_delete.go
@@ -33,7 +33,7 @@ func init() {
 
 func deleteEnterpriseConnection() {
 	// Retrieve access token for authorization
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	checkError(err)
 
 	// Build URL
diff --git a/cmd/admin_enterprise_connection_list.go b/cmd/admin_enterprise_connection_list.go
index a8f46a66..970f623b 100644
--- a/cmd/admin_enterprise_connection_list.go
+++ b/cmd/admin_enterprise_connection_list.go
@@ -31,7 +31,7 @@ func init() {
 
 func listEnterpriseConnections() {
 	// Retrieve access token for authorization
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	checkError(err)
 
 	// Build URL
diff --git a/cmd/admin_jw_qovery_usage_create.go b/cmd/admin_jw_qovery_usage_create.go
index 72fea09d..83ead644 100644
--- a/cmd/admin_jw_qovery_usage_create.go
+++ b/cmd/admin_jw_qovery_usage_create.go
@@ -35,7 +35,7 @@ func init() {
 }
 
 func createJwtForQoveryUsage() {
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(0)
diff --git a/cmd/admin_jw_qovery_usage_delete.go b/cmd/admin_jw_qovery_usage_delete.go
index 0313e5b7..e99130d9 100644
--- a/cmd/admin_jw_qovery_usage_delete.go
+++ b/cmd/admin_jw_qovery_usage_delete.go
@@ -28,7 +28,7 @@ func init() {
 }
 
 func deleteJwtForQoveryUsage() {
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(0)
diff --git a/cmd/admin_jw_qovery_usage_list.go b/cmd/admin_jw_qovery_usage_list.go
index ff6ee4f0..0ab2d52e 100644
--- a/cmd/admin_jw_qovery_usage_list.go
+++ b/cmd/admin_jw_qovery_usage_list.go
@@ -32,7 +32,7 @@ func init() {
 }
 
 func listJwtsForQoveryUsage() {
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(0)
diff --git a/cmd/admin_jwt_create.go b/cmd/admin_jwt_create.go
index ce8488b1..6aeaec61 100644
--- a/cmd/admin_jwt_create.go
+++ b/cmd/admin_jwt_create.go
@@ -33,7 +33,7 @@ func init() {
 }
 
 func createJwt() {
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(0)
diff --git a/cmd/admin_jwt_delete.go b/cmd/admin_jwt_delete.go
index 8325038d..8000a16b 100644
--- a/cmd/admin_jwt_delete.go
+++ b/cmd/admin_jwt_delete.go
@@ -28,7 +28,7 @@ func init() {
 }
 
 func deleteJwt() {
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(0)
diff --git a/cmd/admin_jwt_list.go b/cmd/admin_jwt_list.go
index e061b537..41e2d25c 100644
--- a/cmd/admin_jwt_list.go
+++ b/cmd/admin_jwt_list.go
@@ -32,7 +32,7 @@ func init() {
 }
 
 func listJwts() {
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(0)
diff --git a/cmd/admin_organization_deployment_restriction.go b/cmd/admin_organization_deployment_restriction.go
index 8d5adf88..643fdb0e 100644
--- a/cmd/admin_organization_deployment_restriction.go
+++ b/cmd/admin_organization_deployment_restriction.go
@@ -104,7 +104,7 @@ func manageOrganizationDeploymentRestriction() {
 	}
 
 	// Get access token
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(1)
diff --git a/cmd/admin_organization_transfer_ownership.go b/cmd/admin_organization_transfer_ownership.go
index fc26d7c8..b05705e1 100644
--- a/cmd/admin_organization_transfer_ownership.go
+++ b/cmd/admin_organization_transfer_ownership.go
@@ -62,7 +62,7 @@ func transferOrganizationOwnership() {
 	}
 
 	// Get access token
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(1)
diff --git a/cmd/admin_organization_update_billing_external_id.go b/cmd/admin_organization_update_billing_external_id.go
index 548a488b..ea871560 100644
--- a/cmd/admin_organization_update_billing_external_id.go
+++ b/cmd/admin_organization_update_billing_external_id.go
@@ -48,7 +48,7 @@ func updateOrganizationBillingExternalId() {
 		os.Exit(1)
 	}
 
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(1)
diff --git a/cmd/api.go b/cmd/api.go
index f67903f1..ef306e66 100644
--- a/cmd/api.go
+++ b/cmd/api.go
@@ -276,8 +276,12 @@ func runAPI(cmd *cobra.Command, args []string) {
 		os.Exit(1)
 	}
 
-	// Get auth token
-	tokenType, token, err := utils.GetAccessToken()
+	// Get auth token. Creating the very first organization (`qovery api organization
+	// --method POST ...`, documented above as a first-class example) is the one
+	// legitimate case where the caller is expected to have zero organizations yet,
+	// so it skips the usual "you don't have any organization" guard.
+	isOrgCreation := path == "organization" && method == "POST"
+	tokenType, token, err := utils.GetAccessToken(isOrgCreation)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(1)
diff --git a/cmd/application_cancel.go b/cmd/application_cancel.go
index 0873b8fe..98f8e8af 100644
--- a/cmd/application_cancel.go
+++ b/cmd/application_cancel.go
@@ -16,7 +16,7 @@ var applicationCancelCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/application_clone.go b/cmd/application_clone.go
index 8cdd9a52..8ea86b5c 100644
--- a/cmd/application_clone.go
+++ b/cmd/application_clone.go
@@ -20,7 +20,7 @@ var applicationCloneCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/application_domain_create.go b/cmd/application_domain_create.go
index b7008594..cfc98119 100644
--- a/cmd/application_domain_create.go
+++ b/cmd/application_domain_create.go
@@ -22,7 +22,7 @@ var applicationDomainCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/application_domain_delete.go b/cmd/application_domain_delete.go
index 4f68cc9b..2c0d5edb 100644
--- a/cmd/application_domain_delete.go
+++ b/cmd/application_domain_delete.go
@@ -17,7 +17,7 @@ var applicationDomainDeleteCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/application_domain_edit.go b/cmd/application_domain_edit.go
index ded2f20a..c28f45ed 100644
--- a/cmd/application_domain_edit.go
+++ b/cmd/application_domain_edit.go
@@ -19,7 +19,7 @@ var applicationDomainEditCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/application_domain_list.go b/cmd/application_domain_list.go
index 741c7f4e..f6dc2150 100644
--- a/cmd/application_domain_list.go
+++ b/cmd/application_domain_list.go
@@ -20,7 +20,7 @@ var applicationDomainListCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/application_env_alias_create.go b/cmd/application_env_alias_create.go
index 7221b8a8..ee4ece42 100644
--- a/cmd/application_env_alias_create.go
+++ b/cmd/application_env_alias_create.go
@@ -17,7 +17,7 @@ var applicationEnvAliasCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/application_env_create.go b/cmd/application_env_create.go
index 58c25de4..758e70a5 100644
--- a/cmd/application_env_create.go
+++ b/cmd/application_env_create.go
@@ -17,7 +17,7 @@ var applicationEnvCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/application_env_delete.go b/cmd/application_env_delete.go
index 3e7e6187..1424e65b 100644
--- a/cmd/application_env_delete.go
+++ b/cmd/application_env_delete.go
@@ -17,7 +17,7 @@ var applicationEnvDeleteCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/application_env_list.go b/cmd/application_env_list.go
index 43736f23..57eee04b 100644
--- a/cmd/application_env_list.go
+++ b/cmd/application_env_list.go
@@ -15,7 +15,7 @@ var applicationEnvListCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/application_env_override_create.go b/cmd/application_env_override_create.go
index f44c9c04..9d18601a 100644
--- a/cmd/application_env_override_create.go
+++ b/cmd/application_env_override_create.go
@@ -17,7 +17,7 @@ var applicationEnvOverrideCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/application_env_update.go b/cmd/application_env_update.go
index 9cc25dea..c25b3528 100644
--- a/cmd/application_env_update.go
+++ b/cmd/application_env_update.go
@@ -17,7 +17,7 @@ var applicationEnvUpdateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/application_external_secret_create.go b/cmd/application_external_secret_create.go
index 0b094996..497ff18f 100644
--- a/cmd/application_external_secret_create.go
+++ b/cmd/application_external_secret_create.go
@@ -17,7 +17,7 @@ var applicationExternalSecretCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/application_external_secret_delete.go b/cmd/application_external_secret_delete.go
index cb919519..543e959c 100644
--- a/cmd/application_external_secret_delete.go
+++ b/cmd/application_external_secret_delete.go
@@ -17,7 +17,7 @@ var applicationExternalSecretDeleteCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/application_external_secret_update.go b/cmd/application_external_secret_update.go
index d9e1d8d6..59942289 100644
--- a/cmd/application_external_secret_update.go
+++ b/cmd/application_external_secret_update.go
@@ -17,7 +17,7 @@ var applicationExternalSecretUpdateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/application_list.go b/cmd/application_list.go
index e2712ae1..95bfdb40 100644
--- a/cmd/application_list.go
+++ b/cmd/application_list.go
@@ -16,7 +16,7 @@ var applicationListCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/application_update.go b/cmd/application_update.go
index 94f08b34..b37bf22b 100644
--- a/cmd/application_update.go
+++ b/cmd/application_update.go
@@ -18,7 +18,7 @@ var applicationUpdateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/audit_log_download.go b/cmd/audit_log_download.go
index dcc48f9e..bb3cfbec 100644
--- a/cmd/audit_log_download.go
+++ b/cmd/audit_log_download.go
@@ -60,7 +60,7 @@ func downloadAuditLogs() {
 	utils.Println(fmt.Sprintf("Your organization plan provides  %.0f days of audit log history", org.OrganizationPlan.GetAuditLogsRetentionInDays()))
 
 	// Get access token
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	checkError(err)
 
 	// Create audit log service
diff --git a/cmd/auth_status.go b/cmd/auth_status.go
index bece2767..8d6763c1 100644
--- a/cmd/auth_status.go
+++ b/cmd/auth_status.go
@@ -31,7 +31,7 @@ Exit code is 0 when authenticated, 1 otherwise.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(true)
 		if err != nil {
 			printAuthStatus(authStatusOutput{
 				Authenticated: false,
diff --git a/cmd/auth_token.go b/cmd/auth_token.go
index 5d745719..214efe1c 100644
--- a/cmd/auth_token.go
+++ b/cmd/auth_token.go
@@ -52,7 +52,7 @@ Examples:
 			return
 		}
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			fmt.Fprintln(os.Stderr, "Error: "+err.Error())
 			os.Exit(1)
diff --git a/cmd/cluster_debug_pod.go b/cmd/cluster_debug_pod.go
index 71a1cb80..c97b53fb 100644
--- a/cmd/cluster_debug_pod.go
+++ b/cmd/cluster_debug_pod.go
@@ -14,7 +14,7 @@ var clusterDebugPodCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/cluster_deploy.go b/cmd/cluster_deploy.go
index 5ed81874..9c1fd608 100644
--- a/cmd/cluster_deploy.go
+++ b/cmd/cluster_deploy.go
@@ -16,7 +16,7 @@ var clusterDeployCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/cluster_install.go b/cmd/cluster_install.go
index b00b69ad..af1fcc36 100644
--- a/cmd/cluster_install.go
+++ b/cmd/cluster_install.go
@@ -22,7 +22,7 @@ var clusterInstallCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/cluster_list.go b/cmd/cluster_list.go
index 1ca4af01..e84e7e34 100644
--- a/cmd/cluster_list.go
+++ b/cmd/cluster_list.go
@@ -19,7 +19,7 @@ var clusterListCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/cluster_lock.go b/cmd/cluster_lock.go
index 52c721f4..5c6b80cb 100644
--- a/cmd/cluster_lock.go
+++ b/cmd/cluster_lock.go
@@ -38,7 +38,7 @@ func lockCluster() {
 	}
 
 	if utils.Validate("lock") {
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/cluster_locked.go b/cmd/cluster_locked.go
index b5ffb8c2..23e80e58 100644
--- a/cmd/cluster_locked.go
+++ b/cmd/cluster_locked.go
@@ -31,7 +31,7 @@ func init() {
 }
 
 func clusterLocked() {
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(1)
diff --git a/cmd/cluster_nodes.go b/cmd/cluster_nodes.go
index 0fd59838..f89f3852 100644
--- a/cmd/cluster_nodes.go
+++ b/cmd/cluster_nodes.go
@@ -23,7 +23,7 @@ var clusterListNodesCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
@@ -89,7 +89,7 @@ func ExecListNodes(req *ListNodesRequest) (*ListNodeResponse, error) {
 	pattern := regexp.MustCompile("%5B([0-9]+)%5D=")
 	wsURL.RawQuery = pattern.ReplaceAllString(command.Encode(), "[${1}]=")
 
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		return nil, err
 	}
diff --git a/cmd/cluster_stop.go b/cmd/cluster_stop.go
index 80de0498..16d1c14e 100644
--- a/cmd/cluster_stop.go
+++ b/cmd/cluster_stop.go
@@ -15,7 +15,7 @@ var clusterStopCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/cluster_unlock.go b/cmd/cluster_unlock.go
index 353c1ede..a49b2f36 100644
--- a/cmd/cluster_unlock.go
+++ b/cmd/cluster_unlock.go
@@ -26,7 +26,7 @@ func init() {
 
 func unlockCluster() {
 	if utils.Validate("unlock") {
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/cluster_upgrade_to_next_kubernetes_version.go b/cmd/cluster_upgrade_to_next_kubernetes_version.go
index d579335a..f7876f7a 100644
--- a/cmd/cluster_upgrade_to_next_kubernetes_version.go
+++ b/cmd/cluster_upgrade_to_next_kubernetes_version.go
@@ -24,7 +24,7 @@ var clusterUpgradeCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/container_cancel.go b/cmd/container_cancel.go
index ee539b2c..1795ac16 100644
--- a/cmd/container_cancel.go
+++ b/cmd/container_cancel.go
@@ -16,7 +16,7 @@ var containerCancelCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/container_clone.go b/cmd/container_clone.go
index 115d25ba..159c8a18 100644
--- a/cmd/container_clone.go
+++ b/cmd/container_clone.go
@@ -20,7 +20,7 @@ var containerCloneCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/container_create.go b/cmd/container_create.go
index d6d6e2c4..34faeaf2 100644
--- a/cmd/container_create.go
+++ b/cmd/container_create.go
@@ -26,7 +26,7 @@ var containerCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		utils.CheckError(err)
 
 		client := utils.GetQoveryClient(tokenType, token)
diff --git a/cmd/container_domain_create.go b/cmd/container_domain_create.go
index 246885a1..31a5537b 100644
--- a/cmd/container_domain_create.go
+++ b/cmd/container_domain_create.go
@@ -20,7 +20,7 @@ var containerDomainCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/container_domain_delete.go b/cmd/container_domain_delete.go
index 479cf906..b6e9024b 100644
--- a/cmd/container_domain_delete.go
+++ b/cmd/container_domain_delete.go
@@ -17,7 +17,7 @@ var containerDomainDeleteCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/container_domain_edit.go b/cmd/container_domain_edit.go
index 15f5c1ce..9b4a86ea 100644
--- a/cmd/container_domain_edit.go
+++ b/cmd/container_domain_edit.go
@@ -19,7 +19,7 @@ var containerDomainEditCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/container_domain_list.go b/cmd/container_domain_list.go
index 12c34dd8..c059844f 100644
--- a/cmd/container_domain_list.go
+++ b/cmd/container_domain_list.go
@@ -20,7 +20,7 @@ var containerDomainListCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/container_env_alias_create.go b/cmd/container_env_alias_create.go
index 364e1de0..b8f4ada0 100644
--- a/cmd/container_env_alias_create.go
+++ b/cmd/container_env_alias_create.go
@@ -17,7 +17,7 @@ var containerEnvAliasCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/container_env_create.go b/cmd/container_env_create.go
index 424a34d5..1ca929ca 100644
--- a/cmd/container_env_create.go
+++ b/cmd/container_env_create.go
@@ -17,7 +17,7 @@ var containerEnvCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/container_env_delete.go b/cmd/container_env_delete.go
index df688366..203390f4 100644
--- a/cmd/container_env_delete.go
+++ b/cmd/container_env_delete.go
@@ -17,7 +17,7 @@ var containerEnvDeleteCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/container_env_list.go b/cmd/container_env_list.go
index 7fc2f108..2cc0abd3 100644
--- a/cmd/container_env_list.go
+++ b/cmd/container_env_list.go
@@ -15,7 +15,7 @@ var containerEnvListCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/container_env_override_create.go b/cmd/container_env_override_create.go
index 51742aa2..8fc0a8e3 100644
--- a/cmd/container_env_override_create.go
+++ b/cmd/container_env_override_create.go
@@ -17,7 +17,7 @@ var containerEnvOverrideCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/container_env_update.go b/cmd/container_env_update.go
index 73e8c754..6994aeaf 100644
--- a/cmd/container_env_update.go
+++ b/cmd/container_env_update.go
@@ -17,7 +17,7 @@ var containerEnvUpdateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/container_external_secret_create.go b/cmd/container_external_secret_create.go
index 2a9ce225..e452e8c1 100644
--- a/cmd/container_external_secret_create.go
+++ b/cmd/container_external_secret_create.go
@@ -17,7 +17,7 @@ var containerExternalSecretCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/container_external_secret_delete.go b/cmd/container_external_secret_delete.go
index 31f9f690..03fdcc7f 100644
--- a/cmd/container_external_secret_delete.go
+++ b/cmd/container_external_secret_delete.go
@@ -17,7 +17,7 @@ var containerExternalSecretDeleteCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/container_external_secret_update.go b/cmd/container_external_secret_update.go
index a7b99024..84f67a2a 100644
--- a/cmd/container_external_secret_update.go
+++ b/cmd/container_external_secret_update.go
@@ -17,7 +17,7 @@ var containerExternalSecretUpdateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/container_list.go b/cmd/container_list.go
index 7e4d6d92..8717f128 100644
--- a/cmd/container_list.go
+++ b/cmd/container_list.go
@@ -15,7 +15,7 @@ var containerListCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/container_registry_list.go b/cmd/container_registry_list.go
index e0d2c273..acc2b166 100644
--- a/cmd/container_registry_list.go
+++ b/cmd/container_registry_list.go
@@ -16,7 +16,7 @@ var containerRegistryListCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		utils.CheckError(err)
 
 		client := utils.GetQoveryClient(tokenType, token)
diff --git a/cmd/container_update.go b/cmd/container_update.go
index ecea25c1..2fcdbc2c 100644
--- a/cmd/container_update.go
+++ b/cmd/container_update.go
@@ -19,7 +19,7 @@ var containerUpdateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/cronjob_cancel.go b/cmd/cronjob_cancel.go
index bc49c5bb..3b7e5414 100644
--- a/cmd/cronjob_cancel.go
+++ b/cmd/cronjob_cancel.go
@@ -16,7 +16,7 @@ var cronjobCancelCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/cronjob_clone.go b/cmd/cronjob_clone.go
index a8d25809..34b35919 100644
--- a/cmd/cronjob_clone.go
+++ b/cmd/cronjob_clone.go
@@ -20,7 +20,7 @@ var cronjobCloneCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/cronjob_env_alias_create.go b/cmd/cronjob_env_alias_create.go
index f540a74e..88c55c9a 100644
--- a/cmd/cronjob_env_alias_create.go
+++ b/cmd/cronjob_env_alias_create.go
@@ -17,7 +17,7 @@ var cronjobEnvAliasCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/cronjob_env_create.go b/cmd/cronjob_env_create.go
index 8c370903..03fbbdc2 100644
--- a/cmd/cronjob_env_create.go
+++ b/cmd/cronjob_env_create.go
@@ -17,7 +17,7 @@ var cronjobEnvCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/cronjob_env_delete.go b/cmd/cronjob_env_delete.go
index 28a588c9..055f9b13 100644
--- a/cmd/cronjob_env_delete.go
+++ b/cmd/cronjob_env_delete.go
@@ -17,7 +17,7 @@ var cronjobEnvDeleteCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/cronjob_env_list.go b/cmd/cronjob_env_list.go
index 8ccf7a35..03014465 100644
--- a/cmd/cronjob_env_list.go
+++ b/cmd/cronjob_env_list.go
@@ -15,7 +15,7 @@ var cronjobEnvListCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/cronjob_env_override_create.go b/cmd/cronjob_env_override_create.go
index 07e95f39..a9f10c47 100644
--- a/cmd/cronjob_env_override_create.go
+++ b/cmd/cronjob_env_override_create.go
@@ -17,7 +17,7 @@ var cronjobEnvOverrideCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/cronjob_env_update.go b/cmd/cronjob_env_update.go
index 59e35af2..66eae70d 100644
--- a/cmd/cronjob_env_update.go
+++ b/cmd/cronjob_env_update.go
@@ -17,7 +17,7 @@ var cronjobEnvUpdateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/cronjob_external_secret_create.go b/cmd/cronjob_external_secret_create.go
index 08f25fd9..cfd4332c 100644
--- a/cmd/cronjob_external_secret_create.go
+++ b/cmd/cronjob_external_secret_create.go
@@ -17,7 +17,7 @@ var cronjobExternalSecretCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/cronjob_external_secret_delete.go b/cmd/cronjob_external_secret_delete.go
index 372a585b..af94e186 100644
--- a/cmd/cronjob_external_secret_delete.go
+++ b/cmd/cronjob_external_secret_delete.go
@@ -17,7 +17,7 @@ var cronjobExternalSecretDeleteCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/cronjob_external_secret_update.go b/cmd/cronjob_external_secret_update.go
index 0d925a8e..cbbd0781 100644
--- a/cmd/cronjob_external_secret_update.go
+++ b/cmd/cronjob_external_secret_update.go
@@ -17,7 +17,7 @@ var cronjobExternalSecretUpdateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/cronjob_list.go b/cmd/cronjob_list.go
index ebc908e4..91f01441 100644
--- a/cmd/cronjob_list.go
+++ b/cmd/cronjob_list.go
@@ -17,7 +17,7 @@ var cronjobListCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/cronjob_update.go b/cmd/cronjob_update.go
index 670bcddb..9e6c87cd 100644
--- a/cmd/cronjob_update.go
+++ b/cmd/cronjob_update.go
@@ -19,7 +19,7 @@ var cronjobUpdateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/database_list.go b/cmd/database_list.go
index 35f472be..192dc64f 100644
--- a/cmd/database_list.go
+++ b/cmd/database_list.go
@@ -17,7 +17,7 @@ var databaseListCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/demo_destroy.go b/cmd/demo_destroy.go
index fd053754..aa348037 100644
--- a/cmd/demo_destroy.go
+++ b/cmd/demo_destroy.go
@@ -19,7 +19,7 @@ var demoDestroyCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		_, token, err := utils.GetAccessToken()
+		_, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/demo_up.go b/cmd/demo_up.go
index e7b6a446..0a374353 100644
--- a/cmd/demo_up.go
+++ b/cmd/demo_up.go
@@ -32,7 +32,7 @@ var demoUpCmd = &cobra.Command{
 			panic("unreachable") // staticcheck false positive: https://staticcheck.io/docs/checks#SA5011
 		}
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/environment_cancel.go b/cmd/environment_cancel.go
index 5281d27d..52feadeb 100644
--- a/cmd/environment_cancel.go
+++ b/cmd/environment_cancel.go
@@ -17,7 +17,7 @@ var environmentCancelCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/environment_clone.go b/cmd/environment_clone.go
index cbde5a37..e99ccb5c 100644
--- a/cmd/environment_clone.go
+++ b/cmd/environment_clone.go
@@ -18,7 +18,7 @@ var environmentCloneCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/environment_deployment_explain.go b/cmd/environment_deployment_explain.go
index 33855eee..e81e15cc 100644
--- a/cmd/environment_deployment_explain.go
+++ b/cmd/environment_deployment_explain.go
@@ -27,7 +27,7 @@ var environmentDeploymentExplainCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/environment_deployment_list.go b/cmd/environment_deployment_list.go
index 9cfb6a47..2410f7df 100644
--- a/cmd/environment_deployment_list.go
+++ b/cmd/environment_deployment_list.go
@@ -15,7 +15,7 @@ var environmentDeploymentListCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/environment_env_alias_create.go b/cmd/environment_env_alias_create.go
index 75ce5776..285bba0c 100644
--- a/cmd/environment_env_alias_create.go
+++ b/cmd/environment_env_alias_create.go
@@ -17,7 +17,7 @@ var environmentEnvAliasCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		checkError(err)
 
 		client := utils.GetQoveryClient(tokenType, token)
diff --git a/cmd/environment_env_create.go b/cmd/environment_env_create.go
index ea62f8fd..7a5a43f2 100644
--- a/cmd/environment_env_create.go
+++ b/cmd/environment_env_create.go
@@ -17,7 +17,7 @@ var environmentEnvCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		checkError(err)
 
 		client := utils.GetQoveryClient(tokenType, token)
diff --git a/cmd/environment_env_delete.go b/cmd/environment_env_delete.go
index cef164b1..c7a08dea 100644
--- a/cmd/environment_env_delete.go
+++ b/cmd/environment_env_delete.go
@@ -17,7 +17,7 @@ var environmentEnvDeleteCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		checkError(err)
 
 		client := utils.GetQoveryClient(tokenType, token)
diff --git a/cmd/environment_env_list.go b/cmd/environment_env_list.go
index 19ad9682..dd61e943 100644
--- a/cmd/environment_env_list.go
+++ b/cmd/environment_env_list.go
@@ -16,7 +16,7 @@ var environmentEnvListCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		checkError(err)
 
 		client := utils.GetQoveryClient(tokenType, token)
diff --git a/cmd/environment_env_override_create.go b/cmd/environment_env_override_create.go
index 2cd4585e..1e34df64 100644
--- a/cmd/environment_env_override_create.go
+++ b/cmd/environment_env_override_create.go
@@ -17,7 +17,7 @@ var environmentEnvOverrideCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		checkError(err)
 
 		client := utils.GetQoveryClient(tokenType, token)
diff --git a/cmd/environment_env_update.go b/cmd/environment_env_update.go
index 07ab0b6e..54499b26 100644
--- a/cmd/environment_env_update.go
+++ b/cmd/environment_env_update.go
@@ -17,7 +17,7 @@ var environmentEnvUpdateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		checkError(err)
 
 		client := utils.GetQoveryClient(tokenType, token)
diff --git a/cmd/environment_external_secret_create.go b/cmd/environment_external_secret_create.go
index 25201021..9b40c9c8 100644
--- a/cmd/environment_external_secret_create.go
+++ b/cmd/environment_external_secret_create.go
@@ -17,7 +17,7 @@ var environmentExternalSecretCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		checkError(err)
 
 		client := utils.GetQoveryClient(tokenType, token)
diff --git a/cmd/environment_external_secret_delete.go b/cmd/environment_external_secret_delete.go
index 2162bec1..d54d9156 100644
--- a/cmd/environment_external_secret_delete.go
+++ b/cmd/environment_external_secret_delete.go
@@ -17,7 +17,7 @@ var environmentExternalSecretDeleteCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		checkError(err)
 
 		client := utils.GetQoveryClient(tokenType, token)
diff --git a/cmd/environment_external_secret_update.go b/cmd/environment_external_secret_update.go
index 30680d3c..3b6834dc 100644
--- a/cmd/environment_external_secret_update.go
+++ b/cmd/environment_external_secret_update.go
@@ -17,7 +17,7 @@ var environmentExternalSecretUpdateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		checkError(err)
 
 		client := utils.GetQoveryClient(tokenType, token)
diff --git a/cmd/environment_list.go b/cmd/environment_list.go
index 3bde68ec..02dc5789 100644
--- a/cmd/environment_list.go
+++ b/cmd/environment_list.go
@@ -16,7 +16,7 @@ var environmentListCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/environment_stage_create.go b/cmd/environment_stage_create.go
index de642722..6d90e319 100644
--- a/cmd/environment_stage_create.go
+++ b/cmd/environment_stage_create.go
@@ -14,7 +14,7 @@ var environmentStageCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/environment_stage_delete.go b/cmd/environment_stage_delete.go
index 3819ce95..de5e231d 100644
--- a/cmd/environment_stage_delete.go
+++ b/cmd/environment_stage_delete.go
@@ -15,7 +15,7 @@ var environmentStageDeleteCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/environment_stage_edit.go b/cmd/environment_stage_edit.go
index 7d6c111d..31e13fce 100644
--- a/cmd/environment_stage_edit.go
+++ b/cmd/environment_stage_edit.go
@@ -14,7 +14,7 @@ var environmentStageEditCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/environment_stage_list.go b/cmd/environment_stage_list.go
index 25d221b7..46db5e54 100644
--- a/cmd/environment_stage_list.go
+++ b/cmd/environment_stage_list.go
@@ -17,7 +17,7 @@ var environmentStageListCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		utils.CheckError(err)
 
 		client := utils.GetQoveryClient(tokenType, token)
diff --git a/cmd/environment_stage_move.go b/cmd/environment_stage_move.go
index b5672cf0..175e47ab 100644
--- a/cmd/environment_stage_move.go
+++ b/cmd/environment_stage_move.go
@@ -15,7 +15,7 @@ var environmentStageMoveCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/environment_stage_skip.go b/cmd/environment_stage_skip.go
index ce2f383b..e6ae1735 100644
--- a/cmd/environment_stage_skip.go
+++ b/cmd/environment_stage_skip.go
@@ -16,7 +16,7 @@ var environmentStageSkipCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		utils.CheckError(err)
 
 		client := utils.GetQoveryClient(tokenType, token)
diff --git a/cmd/environment_stage_unskip.go b/cmd/environment_stage_unskip.go
index a875b269..6e6e6ae8 100644
--- a/cmd/environment_stage_unskip.go
+++ b/cmd/environment_stage_unskip.go
@@ -16,7 +16,7 @@ var environmentStageUnskipCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		utils.CheckError(err)
 
 		client := utils.GetQoveryClient(tokenType, token)
diff --git a/cmd/environment_statuses.go b/cmd/environment_statuses.go
index 6b3dcb1d..53cd0ae8 100644
--- a/cmd/environment_statuses.go
+++ b/cmd/environment_statuses.go
@@ -15,7 +15,7 @@ var environmentServicesStatusesCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/environment_update.go b/cmd/environment_update.go
index 3fc5b027..5511735e 100644
--- a/cmd/environment_update.go
+++ b/cmd/environment_update.go
@@ -17,7 +17,7 @@ var environmentUpdateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/helm_cancel.go b/cmd/helm_cancel.go
index 1e37540a..da9740cb 100644
--- a/cmd/helm_cancel.go
+++ b/cmd/helm_cancel.go
@@ -16,7 +16,7 @@ var helmCancelCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/helm_clone.go b/cmd/helm_clone.go
index 50d57094..8411a8b5 100644
--- a/cmd/helm_clone.go
+++ b/cmd/helm_clone.go
@@ -20,7 +20,7 @@ var helmCloneCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/helm_container_create.go b/cmd/helm_container_create.go
index dc7886f5..8f2dd8e1 100644
--- a/cmd/helm_container_create.go
+++ b/cmd/helm_container_create.go
@@ -20,7 +20,7 @@ var helmDomainCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/helm_domain_edit.go b/cmd/helm_domain_edit.go
index eed5ed9d..a0b8e805 100644
--- a/cmd/helm_domain_edit.go
+++ b/cmd/helm_domain_edit.go
@@ -19,7 +19,7 @@ var helmDomainEditCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/helm_domain_list.go b/cmd/helm_domain_list.go
index 0c4d0e8d..26f9caa9 100644
--- a/cmd/helm_domain_list.go
+++ b/cmd/helm_domain_list.go
@@ -20,7 +20,7 @@ var helmDomainListCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/helm_env_alias_create.go b/cmd/helm_env_alias_create.go
index ecbdefe6..33345a09 100644
--- a/cmd/helm_env_alias_create.go
+++ b/cmd/helm_env_alias_create.go
@@ -17,7 +17,7 @@ var helmEnvAliasCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/helm_env_create.go b/cmd/helm_env_create.go
index ae1f040c..32d169fc 100644
--- a/cmd/helm_env_create.go
+++ b/cmd/helm_env_create.go
@@ -17,7 +17,7 @@ var helmEnvCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/helm_env_delete.go b/cmd/helm_env_delete.go
index 828db832..6ba99dfa 100644
--- a/cmd/helm_env_delete.go
+++ b/cmd/helm_env_delete.go
@@ -17,7 +17,7 @@ var helmEnvDeleteCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/helm_env_list.go b/cmd/helm_env_list.go
index 1d40f2d8..9ef8a58b 100644
--- a/cmd/helm_env_list.go
+++ b/cmd/helm_env_list.go
@@ -15,7 +15,7 @@ var helmEnvListCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/helm_env_override_create.go b/cmd/helm_env_override_create.go
index 630a1ff7..a43c9ffb 100644
--- a/cmd/helm_env_override_create.go
+++ b/cmd/helm_env_override_create.go
@@ -17,7 +17,7 @@ var helmEnvOverrideCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/helm_env_update.go b/cmd/helm_env_update.go
index 95fc449c..e2b46d32 100644
--- a/cmd/helm_env_update.go
+++ b/cmd/helm_env_update.go
@@ -17,7 +17,7 @@ var helmEnvUpdateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/helm_external_secret_create.go b/cmd/helm_external_secret_create.go
index 2d380c3f..31292867 100644
--- a/cmd/helm_external_secret_create.go
+++ b/cmd/helm_external_secret_create.go
@@ -17,7 +17,7 @@ var helmExternalSecretCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/helm_external_secret_delete.go b/cmd/helm_external_secret_delete.go
index af3f4d6a..f2c65a22 100644
--- a/cmd/helm_external_secret_delete.go
+++ b/cmd/helm_external_secret_delete.go
@@ -17,7 +17,7 @@ var helmExternalSecretDeleteCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/helm_external_secret_update.go b/cmd/helm_external_secret_update.go
index 7fba664a..0d887783 100644
--- a/cmd/helm_external_secret_update.go
+++ b/cmd/helm_external_secret_update.go
@@ -17,7 +17,7 @@ var helmExternalSecretUpdateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/helm_list.go b/cmd/helm_list.go
index b317151c..b1ffb0cf 100644
--- a/cmd/helm_list.go
+++ b/cmd/helm_list.go
@@ -15,7 +15,7 @@ var helmListCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/helm_update.go b/cmd/helm_update.go
index 265105dd..38ef9b13 100644
--- a/cmd/helm_update.go
+++ b/cmd/helm_update.go
@@ -20,7 +20,7 @@ var helmUpdateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/hem_domain_delete.go b/cmd/hem_domain_delete.go
index 7b496a37..77c182af 100644
--- a/cmd/hem_domain_delete.go
+++ b/cmd/hem_domain_delete.go
@@ -17,7 +17,7 @@ var helmDomainDeleteCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/lifecycle_cancel.go b/cmd/lifecycle_cancel.go
index f7180c43..5c257fd0 100644
--- a/cmd/lifecycle_cancel.go
+++ b/cmd/lifecycle_cancel.go
@@ -16,7 +16,7 @@ var lifecycleCancelCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/lifecycle_clone.go b/cmd/lifecycle_clone.go
index 4f0b97a2..445422c5 100644
--- a/cmd/lifecycle_clone.go
+++ b/cmd/lifecycle_clone.go
@@ -20,7 +20,7 @@ var lifecycleCloneCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/lifecycle_env_alias_create.go b/cmd/lifecycle_env_alias_create.go
index c5de2d7d..5c480270 100644
--- a/cmd/lifecycle_env_alias_create.go
+++ b/cmd/lifecycle_env_alias_create.go
@@ -17,7 +17,7 @@ var lifecycleEnvAliasCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/lifecycle_env_create.go b/cmd/lifecycle_env_create.go
index 253e1c56..225dc033 100644
--- a/cmd/lifecycle_env_create.go
+++ b/cmd/lifecycle_env_create.go
@@ -17,7 +17,7 @@ var lifecycleEnvCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/lifecycle_env_delete.go b/cmd/lifecycle_env_delete.go
index 7b1bb702..cf2b71a7 100644
--- a/cmd/lifecycle_env_delete.go
+++ b/cmd/lifecycle_env_delete.go
@@ -17,7 +17,7 @@ var lifecycleEnvDeleteCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/lifecycle_env_list.go b/cmd/lifecycle_env_list.go
index f7d6381b..cbf3181c 100644
--- a/cmd/lifecycle_env_list.go
+++ b/cmd/lifecycle_env_list.go
@@ -16,7 +16,7 @@ var lifecycleEnvListCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/lifecycle_env_override_create.go b/cmd/lifecycle_env_override_create.go
index 52c9fe36..263ab5e1 100644
--- a/cmd/lifecycle_env_override_create.go
+++ b/cmd/lifecycle_env_override_create.go
@@ -17,7 +17,7 @@ var lifecycleEnvOverrideCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/lifecycle_env_update.go b/cmd/lifecycle_env_update.go
index e187f7a5..3b61b3ec 100644
--- a/cmd/lifecycle_env_update.go
+++ b/cmd/lifecycle_env_update.go
@@ -17,7 +17,7 @@ var lifecycleEnvUpdateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/lifecycle_external_secret_create.go b/cmd/lifecycle_external_secret_create.go
index f24f4d20..fdb5328f 100644
--- a/cmd/lifecycle_external_secret_create.go
+++ b/cmd/lifecycle_external_secret_create.go
@@ -17,7 +17,7 @@ var lifecycleExternalSecretCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/lifecycle_external_secret_delete.go b/cmd/lifecycle_external_secret_delete.go
index 3581c62c..ee3c0acb 100644
--- a/cmd/lifecycle_external_secret_delete.go
+++ b/cmd/lifecycle_external_secret_delete.go
@@ -17,7 +17,7 @@ var lifecycleExternalSecretDeleteCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/lifecycle_external_secret_update.go b/cmd/lifecycle_external_secret_update.go
index 80c8eec1..fc5670f9 100644
--- a/cmd/lifecycle_external_secret_update.go
+++ b/cmd/lifecycle_external_secret_update.go
@@ -17,7 +17,7 @@ var lifecycleExternalSecretUpdateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/lifecycle_list.go b/cmd/lifecycle_list.go
index 9567818f..4fba728d 100644
--- a/cmd/lifecycle_list.go
+++ b/cmd/lifecycle_list.go
@@ -17,7 +17,7 @@ var lifecycleListCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/lifecycle_update.go b/cmd/lifecycle_update.go
index 4735899e..71164091 100644
--- a/cmd/lifecycle_update.go
+++ b/cmd/lifecycle_update.go
@@ -19,7 +19,7 @@ var lifecycleUpdateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/log.go b/cmd/log.go
index 3b6b7d6f..91a9ee74 100644
--- a/cmd/log.go
+++ b/cmd/log.go
@@ -28,7 +28,7 @@ var logCmd = &cobra.Command{
 }
 
 func getLogs() string {
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(1)
diff --git a/cmd/organization_list.go b/cmd/organization_list.go
index 49e91ce6..48eb9f11 100644
--- a/cmd/organization_list.go
+++ b/cmd/organization_list.go
@@ -17,7 +17,7 @@ var organizationListCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/port-forward.go b/cmd/port-forward.go
index 0a29b478..45e85cb8 100644
--- a/cmd/port-forward.go
+++ b/cmd/port-forward.go
@@ -157,7 +157,7 @@ func portForwardRequestFromSelect() (*pkg.PortForwardRequest, error) {
 }
 
 func portForwardRequestFromContext(currentContext utils.QoveryContext) (*pkg.PortForwardRequest, error) {
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(1)
diff --git a/cmd/project_env_alias_create.go b/cmd/project_env_alias_create.go
index 23627e26..bb051417 100644
--- a/cmd/project_env_alias_create.go
+++ b/cmd/project_env_alias_create.go
@@ -15,7 +15,7 @@ var projectEnvAliasCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		checkError(err)
 
 		client := utils.GetQoveryClient(tokenType, token)
diff --git a/cmd/project_env_create.go b/cmd/project_env_create.go
index de73f308..f9f0d7b3 100644
--- a/cmd/project_env_create.go
+++ b/cmd/project_env_create.go
@@ -15,7 +15,7 @@ var projectEnvCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		checkError(err)
 
 		client := utils.GetQoveryClient(tokenType, token)
diff --git a/cmd/project_env_delete.go b/cmd/project_env_delete.go
index 32f4919c..71c4bd2e 100644
--- a/cmd/project_env_delete.go
+++ b/cmd/project_env_delete.go
@@ -15,7 +15,7 @@ var projectEnvDeleteCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		checkError(err)
 
 		client := utils.GetQoveryClient(tokenType, token)
diff --git a/cmd/project_env_list.go b/cmd/project_env_list.go
index 674fa43c..bf626e9f 100644
--- a/cmd/project_env_list.go
+++ b/cmd/project_env_list.go
@@ -13,7 +13,7 @@ var projectEnvListCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		checkError(err)
 
 		client := utils.GetQoveryClient(tokenType, token)
diff --git a/cmd/project_env_update.go b/cmd/project_env_update.go
index 261536fb..6eb2d32d 100644
--- a/cmd/project_env_update.go
+++ b/cmd/project_env_update.go
@@ -15,7 +15,7 @@ var projectEnvUpdateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		checkError(err)
 
 		client := utils.GetQoveryClient(tokenType, token)
diff --git a/cmd/project_list.go b/cmd/project_list.go
index 58db24f8..01e9cf0a 100644
--- a/cmd/project_list.go
+++ b/cmd/project_list.go
@@ -18,7 +18,7 @@ var projectListCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/service_list.go b/cmd/service_list.go
index 8643026d..f3cfcdc8 100644
--- a/cmd/service_list.go
+++ b/cmd/service_list.go
@@ -33,7 +33,7 @@ var serviceListCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/shell.go b/cmd/shell.go
index d5cbc9a1..e1d64ebe 100644
--- a/cmd/shell.go
+++ b/cmd/shell.go
@@ -83,7 +83,7 @@ var (
 )
 
 func shellRequestWithContextFlags() (*pkg.ShellRequest, error) {
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(1)
@@ -218,7 +218,7 @@ func shellRequestFromSelect() (*pkg.ShellRequest, error) {
 }
 
 func shellRequestFromContext(currentContext utils.QoveryContext) (*pkg.ShellRequest, error) {
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(1)
diff --git a/cmd/status.go b/cmd/status.go
index 01faad34..ed1bf53e 100644
--- a/cmd/status.go
+++ b/cmd/status.go
@@ -15,7 +15,7 @@ var statusCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(0)
diff --git a/cmd/terraform_external_secret_create.go b/cmd/terraform_external_secret_create.go
index 1aa0d409..23909b30 100644
--- a/cmd/terraform_external_secret_create.go
+++ b/cmd/terraform_external_secret_create.go
@@ -17,7 +17,7 @@ var terraformExternalSecretCreateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/terraform_external_secret_delete.go b/cmd/terraform_external_secret_delete.go
index da0426a3..afa97d48 100644
--- a/cmd/terraform_external_secret_delete.go
+++ b/cmd/terraform_external_secret_delete.go
@@ -17,7 +17,7 @@ var terraformExternalSecretDeleteCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/terraform_external_secret_update.go b/cmd/terraform_external_secret_update.go
index 2523436a..21e681c3 100644
--- a/cmd/terraform_external_secret_update.go
+++ b/cmd/terraform_external_secret_update.go
@@ -17,7 +17,7 @@ var terraformExternalSecretUpdateCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/terraform_list.go b/cmd/terraform_list.go
index 307019f8..21df199b 100644
--- a/cmd/terraform_list.go
+++ b/cmd/terraform_list.go
@@ -17,7 +17,7 @@ var terraformListCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.Capture(cmd)
 
-		tokenType, token, err := utils.GetAccessToken()
+		tokenType, token, err := utils.GetAccessToken(false)
 		if err != nil {
 			utils.PrintlnError(err)
 			os.Exit(1)
diff --git a/cmd/token.go b/cmd/token.go
index 13dbe4e3..ac0b55f7 100644
--- a/cmd/token.go
+++ b/cmd/token.go
@@ -39,7 +39,7 @@ var tokenCmd = &cobra.Command{
 }
 
 func generateMachineToMachineAPIToken(tokenInformation *utils.TokenInformation) (string, error) {
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		return "", err
 	}
diff --git a/pkg/admin_cluster_services.go b/pkg/admin_cluster_services.go
index ec996cef..fc2d19fc 100644
--- a/pkg/admin_cluster_services.go
+++ b/pkg/admin_cluster_services.go
@@ -156,7 +156,7 @@ func UpdateClusterDomainName(clusterId string, domain string) error {
 		return fmt.Errorf("domain cannot be empty")
 	}
 
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		return fmt.Errorf("failed to get access token: %w", err)
 	}
@@ -224,7 +224,7 @@ func UpdateClusterDnsProvider(
 		return fmt.Errorf("provider cannot be empty")
 	}
 
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		return fmt.Errorf("failed to get access token: %w", err)
 	}
@@ -327,7 +327,7 @@ func UpdateClusterDnsProvider(
 }
 
 func (service AdminClusterListServiceImpl) fetchClustersEligibleToUpdate() ([]ClusterDetails, error) {
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		return nil, err
 	}
@@ -493,7 +493,7 @@ func (service AdminClusterBatchDeployServiceImpl) PrintParameters() {
 }
 
 func getQoveryClient() (*qovery.APIClient, error) {
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/admin_environment_deployment_rules.go b/pkg/admin_environment_deployment_rules.go
index e477df0e..c55a7a89 100644
--- a/pkg/admin_environment_deployment_rules.go
+++ b/pkg/admin_environment_deployment_rules.go
@@ -22,7 +22,7 @@ func PublishEnvironmentDeploymentRules() error {
 }
 
 func callPublishEnvironmentDeploymentRulesApi() error {
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(0)
diff --git a/pkg/admin_load_credentials.go b/pkg/admin_load_credentials.go
index b88477d9..d75a6c9b 100644
--- a/pkg/admin_load_credentials.go
+++ b/pkg/admin_load_credentials.go
@@ -96,7 +96,7 @@ type AwsStsCredentials struct {
 }
 
 func fetchAwsCredentials(roleArn string) ([]byte, error) {
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	utils.CheckError(err)
 
 	req, err := http.NewRequest(http.MethodPost, utils.GetAdminUrl()+"/aws/credentials/assume-role?role_arn="+roleArn, nil)
@@ -115,7 +115,7 @@ func fetchAwsCredentials(roleArn string) ([]byte, error) {
 }
 
 func getClusterCredentials(clusterId string) []utils.Var {
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(0)
diff --git a/pkg/admin_notify_users_cluster_failure.go b/pkg/admin_notify_users_cluster_failure.go
index 91555d58..e0d695af 100644
--- a/pkg/admin_notify_users_cluster_failure.go
+++ b/pkg/admin_notify_users_cluster_failure.go
@@ -36,7 +36,7 @@ func NotifyUsersClusterFailure(clusterId *string) error {
 }
 
 func postWithBody(url string, bodyAsString string) (*http.Response, error) {
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(0)
diff --git a/pkg/cluster.go b/pkg/cluster.go
index 28321ff8..d4e2930a 100644
--- a/pkg/cluster.go
+++ b/pkg/cluster.go
@@ -76,7 +76,7 @@ func GetTokenByClusterId(clusterId string, readOnly bool) string {
 }
 
 func GetQoveryClientInstance() *qovery.APIClient {
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(1)
diff --git a/pkg/delete_orga.go b/pkg/delete_orga.go
index 689c57db..8b53add0 100644
--- a/pkg/delete_orga.go
+++ b/pkg/delete_orga.go
@@ -138,7 +138,7 @@ func httpDelete(url string, method string, dryRunDisabled bool) *http.Response {
 }
 
 func deleteWithBody(url string, method string, dryRunDisabled bool, body io.Reader) *http.Response {
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(0)
diff --git a/pkg/deploy.go b/pkg/deploy.go
index dcc4a646..c83eb1b6 100644
--- a/pkg/deploy.go
+++ b/pkg/deploy.go
@@ -13,7 +13,7 @@ import (
 )
 
 func execAdminRequest(url string, method string, dryRunDisabled bool, queryParams map[string]string) *http.Response {
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(0)
diff --git a/pkg/download_s3_archive.go b/pkg/download_s3_archive.go
index 8d7a7f44..7782db9b 100644
--- a/pkg/download_s3_archive.go
+++ b/pkg/download_s3_archive.go
@@ -94,7 +94,7 @@ func findOrganizationInTag(tags []ArchiveTagsResponse) *string {
 }
 
 func download(url string, executionId string) *http.Response {
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(0)
diff --git a/pkg/enterpriseconnection/enterprise_connection_service.go b/pkg/enterpriseconnection/enterprise_connection_service.go
index 91137150..5fe4b374 100644
--- a/pkg/enterpriseconnection/enterprise_connection_service.go
+++ b/pkg/enterpriseconnection/enterprise_connection_service.go
@@ -25,7 +25,7 @@ type EnterpriseConnectionService struct {
 // NewEnterpriseConnectionService creates a new service instance with authentication
 func NewEnterpriseConnectionService(organizationName string) (*EnterpriseConnectionService, error) {
 	// Get access token and client
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/lock.go b/pkg/lock.go
index c0170c1b..91b972d0 100644
--- a/pkg/lock.go
+++ b/pkg/lock.go
@@ -65,7 +65,7 @@ func LockedClusters() {
 }
 
 func listLockedClusters() *http.Response {
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(0)
diff --git a/pkg/log.go b/pkg/log.go
index ce229e10..ec5b6c66 100644
--- a/pkg/log.go
+++ b/pkg/log.go
@@ -76,7 +76,7 @@ func createLogWebsocket(req *LogRequest) (*websocket.Conn, error) {
 		return nil, err
 	}
 
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/port-forward.go b/pkg/port-forward.go
index f2bcb652..df6fb39e 100644
--- a/pkg/port-forward.go
+++ b/pkg/port-forward.go
@@ -68,7 +68,7 @@ func mkWebsocketConn(req *PortForwardRequest) (*WebsocketPortForward, error) {
 	pattern := regexp.MustCompile("%5B([0-9]+)%5D=")
 	wsURL.RawQuery = pattern.ReplaceAllString(command.Encode(), "[${1}]=")
 
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/service_list_pods.go b/pkg/service_list_pods.go
index 7f3d4890..f7f56453 100644
--- a/pkg/service_list_pods.go
+++ b/pkg/service_list_pods.go
@@ -33,7 +33,7 @@ func ExecListPods(req *PortForwardRequest) (*ListPodResponse, error) {
 	pattern := regexp.MustCompile("%5B([0-9]+)%5D=")
 	wsURL.RawQuery = pattern.ReplaceAllString(command.Encode(), "[${1}]=")
 
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/shell.go b/pkg/shell.go
index 7487f297..9cf20f51 100644
--- a/pkg/shell.go
+++ b/pkg/shell.go
@@ -193,7 +193,7 @@ func createWebsocketConn(req interface{}, path string) (*websocket.Conn, *http.R
 	pattern := regexp.MustCompile("%5B([0-9]+)%5D=")
 	wsURL.RawQuery = pattern.ReplaceAllString(command.Encode(), "[${1}]=")
 
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		return nil, nil, err
 	}
diff --git a/pkg/update.go b/pkg/update.go
index 51adcd76..da94ec16 100644
--- a/pkg/update.go
+++ b/pkg/update.go
@@ -47,7 +47,7 @@ func UpdateAll(dryRunDisabled bool, version string, providerKind string, paralle
 }
 
 func update(url string, method string, dryRunDisabled bool, version string, providerKind string, parallelRun int) *http.Response {
-	tokenType, token, err := utils.GetAccessToken()
+	tokenType, token, err := utils.GetAccessToken(false)
 	if err != nil {
 		utils.PrintlnError(err)
 		os.Exit(0)
diff --git a/utils/context.go b/utils/context.go
index e5200019..9b896682 100644
--- a/utils/context.go
+++ b/utils/context.go
@@ -307,7 +307,14 @@ func checkOrgaValid(orgaList *qovery.OrganizationResponseList) error {
 	}
 }
 
-func GetAccessToken() (AccessTokenType, AccessToken, error) {
+// GetAccessToken returns a valid access token, refreshing it if expired.
+// skipOrgaCheck should be false for every caller except the one legitimate
+// bootstrap case where an empty org list is expected: creating the user's
+// first organization via `qovery api organization --method POST ...`
+// (documented as a first-class example in `qovery api --help`). Passing
+// true anywhere else would let organization-scoped commands run with no
+// organization to scope to.
+func GetAccessToken(skipOrgaCheck bool) (AccessTokenType, AccessToken, error) {
 	apiToken := os.Getenv("QOVERY_CLI_ACCESS_TOKEN")
 	if apiToken == "" {
 		apiToken = os.Getenv("Q_CLI_ACCESS_TOKEN")
@@ -334,8 +341,10 @@ func GetAccessToken() (AccessTokenType, AccessToken, error) {
 	// check the token is valid by trying to list the organizations
 	if orgaList, _, err := GetQoveryClient("Bearer", token).OrganizationMainCallsAPI.ListOrganization(context2.Background()).Execute(); err == nil {
 		// everything is fine, return the token
-		if err = checkOrgaValid(orgaList); err != nil {
-			return "", "", err
+		if !skipOrgaCheck {
+			if err = checkOrgaValid(orgaList); err != nil {
+				return "", "", err
+			}
 		}
 		return "Bearer", token, nil
 	}
@@ -347,8 +356,10 @@ func GetAccessToken() (AccessTokenType, AccessToken, error) {
 
 	if orgaList, _, err := GetQoveryClient("Bearer", token).OrganizationMainCallsAPI.ListOrganization(context2.Background()).Execute(); err == nil {
 		// everything is fine, return the token
-		if err = checkOrgaValid(orgaList); err != nil {
-			return "", "", err
+		if !skipOrgaCheck {
+			if err = checkOrgaValid(orgaList); err != nil {
+				return "", "", err
+			}
 		}
 
 		return "Bearer", token, nil
diff --git a/utils/context_test.go b/utils/context_test.go
new file mode 100644
index 00000000..ecacf4bc
--- /dev/null
+++ b/utils/context_test.go
@@ -0,0 +1,99 @@
+package utils
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"path/filepath"
+	"testing"
+	"time"
+
+	"github.com/qovery/qovery-client-go"
+)
+
+func TestCheckOrgaValid(t *testing.T) {
+	tests := []struct {
+		name    string
+		results []qovery.Organization
+		wantErr bool
+	}{
+		{"empty organization list returns an error", []qovery.Organization{}, true},
+		{"non-empty organization list returns nil", []qovery.Organization{{Id: "org-1", Name: "test"}}, false},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			list := qovery.OrganizationResponseList{Results: tt.results}
+			err := checkOrgaValid(&list)
+			if (err != nil) != tt.wantErr {
+				t.Fatalf("checkOrgaValid() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}
+
+// writeTestQoveryContext writes a minimal, valid ~/.qovery/context.json under home
+// so GetCurrentContext() finds a non-expired access token without touching the
+// real user's context.
+func writeTestQoveryContext(t *testing.T, home string) {
+	t.Helper()
+	dir := filepath.Join(home, ".qovery")
+	if err := os.MkdirAll(dir, 0700); err != nil {
+		t.Fatal(err)
+	}
+	ctx := QoveryContext{
+		AccessToken:           "test-access-token",
+		AccessTokenExpiration: time.Now().Add(time.Hour),
+		RefreshToken:          "test-refresh-token",
+	}
+	bytes, err := json.Marshal(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+	contextPath := filepath.Join(dir, ContextFileName+".json")
+	if err := os.WriteFile(contextPath, bytes, ContextFilePermissions); err != nil {
+		t.Fatal(err)
+	}
+}
+
+// TestGetAccessToken_SkipOrgaCheck locks in the one behavior the qovery-cli#702
+// review asked to have covered: GetAccessToken(false) must keep rejecting a
+// zero-organization account (the guard every other command relies on), while
+// GetAccessToken(true) must let that one case through — used exclusively by
+// `qovery api organization --method POST` to bootstrap a brand-new account's
+// first organization.
+func TestGetAccessToken_SkipOrgaCheck(t *testing.T) {
+	tests := []struct {
+		name          string
+		orgListJSON   string
+		skipOrgaCheck bool
+		wantErr       bool
+	}{
+		{"zero organizations, check enforced -> rejected", `{"results":[]}`, false, true},
+		{"zero organizations, check skipped -> allowed", `{"results":[]}`, true, false},
+		{"existing organization, check enforced -> allowed", `{"results":[{"id":"org-1","created_at":"2024-01-01T00:00:00Z","name":"test","plan":"BUSINESS_2025"}]}`, false, false},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				w.Header().Set("Content-Type", "application/json")
+				_, _ = w.Write([]byte(tt.orgListJSON))
+			}))
+			defer server.Close()
+
+			home := t.TempDir()
+			t.Setenv("HOME", home)
+			t.Setenv("QOVERY_API_URL", server.URL)
+			t.Setenv("QOVERY_CLI_ACCESS_TOKEN", "")
+			t.Setenv("Q_CLI_ACCESS_TOKEN", "")
+			writeTestQoveryContext(t, home)
+
+			_, _, err := GetAccessToken(tt.skipOrgaCheck)
+			if (err != nil) != tt.wantErr {
+				t.Fatalf("GetAccessToken(%v) error = %v, wantErr %v", tt.skipOrgaCheck, err, tt.wantErr)
+			}
+		})
+	}
+}
diff --git a/utils/qovery.go b/utils/qovery.go
index 52585e8c..d8b21420 100644
--- a/utils/qovery.go
+++ b/utils/qovery.go
@@ -58,7 +58,7 @@ func WebsocketUrl() string {
 }
 
 func GetQoveryClientPanicInCaseOfError() *qovery.APIClient {
-	tokenType, token, err := GetAccessToken()
+	tokenType, token, err := GetAccessToken(false)
 	CheckError(err)
 	return GetQoveryClient(tokenType, token)
 }
@@ -93,7 +93,7 @@ func GetQoveryClient(tokenType AccessTokenType, token AccessToken) *qovery.APICl
 }
 
 func SelectRole(organization *Organization) (*Role, error) {
-	tokenType, token, err := GetAccessToken()
+	tokenType, token, err := GetAccessToken(false)
 	if err != nil {
 		return nil, err
 	}
@@ -140,7 +140,7 @@ func SelectRole(organization *Organization) (*Role, error) {
 }
 
 func SelectOrganization() (*Organization, error) {
-	tokenType, token, err := GetAccessToken()
+	tokenType, token, err := GetAccessToken(false)
 	if err != nil {
 		return nil, err
 	}
@@ -215,7 +215,7 @@ type Project struct {
 }
 
 func GetOrganizationById(id string) (*Organization, error) {
-	tokenType, token, err := GetAccessToken()
+	tokenType, token, err := GetAccessToken(false)
 	if err != nil {
 		return nil, err
 	}
@@ -237,7 +237,7 @@ func GetOrganizationById(id string) (*Organization, error) {
 }
 
 func SelectProject(organizationID Id) (*Project, error) {
-	tokenType, token, err := GetAccessToken()
+	tokenType, token, err := GetAccessToken(false)
 	if err != nil {
 		return nil, err
 	}
@@ -312,7 +312,7 @@ type Environment struct {
 }
 
 func GetProjectById(id string) (*Project, error) {
-	tokenType, token, err := GetAccessToken()
+	tokenType, token, err := GetAccessToken(false)
 	if err != nil {
 		return nil, err
 	}
@@ -334,7 +334,7 @@ func GetProjectById(id string) (*Project, error) {
 }
 
 func SelectEnvironment(projectID Id) (*Environment, error) {
-	tokenType, token, err := GetAccessToken()
+	tokenType, token, err := GetAccessToken(false)
 	if err != nil {
 		return nil, err
 	}
@@ -405,7 +405,7 @@ func SelectAndSetEnvironment(projectID Id) (*Environment, error) {
 }
 
 func GetEnvironmentById(id string) (*Environment, error) {
-	tokenType, token, err := GetAccessToken()
+	tokenType, token, err := GetAccessToken(false)
 	if err != nil {
 		return nil, err
 	}
@@ -433,7 +433,7 @@ type EnvironmentService struct {
 }
 
 func GetEnvironmentServicesById(id string) ([]EnvironmentService, error) {
-	tokenType, token, err := GetAccessToken()
+	tokenType, token, err := GetAccessToken(false)
 	if err != nil {
 		return nil, err
 	}
@@ -507,7 +507,7 @@ type Application struct {
 }
 
 func SelectService(environment Id) (*Service, error) {
-	tokenType, token, err := GetAccessToken()
+	tokenType, token, err := GetAccessToken(false)
 	if err != nil {
 		return nil, err
 	}
@@ -672,7 +672,7 @@ func SelectAndSetService(environment Id) (*Service, error) {
 }
 
 func GetApplicationById(id string) (*Application, error) {
-	tokenType, token, err := GetAccessToken()
+	tokenType, token, err := GetAccessToken(false)
 	if err != nil {
 		return nil, err
 	}
@@ -720,7 +720,7 @@ type Container struct {
 }
 
 func GetContainerById(id string) (*Container, error) {
-	tokenType, token, err := GetAccessToken()
+	tokenType, token, err := GetAccessToken(false)
 	if err != nil {
 		return nil, err
 	}
@@ -742,7 +742,7 @@ func GetContainerById(id string) (*Container, error) {
 }
 
 func GetDatabaseById(id string) (*Service, error) {
-	tokenType, token, err := GetAccessToken()
+	tokenType, token, err := GetAccessToken(false)
 	if err != nil {
 		return nil, err
 	}
@@ -765,7 +765,7 @@ func GetDatabaseById(id string) (*Service, error) {
 }
 
 func GetHelmById(id string) (*Service, error) {
-	tokenType, token, err := GetAccessToken()
+	tokenType, token, err := GetAccessToken(false)
 	if err != nil {
 		return nil, err
 	}
@@ -793,7 +793,7 @@ type Job struct {
 }
 
 func GetJobById(id string) (*Job, error) {
-	tokenType, token, err := GetAccessToken()
+	tokenType, token, err := GetAccessToken(false)
 	if err != nil {
 		return nil, err
 	}
@@ -836,7 +836,7 @@ func GetAdminUrl() string {
 }
 
 func DeleteEnvironmentVariable(application Id, key string) error {
-	tokenType, token, err := GetAccessToken()
+	tokenType, token, err := GetAccessToken(false)
 	if err != nil {
 		return err
 	}
@@ -876,7 +876,7 @@ func DeleteEnvironmentVariable(application Id, key string) error {
 }
 
 func AddEnvironmentVariable(application Id, key string, value string) error {
-	tokenType, token, err := GetAccessToken()
+	tokenType, token, err := GetAccessToken(false)
 	if err != nil {
 		return err
 	}
@@ -899,7 +899,7 @@ func AddEnvironmentVariable(application Id, key string, value string) error {
 }
 
 func DeleteSecret(application Id, key string) error {
-	tokenType, token, err := GetAccessToken()
+	tokenType, token, err := GetAccessToken(false)
 	if err != nil {
 		return err
 	}
@@ -939,7 +939,7 @@ func DeleteSecret(application Id, key string) error {
 }
 
 func AddSecret(application Id, key string, value string) error {
-	tokenType, token, err := GetAccessToken()
+	tokenType, token, err := GetAccessToken(false)
 	if err != nil {
 		return err
 	}
@@ -964,7 +964,7 @@ func AddSecret(application Id, key string, value string) error {
 // Container environment variable functions
 
 func AddContainerEnvironmentVariable(container Id, key string, value string) error {
-	tokenType, token, err := GetAccessToken()
+	tokenType, token, err := GetAccessToken(false)
 	if err != nil {
 		return err
 	}
@@ -987,7 +987,7 @@ func AddContainerEnvironmentVariable(container Id, key string, value string) err
 }
 
 func DeleteContainerEnvironmentVariable(container Id, key string) error {
-	tokenType, token, err := GetAccessToken()
+	tokenType, token, err := GetAccessToken(false)
 	if err != nil {
 		return err
 	}
@@ -1027,7 +1027,7 @@ func DeleteContainerEnvironmentVariable(container Id, key string) error {
 }
 
 func AddContainerSecret(container Id, key string, value string) error {
-	tokenType, token, err := GetAccessToken()
+	tokenType, token, err := GetAccessToken(false)
 	if err != nil {
 		return err
 	}
@@ -1050,7 +1050,7 @@ func AddContainerSecret(container Id, key string, value string) error {
 }
 
 func DeleteContainerSecret(container Id, key string) error {
-	tokenType, token, err := GetAccessToken()
+	tokenType, token, err := GetAccessToken(false)
 	if err != nil {
 		return err
 	}