diff --git a/.gitignore b/.gitignore
index a804171..763bd2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,4 +39,7 @@ dist/
 
 *.bazelrc.user
 
+.opencode
+opencode/
+opencode.json
 mimir-key
\ No newline at end of file
diff --git a/src/cmd/agent.go b/src/cmd/agent.go
index c6c10a5..ba4fa88 100644
--- a/src/cmd/agent.go
+++ b/src/cmd/agent.go
@@ -3,7 +3,6 @@ package cmd
 
 import (
 	"fmt"
-	"os"
 
 	"github.com/cubbit/composer-cli/src/action"
 	"github.com/cubbit/composer-cli/utils"
@@ -16,39 +15,25 @@ var agentCmd = &cobra.Command{
 }
 
 var createAgentSubCmd = &cobra.Command{
-	Use:   "create",
-	Short: "create a new agent",
+	Use:     "create",
+	Short:   "create a new agent or multiple agents from a batch file",
+	Example: "cubbit agent create --swarm-id <swarm-id> --nexus-id <nexus-id> --node-id <node-id> --batch --file ./batch.json\ncubbit agent create --swarm-id <swarm-id> --nexus-id <nexus-id> --node-id <node-id> --agent-port 8080 --agent-disk /dev/sdb --agent-mount-point /mnt/agent",
 	PreRun: func(cmd *cobra.Command, args []string) {
 
+		cmd.MarkFlagRequired("swarm-id")
 		cmd.MarkFlagRequired("nexus-id")
 		cmd.MarkFlagRequired("node-id")
 
-		batch, _ := cmd.Flags().GetBool("batch")
-		if batch {
-			file, _ := cmd.Flags().GetString("file")
-			if file == "" {
-				fmt.Println("Error: --file flag is required when using --batch mode.")
-				cmd.Usage()
-				os.Exit(1)
-			}
-
-			if _, err := os.Stat(file); os.IsNotExist(err) {
-				fmt.Println("Error: file does not exist:", file)
-				os.Exit(1)
-			}
-			return
-		}
-
-		cmd.MarkFlagRequired("agent-port")
-		cmd.MarkFlagRequired("agent-disk")
-		cmd.MarkFlagRequired("agent-mount-point")
+		cmd.MarkFlagsOneRequired("batch", "agent-port")
+		cmd.MarkFlagsRequiredTogether("batch", "file")
+		cmd.MarkFlagsRequiredTogether("agent-port", "agent-disk", "agent-mount-point")
 
-		agentPort := cmd.Flags().Lookup("agent-port")
-		if agentPort != nil && !agentPort.Changed {
-			fmt.Println("Error: --agent-port must be explicitly provided.")
-			cmd.Usage()
-			os.Exit(1)
-		}
+		cmd.MarkFlagsMutuallyExclusive("batch", "agent-port")
+		cmd.MarkFlagsMutuallyExclusive("batch", "agent-disk")
+		cmd.MarkFlagsMutuallyExclusive("batch", "agent-mount-point")
+		cmd.MarkFlagsMutuallyExclusive("file", "agent-port")
+		cmd.MarkFlagsMutuallyExclusive("file", "agent-disk")
+		cmd.MarkFlagsMutuallyExclusive("file", "agent-mount-point")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		batch, _ := cmd.Flags().GetBool("batch")
@@ -69,6 +54,7 @@ var editAgentSubCmd = &cobra.Command{
 	Use:   "edit",
 	Short: "edit an agent",
 	PreRun: func(cmd *cobra.Command, args []string) {
+		cmd.MarkFlagRequired("swarm-id")
 		cmd.MarkFlagRequired("nexus-id")
 		cmd.MarkFlagRequired("node-id")
 		cmd.MarkFlagRequired("agent-id")
@@ -84,6 +70,7 @@ var describeAgentSubCmd = &cobra.Command{
 	Use:   "describe",
 	Short: "describe an agent",
 	PreRun: func(cmd *cobra.Command, args []string) {
+		cmd.MarkFlagRequired("swarm-id")
 		cmd.MarkFlagRequired("nexus-id")
 		cmd.MarkFlagRequired("node-id")
 		cmd.MarkFlagRequired("agent-id")
@@ -96,34 +83,37 @@ var describeAgentSubCmd = &cobra.Command{
 }
 
 var listAgentsSubCmd = &cobra.Command{
-	Use:   "list",
-	Short: "list agents",
+	Use:     "list",
+	Short:   "list agents in a node or redundancy class",
+	Example: "cubbit agent list --swarm-id <swarm-id> --nexus-id <nexus-id> --node-id <node-id>\ncubbit agent list --swarm-id <swarm-id> --redundancy-class-id <redundancy-class-id>",
 	PreRun: func(cmd *cobra.Command, args []string) {
+		cmd.MarkFlagRequired("swarm-id")
+		cmd.MarkFlagsOneRequired("redundancy-class-id", "node-id")
+
+		cmd.MarkFlagsRequiredTogether("nexus-id", "node-id")
 		cmd.MarkFlagsMutuallyExclusive("nexus-id", "redundancy-class-id")
 		cmd.MarkFlagsMutuallyExclusive("node-id", "redundancy-class-id")
-
+	},
+	RunE: func(cmd *cobra.Command, args []string) error {
 		allowedSortingKeys := []string{"id", "node_id", "port", "created_at"}
 		sort, _ := cmd.Flags().GetString("sort")
-
 		if sort != "" && !utils.Contains(allowedSortingKeys, sort) {
-			fmt.Println("Error: invalid sort key provided, allowed keys are: id, node_id", "port", "created_at")
-			cmd.Usage()
-			os.Exit(1)
+			msg := "Error: invalid sort key provided, allowed keys are: id, node_id, port, created_at"
+			return fmt.Errorf(msg)
 		}
 
 		filter, _ := cmd.Flags().GetString("filter")
-		if filter != "" {
-			if !utils.IsValidFilter(filter) {
-				fmt.Println("Error: invalid filter provided, allowed format is: key:value key:value ...")
-				cmd.Usage()
-				os.Exit(1)
-			}
+		if filter != "" && !utils.IsValidFilter(filter) {
+			msg := "Error: invalid filter provided, allowed format is: key:value key:value ..."
+			return fmt.Errorf(msg)
 		}
-	},
-	Run: func(cmd *cobra.Command, args []string) {
+
 		if err := action.ListAgents(cmd, args); err != nil {
 			utils.PrintError(err)
+			return err
 		}
+
+		return nil
 	},
 }
 
@@ -131,6 +121,7 @@ var removeAgentSubCmd = &cobra.Command{
 	Use:   "remove",
 	Short: "remove an agent",
 	PreRun: func(cmd *cobra.Command, args []string) {
+		cmd.MarkFlagRequired("swarm-id")
 		cmd.MarkFlagRequired("nexus-id")
 		cmd.MarkFlagRequired("node-id")
 		cmd.MarkFlagRequired("agent-id")
@@ -146,6 +137,7 @@ var checkAgentStatusSubCmd = &cobra.Command{
 	Use:   "status",
 	Short: "check the status of an agent",
 	PreRun: func(cmd *cobra.Command, args []string) {
+		cmd.MarkFlagRequired("swarm-id")
 		cmd.MarkFlagRequired("nexus-id")
 		cmd.MarkFlagRequired("node-id")
 		cmd.MarkFlagRequired("agent-id")
@@ -194,8 +186,6 @@ func init() {
 
 	rootCmd.AddCommand(agentCmd)
 	agentCmd.PersistentFlags().String("swarm-id", "", "ID of the swarm")
-	agentCmd.MarkPersistentFlagRequired("swarm-id")
 	agentCmd.PersistentFlags().String("nexus-id", "", "ID of the nexus")
 	agentCmd.PersistentFlags().String("node-id", "", "ID of the node")
-
 }
diff --git a/src/cmd/gateway.go b/src/cmd/gateway.go
index 5ac3e98..43a3b42 100644
--- a/src/cmd/gateway.go
+++ b/src/cmd/gateway.go
@@ -3,7 +3,6 @@ package cmd
 
 import (
 	"fmt"
-	"os"
 
 	"github.com/cubbit/composer-cli/src/action"
 	"github.com/cubbit/composer-cli/utils"
@@ -21,6 +20,7 @@ var createGatewaySubCmd = &cobra.Command{
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("name")
 		cmd.MarkFlagRequired("location")
+		cmd.MarkFlagRequired("tenant-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.CreateGateway(cmd, args); err != nil {
@@ -34,6 +34,7 @@ var describeGatewaySubCmd = &cobra.Command{
 	Short: "describes tenant gateways",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("gateway-id")
+		cmd.MarkFlagRequired("tenant-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.DescribeGateway(cmd, args); err != nil {
@@ -47,6 +48,7 @@ var updateGatewaySubCmd = &cobra.Command{
 	Short: "updates a gateway in a tenant",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("gateway-id")
+		cmd.MarkFlagRequired("tenant-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.UpdateGateway(cmd, args); err != nil {
@@ -59,19 +61,22 @@ var listGatewaysSubCmd = &cobra.Command{
 	Use:   "list",
 	Short: "lists tenant gateways",
 	PreRun: func(cmd *cobra.Command, args []string) {
-		allowedSortingKeys := []string{"id, name"}
+		cmd.MarkFlagRequired("tenant-id")
+	},
+	RunE: func(cmd *cobra.Command, args []string) error {
+		allowedSortingKeys := []string{"id", "name"}
 		sort, _ := cmd.Flags().GetString("sort")
-
 		if sort != "" && !utils.Contains(allowedSortingKeys, sort) {
-			fmt.Println("Error: invalid sort key provided, allowed keys are: id, name")
-			cmd.Usage()
-			os.Exit(1)
+			err := fmt.Errorf("invalid sort key provided, allowed keys are: id, name")
+			return err
 		}
-	},
-	Run: func(cmd *cobra.Command, args []string) {
+
 		if err := action.ListGateways(cmd, args); err != nil {
 			utils.PrintError(err)
+			return err
 		}
+
+		return nil
 	},
 }
 
@@ -80,6 +85,7 @@ var removeGatewaySubCmd = &cobra.Command{
 	Short: "removes a tenant gateway",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("gateway-id")
+		cmd.MarkFlagRequired("tenant-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.RemoveGateway(cmd, args); err != nil {
@@ -89,12 +95,18 @@ var removeGatewaySubCmd = &cobra.Command{
 }
 
 var installGatewaySubCmd = &cobra.Command{
-	Use:   "install",
-	Short: "installs a gateway for a tenant",
+	Use:     "install",
+	Short:   "installs a gateway for a tenant",
+	Example: "cubbit gateway install --interactive\ncubbit gateway install --tenant-id <tenant-id> --gateway-id <gateway-id>",
 	PreRun: func(cmd *cobra.Command, args []string) {
-		cmd.MarkFlagRequired("gateway-id")
+		cmd.MarkFlagsOneRequired("interactive", "gateway-id")
+
+		cmd.MarkFlagsRequiredTogether("tenant-id", "gateway-id")
+		cmd.MarkFlagsMutuallyExclusive("interactive", "gateway-id")
+		cmd.MarkFlagsMutuallyExclusive("interactive", "tenant-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
+		interactive, _ := cmd.Flags().GetBool("interactive")
 		if !interactive {
 			if err := action.InstallGateway(cmd, args); err != nil {
 				utils.PrintError(err)
@@ -142,8 +154,8 @@ func init() {
 	installGatewaySubCmd.Flags().Bool("no-offloader", false, "Skip offloader setup")
 	installGatewaySubCmd.Flags().Bool("no-s3", false, "Skip S3 setup")
 	installGatewaySubCmd.Flags().Bool("ingress", false, "Install only ingress")
+	installGatewaySubCmd.Flags().BoolP("interactive", "i", false, "Run in interactive mode")
 
 	rootCmd.AddCommand(gatewayCmd)
 	gatewayCmd.PersistentFlags().String("tenant-id", "", "ID of the tenant")
-	gatewayCmd.MarkPersistentFlagRequired("tenant-id")
 }
diff --git a/src/cmd/nexus.go b/src/cmd/nexus.go
index 793f4de..fc5ad97 100644
--- a/src/cmd/nexus.go
+++ b/src/cmd/nexus.go
@@ -16,6 +16,7 @@ var createNexusSubCmd = &cobra.Command{
 	Use:   "create",
 	Short: "create a new nexus",
 	PreRun: func(cmd *cobra.Command, args []string) {
+		cmd.MarkFlagRequired("swarm-id")
 		cmd.MarkFlagRequired("name")
 		cmd.MarkFlagRequired("location")
 		cmd.MarkFlagRequired("provider-id")
@@ -32,6 +33,7 @@ var editNexusSubCmd = &cobra.Command{
 	Short: "edit a nexus",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("nexus-id")
+		cmd.MarkFlagRequired("swarm-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.EditNexus(cmd, args); err != nil {
@@ -45,6 +47,7 @@ var removeNexusSubCmd = &cobra.Command{
 	Short: "remove a nexus",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("nexus-id")
+		cmd.MarkFlagRequired("swarm-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.RemoveNexus(cmd, args); err != nil {
@@ -57,6 +60,7 @@ var listNexusesSubCmd = &cobra.Command{
 	Use:   "list",
 	Short: "list nexuses",
 	PreRun: func(cmd *cobra.Command, args []string) {
+		cmd.MarkFlagRequired("swarm-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.ListNexuses(cmd, args); err != nil {
@@ -70,6 +74,7 @@ var describeNexusSubCmd = &cobra.Command{
 	Short: "describe a nexus",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("nexus-id")
+		cmd.MarkFlagRequired("swarm-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.DescribeNexus(cmd, args); err != nil {
@@ -121,5 +126,4 @@ func init() {
 
 	rootCmd.AddCommand(nexusCmd)
 	nexusCmd.PersistentFlags().String("swarm-id", "", "ID of the swarm")
-	nexusCmd.MarkPersistentFlagRequired("swarm-id")
 }
diff --git a/src/cmd/node.go b/src/cmd/node.go
index 9db454b..8af0220 100644
--- a/src/cmd/node.go
+++ b/src/cmd/node.go
@@ -3,7 +3,6 @@ package cmd
 
 import (
 	"fmt"
-	"os"
 
 	"github.com/cubbit/composer-cli/src/action"
 	"github.com/cubbit/composer-cli/utils"
@@ -16,64 +15,61 @@ var nodeCmd = &cobra.Command{
 }
 
 var createNodeSubCmd = &cobra.Command{
-	Use:   "create",
-	Short: "create a new node",
+	Use:     "create",
+	Short:   "create a new node or a batch of nodes",
+	Example: "cubbit node create --swarm-id <swarm-id> --nexus-id <nexus-id> --batch --file ./batch.json\n cubbit node create --swarm-id <swarm-id> --nexus-id <nexus-id> --name <name> --private-ip <private-ip> --public-ip <public-ip> --label <label>",
 	PreRun: func(cmd *cobra.Command, args []string) {
-		batch, _ := cmd.Flags().GetBool("batch")
-		if batch {
-			file, _ := cmd.Flags().GetString("file")
-			if file == "" {
-				fmt.Println("Error: --file flag is required when using --batch mode.")
-				cmd.Usage()
-				os.Exit(1)
-			}
-
-			if _, err := os.Stat(file); os.IsNotExist(err) {
-				fmt.Println("Error: file does not exist:", file)
-				os.Exit(1)
-			}
-			return
-		}
-
-		cmd.MarkFlagRequired("name")
-		cmd.MarkFlagRequired("private-ip")
-		cmd.MarkFlagRequired("public-ip")
 
-		nodePrivateIP, _ := cmd.Flags().GetString("private-ip")
-		nodePublicIP, _ := cmd.Flags().GetString("public-ip")
-
-		if !utils.IsValidIP(nodePrivateIP) {
-			fmt.Println("Error: invalid node private IP address")
-			cmd.Usage()
-			os.Exit(1)
-		}
+		cmd.MarkFlagRequired("swarm-id")
+		cmd.MarkFlagRequired("nexus-id")
 
-		if !utils.IsValidIP(nodePublicIP) {
-			fmt.Println("Error: invalid node public IP address")
-			cmd.Usage()
-			os.Exit(1)
-		}
+		cmd.MarkFlagsOneRequired("batch", "name")
 
+		cmd.MarkFlagsRequiredTogether("batch", "file")
+		cmd.MarkFlagsRequiredTogether("name", "private-ip", "public-ip")
+		cmd.MarkFlagsMutuallyExclusive("batch", "name")
+		cmd.MarkFlagsMutuallyExclusive("batch", "private-ip")
+		cmd.MarkFlagsMutuallyExclusive("batch", "public-ip")
+		cmd.MarkFlagsMutuallyExclusive("batch", "label")
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	RunE: func(cmd *cobra.Command, args []string) error {
 		var err error
 
 		batch, err := cmd.Flags().GetBool("batch")
 		if err != nil {
-			utils.PrintError(fmt.Errorf("error retrieving batch flag: %w", err))
-			return
+			err = fmt.Errorf("error retrieving batch flag: %w", err)
+			utils.PrintError(err)
+			return err
 		}
 
 		if batch {
 			if err = action.CreateNodeBatch(cmd, args); err != nil {
 				utils.PrintError(err)
+				return err
 			}
-			return
+			return nil
+		}
+
+		nodePrivateIP, _ := cmd.Flags().GetString("private-ip")
+		if nodePrivateIP != "" && !utils.IsValidIP(nodePrivateIP) {
+			err = fmt.Errorf("invalid node private IP address")
+			utils.PrintError(err)
+			return err
+		}
+
+		nodePublicIP, _ := cmd.Flags().GetString("public-ip")
+		if nodePublicIP != "" && !utils.IsValidIP(nodePublicIP) {
+			err = fmt.Errorf("invalid node public IP address")
+			utils.PrintError(err)
+			return err
 		}
 
 		if err = action.CreateNode(cmd, args); err != nil {
 			utils.PrintError(err)
+			return err
 		}
+
+		return nil
 	},
 }
 
@@ -82,7 +78,8 @@ var describeNodeSubCmd = &cobra.Command{
 	Short: "describe a node",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("node-id")
-
+		cmd.MarkFlagRequired("swarm-id")
+		cmd.MarkFlagRequired("nexus-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.DescribeNode(cmd, args); err != nil {
@@ -96,7 +93,8 @@ var editNodeSubCmd = &cobra.Command{
 	Short: "edit a node",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("node-id")
-
+		cmd.MarkFlagRequired("swarm-id")
+		cmd.MarkFlagRequired("nexus-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.EditNode(cmd, args); err != nil {
@@ -110,7 +108,8 @@ var removeNodeSubCmd = &cobra.Command{
 	Short: "remove a node",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("node-id")
-
+		cmd.MarkFlagRequired("swarm-id")
+		cmd.MarkFlagRequired("nexus-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.RemoveNode(cmd, args); err != nil {
@@ -123,29 +122,26 @@ var listNodesSubCmd = &cobra.Command{
 	Use:   "list",
 	Short: "list nodes",
 	PreRun: func(cmd *cobra.Command, args []string) {
+		cmd.MarkFlagRequired("swarm-id")
+		cmd.MarkFlagRequired("nexus-id")
+	},
+	RunE: func(cmd *cobra.Command, args []string) error {
 		allowedSortingKeys := []string{"id", "name", "label", "created_at", "deleted_at", "nexus_id"}
 		sort, _ := cmd.Flags().GetString("sort")
-
 		if sort != "" && !utils.Contains(allowedSortingKeys, sort) {
-			fmt.Println("Error: invalid sort key provided, allowed keys are: \"id\", \"name\", \"label\", \"created_at\", \"deleted_at\", \"nexus_id\"")
-			cmd.Usage()
-			os.Exit(1)
+			return fmt.Errorf("Error: invalid sort key provided, allowed keys are: \"id\", \"name\", \"label\", \"created_at\", \"deleted_at\", \"nexus_id\"")
 		}
 
 		filter, _ := cmd.Flags().GetString("filter")
-		if filter != "" {
-			if !utils.IsValidFilter(filter) {
-				fmt.Println("Error: invalid filter provided, allowed format is: key:value key:value ...")
-				cmd.Usage()
-				os.Exit(1)
-			}
+		if filter != "" && !utils.IsValidFilter(filter) {
+			return fmt.Errorf("Error: invalid filter provided, allowed format is: key:value key:value ...")
 		}
 
-	},
-	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.ListNodes(cmd, args); err != nil {
-			utils.PrintError(err)
+			return err
 		}
+
+		return nil
 	},
 }
 
@@ -156,7 +152,6 @@ var deployNodeSubCmd = &cobra.Command{
 		cmd.MarkFlagRequired("swarm-id")
 		cmd.MarkFlagRequired("nexus-id")
 		cmd.MarkFlagRequired("node-id")
-
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.GenerateNodeDeployFiles(cmd, args); err != nil {
@@ -197,7 +192,5 @@ func init() {
 
 	rootCmd.AddCommand(nodeCmd)
 	nodeCmd.PersistentFlags().String("swarm-id", "", "ID of the swarm")
-	nodeCmd.MarkPersistentFlagRequired("swarm-id")
 	nodeCmd.PersistentFlags().String("nexus-id", "", "ID of the nexus")
-	nodeCmd.MarkPersistentFlagRequired("nexus-id")
 }
diff --git a/src/cmd/operator.go b/src/cmd/operator.go
index b7c27ee..3077ebf 100644
--- a/src/cmd/operator.go
+++ b/src/cmd/operator.go
@@ -24,16 +24,21 @@ var addIAMOperatorSubCmd = &cobra.Command{
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		tenantID, _ := cmd.Flags().GetString("tenant-id")
-		swarmID, _ := cmd.Flags().GetString("swarm-id")
-
 		if tenantID != "" {
 			if err := action.AddOperatorToTenant(cmd, args); err != nil {
 				utils.PrintError(err)
 			}
-		} else if swarmID != "" {
+
+			return
+		}
+
+		swarmID, _ := cmd.Flags().GetString("swarm-id")
+		if swarmID != "" {
 			if err := action.AddOperatorToSwarm(cmd, args); err != nil {
 				utils.PrintError(err)
 			}
+
+			return
 		}
 	},
 }
@@ -47,16 +52,21 @@ var listIAMOperatorsSubCmd = &cobra.Command{
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		tenantID, _ := cmd.Flags().GetString("tenant-id")
-		swarmID, _ := cmd.Flags().GetString("swarm-id")
-
 		if tenantID != "" {
 			if err := action.ListTenantOperators(cmd, args); err != nil {
 				utils.PrintError(err)
 			}
-		} else if swarmID != "" {
+
+			return
+		}
+
+		swarmID, _ := cmd.Flags().GetString("swarm-id")
+		if swarmID != "" {
 			if err := action.ListSwarmOperators(cmd, args); err != nil {
 				utils.PrintError(err)
 			}
+
+			return
 		}
 	},
 }
@@ -72,16 +82,22 @@ var removeIAMOperatorSubCmd = &cobra.Command{
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		tenantID, _ := cmd.Flags().GetString("tenant-id")
-		swarmID, _ := cmd.Flags().GetString("swarm-id")
 
 		if tenantID != "" {
 			if err := action.RemoveTenantOperator(cmd, args); err != nil {
 				utils.PrintError(err)
 			}
-		} else if swarmID != "" {
+
+			return
+		}
+
+		swarmID, _ := cmd.Flags().GetString("swarm-id")
+		if swarmID != "" {
 			if err := action.RemoveSwarmOperator(cmd, args); err != nil {
 				utils.PrintError(err)
 			}
+
+			return
 		}
 	},
 }
@@ -97,16 +113,22 @@ var describeIAMOperatorsSubCmd = &cobra.Command{
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		tenantID, _ := cmd.Flags().GetString("tenant-id")
-		swarmID, _ := cmd.Flags().GetString("swarm-id")
 
 		if tenantID != "" {
 			if err := action.DescribeTenantOperator(cmd, args); err != nil {
 				utils.PrintError(err)
 			}
-		} else if swarmID != "" {
+
+			return
+		}
+
+		swarmID, _ := cmd.Flags().GetString("swarm-id")
+		if swarmID != "" {
 			if err := action.DescribeSwarmOperator(cmd, args); err != nil {
 				utils.PrintError(err)
 			}
+
+			return
 		}
 	},
 }
@@ -118,27 +140,19 @@ func init() {
 	addIAMOperatorSubCmd.Flags().String("policy-id", "", "ID of the policy to assign to the operator")
 	addIAMOperatorSubCmd.Flags().String("first-name", "", "First name of the operator")
 	addIAMOperatorSubCmd.Flags().String("last-name", "", "Last name of the operator")
-	addIAMOperatorSubCmd.Flags().String("tenant-id", "", "ID of the tenant")
-	addIAMOperatorSubCmd.Flags().String("swarm-id", "", "ID of the swarm")
 
 	IAMUserCmd.AddCommand(listIAMOperatorsSubCmd)
 	listIAMOperatorsSubCmd.Flags().String("sort", "", "Sorts the output based on the given field")
 	listIAMOperatorsSubCmd.Flags().String("filter", "", "Filters the output based on the given field, allowed format is key:value")
-	listIAMOperatorsSubCmd.Flags().String("tenant-id", "", "ID of the tenant")
-	listIAMOperatorsSubCmd.Flags().String("swarm-id", "", "ID of the swarm")
 
 	IAMUserCmd.AddCommand(removeIAMOperatorSubCmd)
 	removeIAMOperatorSubCmd.Flags().String("user-id", "", "ID of the operator")
-	removeIAMOperatorSubCmd.Flags().String("tenant-id", "", "ID of the tenant")
-	removeIAMOperatorSubCmd.Flags().String("swarm-id", "", "ID of the swarm")
 
 	IAMUserCmd.AddCommand(describeIAMOperatorsSubCmd)
 	describeIAMOperatorsSubCmd.Flags().String("user-id", "", "ID of the operator")
-	describeIAMOperatorsSubCmd.Flags().String("tenant-id", "", "ID of the tenant")
-	describeIAMOperatorsSubCmd.Flags().String("swarm-id", "", "ID of the swarm")
 
 	iamCmd.AddCommand(IAMUserCmd)
 	IAMUserCmd.PersistentFlags().String("tenant-id", "", "ID of the tenant")
-	IAMUserCmd.MarkPersistentFlagRequired("tenant-id")
+	IAMUserCmd.PersistentFlags().String("swarm-id", "", "ID of the swarm")
 
 }
diff --git a/src/cmd/policy.go b/src/cmd/policy.go
index 41ed5ca..b4530fa 100644
--- a/src/cmd/policy.go
+++ b/src/cmd/policy.go
@@ -19,7 +19,6 @@ var promoteSubCmd = &cobra.Command{
 		cmd.MarkFlagRequired("email")
 		cmd.MarkFlagRequired("policy-name")
 		cmd.MarkFlagRequired("secret")
-
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.PromoteOperator(cmd, args); err != nil {
@@ -38,7 +37,6 @@ var EditIAMOperatorPolicySubCmd = &cobra.Command{
 
 		cmd.MarkFlagsOneRequired("tenant-id", "swarm-id")
 		cmd.MarkFlagsMutuallyExclusive("tenant-id", "swarm-id")
-
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		var tenantID, swarmID string
diff --git a/src/cmd/project.go b/src/cmd/project.go
index 7d18965..28b064e 100644
--- a/src/cmd/project.go
+++ b/src/cmd/project.go
@@ -3,7 +3,6 @@ package cmd
 
 import (
 	"fmt"
-	"os"
 
 	"github.com/cubbit/composer-cli/src/action"
 	"github.com/cubbit/composer-cli/utils"
@@ -19,19 +18,19 @@ var listTenantProjectsSubCmd = &cobra.Command{
 	Use:   "list",
 	Short: "lists tenant projects",
 	PreRun: func(cmd *cobra.Command, args []string) {
+		cmd.MarkFlagRequired("tenant-id")
+	},
+	RunE: func(cmd *cobra.Command, args []string) error {
 		allowedSortingKeys := []string{"project_id", "project_name", "project_created_at", "project_deleted_at", "project_banned_at", "project_tenant_id", "project_email", "root_account_email"}
 		sort, _ := cmd.Flags().GetString("sort")
-
 		if sort != "" && !utils.Contains(allowedSortingKeys, sort) {
-			fmt.Println("Error: invalid sort key provided, allowed keys are: project_id, project_name, project_created_at, project_deleted_at, project_banned_at, project_tenant_id, project_email, root_account_email")
-			cmd.Usage()
-			os.Exit(1)
+			return fmt.Errorf("invalid sort key provided, allowed keys are: project_id, project_name, project_created_at, project_deleted_at, project_banned_at, project_tenant_id, project_email, root_account_email")
 		}
-	},
-	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.ListTenantProjects(cmd, args); err != nil {
 			utils.PrintError(err)
+			return err
 		}
+		return nil
 	},
 }
 
@@ -40,6 +39,7 @@ var describeTenantProjectSubCmd = &cobra.Command{
 	Short: "describes tenant projects",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("project-id")
+		cmd.MarkFlagRequired("tenant-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.DescribeTenantProject(cmd, args); err != nil {
@@ -53,6 +53,7 @@ var removeTenantProjectSubCmd = &cobra.Command{
 	Short: "removes a tenant project",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("project-id")
+		cmd.MarkFlagRequired("tenant-id")
 
 	},
 	Run: func(cmd *cobra.Command, args []string) {
@@ -67,6 +68,7 @@ var banTenantProjectSubCmd = &cobra.Command{
 	Short: "freezes a tenant project",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("project-id")
+		cmd.MarkFlagRequired("tenant-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.BanTenantProject(cmd, args); err != nil {
@@ -80,6 +82,7 @@ var unbanTenantProjectSubCmd = &cobra.Command{
 	Short: "unfreezes a tenant project",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("project-id")
+		cmd.MarkFlagRequired("tenant-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.UnbanTenantProject(cmd, args); err != nil {
@@ -93,6 +96,7 @@ var restoreTenantProjectSubCmd = &cobra.Command{
 	Short: "restores a tenant project",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("project-id")
+		cmd.MarkFlagRequired("tenant-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.RestoreTenantProject(cmd, args); err != nil {
@@ -106,6 +110,7 @@ var updateTenantProjectSubCmd = &cobra.Command{
 	Short: "updates a project in a tenant",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("project-id")
+		cmd.MarkFlagRequired("tenant-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.UpdateTenantProject(cmd, args); err != nil {
@@ -142,6 +147,5 @@ func init() {
 
 	tenantCmd.AddCommand(projectCmd)
 	projectCmd.PersistentFlags().String("tenant-id", "", "ID of the tenant")
-	projectCmd.MarkPersistentFlagRequired("tenant-id")
 
 }
diff --git a/src/cmd/redundancy_class.go b/src/cmd/redundancy_class.go
index 4bccc79..b614a58 100644
--- a/src/cmd/redundancy_class.go
+++ b/src/cmd/redundancy_class.go
@@ -20,12 +20,19 @@ var CreateRedundancyClassSubCmd = &cobra.Command{
 	Short: "create a new redundancy class",
 	PreRun: func(cmd *cobra.Command, args []string) {
 
-		cmd.MarkFlagsRequiredTogether("name", "inner-k", "inner-n", "outer-k", "outer-n", "anti-affinity-group", "nexuses")
+		cmd.MarkFlagRequired("swarm-id")
+		cmd.MarkFlagRequired("nexuses")
+		cmd.MarkFlagRequired("name")
+		cmd.MarkFlagRequired("outer-n")
+		cmd.MarkFlagRequired("outer-k")
+		cmd.MarkFlagRequired("anti-affinity-group")
+		cmd.MarkFlagRequired("inner-n")
+		cmd.MarkFlagRequired("inner-k")
 
 		outerK, _ := cmd.Flags().GetInt("outer-k")
 		outerN, _ := cmd.Flags().GetInt("outer-n")
 		nexuses, _ := cmd.Flags().GetStringSlice("nexuses")
-		if len(nexuses) == 0 || len(nexuses) != outerK+outerN {
+		if len(nexuses) > 0 && len(nexuses) != outerK+outerN {
 			fmt.Println("Error: invalid number of nexuses provided, expected outer-k + outer-n nexuses")
 			cmd.Usage()
 			os.Exit(1)
@@ -43,6 +50,7 @@ var DescribeRedundancyClassesSubCmd = &cobra.Command{
 	Short: "describe a redundancy class",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("rc-id")
+		cmd.MarkFlagRequired("swarm-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.DescribeRedundancyClass(cmd, args); err != nil {
@@ -55,6 +63,7 @@ var listRedundancyClassesSubCmd = &cobra.Command{
 	Use:   "list",
 	Short: "list redundancy classes",
 	PreRun: func(cmd *cobra.Command, args []string) {
+		cmd.MarkFlagRequired("swarm-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.ListRedundancyClasses(cmd, args); err != nil {
@@ -68,6 +77,7 @@ var CheckRedundancyClassStatusSubCmd = &cobra.Command{
 	Short: "check redundancy class status",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("rc-id")
+		cmd.MarkFlagRequired("swarm-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.CheckRedundancyClassStatus(cmd, args); err != nil {
@@ -81,6 +91,7 @@ var ExpandRedundancyClassSubCmd = &cobra.Command{
 	Short: "expand a redundancy class",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("rc-id")
+		cmd.MarkFlagRequired("swarm-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.ExpandRedundancyClass(cmd, args); err != nil {
@@ -116,5 +127,4 @@ func init() {
 
 	rootCmd.AddCommand(redundancyClassCmd)
 	redundancyClassCmd.PersistentFlags().String("swarm-id", "", "ID of the swarm")
-	redundancyClassCmd.MarkPersistentFlagRequired("swarm-id")
 }
diff --git a/src/cmd/redundancy_class_recovery.go b/src/cmd/redundancy_class_recovery.go
index 400f2b9..100428e 100644
--- a/src/cmd/redundancy_class_recovery.go
+++ b/src/cmd/redundancy_class_recovery.go
@@ -16,6 +16,8 @@ var RecoverRedundancyClassSubCmd = &cobra.Command{
 	Use:   "start",
 	Short: "start redundancy class recovery",
 	PreRun: func(cmd *cobra.Command, args []string) {
+		cmd.MarkFlagRequired("rc-id")
+		cmd.MarkFlagRequired("swarm-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.RecoverRedundancyClass(cmd, args); err != nil {
@@ -28,6 +30,8 @@ var CheckRedundancyClassRecoveryStatusSubCmd = &cobra.Command{
 	Use:   "status",
 	Short: "check redundancy class recovery status",
 	PreRun: func(cmd *cobra.Command, args []string) {
+		cmd.MarkFlagRequired("rc-id")
+		cmd.MarkFlagRequired("swarm-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.CheckRedundancyClassRecoveryStatus(cmd, args); err != nil {
@@ -44,5 +48,4 @@ func init() {
 
 	redundancyClassCmd.AddCommand(redundancyClassRecoveryCmd)
 	redundancyClassRecoveryCmd.PersistentFlags().String("rc-id", "", "ID of the redundancy class")
-	redundancyClassRecoveryCmd.MarkPersistentFlagRequired("rc-id")
 }
diff --git a/src/cmd/root.go b/src/cmd/root.go
index a27565e..54d016a 100644
--- a/src/cmd/root.go
+++ b/src/cmd/root.go
@@ -71,7 +71,6 @@ func Execute(packageJSON []byte) {
 
 func init() {
 	// Persistent flags (available to all subcommands)
-	rootCmd.PersistentFlags().BoolVarP(&interactive, "interactive", "i", false, "Run in interactive mode")
 	rootCmd.PersistentFlags().String("profile", "", "Profile Configuration")
 	rootCmd.PersistentFlags().String("output", "human", "Output format: human (default), json, yaml, xml")
 	rootCmd.PersistentFlags().Bool("no-headers", false, "Suppress table headers in human output (for easier scripting)")
diff --git a/src/cmd/swarm.go b/src/cmd/swarm.go
index 561a624..2ab7b0f 100644
--- a/src/cmd/swarm.go
+++ b/src/cmd/swarm.go
@@ -2,9 +2,6 @@
 package cmd
 
 import (
-	"fmt"
-	"os"
-
 	"github.com/cubbit/composer-cli/src/action"
 	"github.com/cubbit/composer-cli/utils"
 	"github.com/spf13/cobra"
@@ -47,15 +44,7 @@ var editSwarmSubCmd = &cobra.Command{
 	Short: "edit a swarm",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("swarm-id")
-
-		swarmName, _ := cmd.Flags().GetString("name")
-		swarmDescription, _ := cmd.Flags().GetString("description")
-
-		if swarmName == "" && swarmDescription == "" {
-			fmt.Println("Error: at least one of the two required flags --name or --description should be provided.")
-			cmd.Usage()
-			os.Exit(1)
-		}
+		cmd.MarkFlagsOneRequired("name", "description")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.EditSwarm(cmd, args...); err != nil {
diff --git a/src/cmd/tenant.go b/src/cmd/tenant.go
index db3e265..676c333 100644
--- a/src/cmd/tenant.go
+++ b/src/cmd/tenant.go
@@ -34,30 +34,27 @@ var listTenantSubCmd = &cobra.Command{
 	Use:     "list",
 	Short:   "list tenants",
 	Aliases: []string{"ls"},
-	PreRun: func(cmd *cobra.Command, args []string) {
+	RunE: func(cmd *cobra.Command, args []string) error {
 		allowedSortingKeys := []string{"id", "name", "owner_id", "coupon_id", "created_at", "deleted_at"}
 		sort, _ := cmd.Flags().GetString("sort")
-
 		if sort != "" && !utils.Contains(allowedSortingKeys, sort) {
 			fmt.Println("Error: invalid sort key provided, allowed keys are: id, name, owner_id, coupon_id, created_at, deleted_at")
-			cmd.Usage()
-			os.Exit(1)
+			return fmt.Errorf("invalid sort key: %s", sort)
 		}
 
 		filter, _ := cmd.Flags().GetString("filter")
 		if filter != "" {
 			if !utils.IsValidFilter(filter) {
 				fmt.Println("Error: invalid filter provided, allowed format is: key:value key:value ...")
-				cmd.Usage()
-				os.Exit(1)
+				return fmt.Errorf("invalid filter: %s", filter)
 			}
 		}
 
-	},
-	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.ListTenant(cmd, args); err != nil {
 			utils.PrintError(err)
+			return err
 		}
+		return nil
 	},
 }
 
@@ -67,7 +64,6 @@ var removeTenantSubCmd = &cobra.Command{
 	Aliases: []string{"rm"},
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("tenant-id")
-
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.RemoveTenant(cmd, args); err != nil {
@@ -162,10 +158,13 @@ var configureTenantDNSSubCmd = &cobra.Command{
 	Short: "configures DNS for a tenant",
 	Long:  "This command prints the value of the TXT record that needs to be added with the name '_acme-challenge'",
 	PreRun: func(cmd *cobra.Command, args []string) {
-		cmd.MarkFlagRequired("tenant-id")
-		cmd.MarkFlagRequired("domain")
+		cmd.MarkFlagsOneRequired("interactive", "tenant-id")
+		cmd.MarkFlagsRequiredTogether("tenant-id", "domain")
+		cmd.MarkFlagsMutuallyExclusive("interactive", "domain")
+		cmd.MarkFlagsMutuallyExclusive("interactive", "tenant-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
+		interactive, _ := cmd.Flags().GetBool("interactive")
 		if !interactive {
 			if err := action.ConfigureTenantDNS(cmd, args); err != nil {
 				utils.PrintError(err)
@@ -182,9 +181,11 @@ var verifyTenantDNSSubCmd = &cobra.Command{
 	Use:   "verify-dns",
 	Short: "verifies DNS for a tenant",
 	PreRun: func(cmd *cobra.Command, args []string) {
-		cmd.MarkFlagRequired("tenant-id")
+		cmd.MarkFlagsOneRequired("interactive", "tenant-id")
+		cmd.MarkFlagsMutuallyExclusive("interactive", "tenant-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
+		interactive, _ := cmd.Flags().GetBool("interactive")
 		if !interactive {
 			if err := action.VerifyTenantDNS(cmd, args); err != nil {
 				utils.PrintError(err)
@@ -234,9 +235,11 @@ func init() {
 	configureTenantDNSSubCmd.Flags().String("tenant-id", "", "ID of the tenant")
 	configureTenantDNSSubCmd.Flags().String("domain", "", "Domain to configure for the tenant")
 	configureTenantDNSSubCmd.Flags().Bool("force", false, "Force the configuration of DNS even if it already exists")
+	configureTenantDNSSubCmd.Flags().BoolP("interactive", "i", false, "Run in interactive mode")
 
 	tenantCmd.AddCommand(verifyTenantDNSSubCmd)
 	verifyTenantDNSSubCmd.Flags().String("tenant-id", "", "ID of the tenant")
+	verifyTenantDNSSubCmd.Flags().BoolP("interactive", "i", false, "Run in interactive mode")
 
 	rootCmd.AddCommand(tenantCmd)
 }
diff --git a/src/cmd/user.go b/src/cmd/user.go
index ef6db13..2ade0c3 100644
--- a/src/cmd/user.go
+++ b/src/cmd/user.go
@@ -20,6 +20,7 @@ var createTenantUsersSubCmd = &cobra.Command{
 	Short: "creates users in a tenant",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("emails")
+		cmd.MarkFlagRequired("tenant-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.CreateTenantAccounts(cmd, args); err != nil {
@@ -33,6 +34,7 @@ var describeTenantUserSubCmd = &cobra.Command{
 	Short: "describes tenant users",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("user-id")
+		cmd.MarkFlagRequired("tenant-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.DescribeTenantAccount(cmd, args); err != nil {
@@ -46,6 +48,7 @@ var updateTenantUserSubCmd = &cobra.Command{
 	Short: "updates a user in a tenant",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("user-id")
+		cmd.MarkFlagRequired("tenant-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.UpdateTenantAccount(cmd, args); err != nil {
@@ -59,6 +62,7 @@ var removeTenantUserSubCmd = &cobra.Command{
 	Short: "removes a tenant user",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("user-id")
+		cmd.MarkFlagRequired("tenant-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.RemoveTenantAccount(cmd, args); err != nil {
@@ -73,6 +77,7 @@ var restoreTenantUserSubCmd = &cobra.Command{
 	Aliases: []string{"rm"},
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("user-id")
+		cmd.MarkFlagRequired("tenant-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.RestoreTenantAccount(cmd, args); err != nil {
@@ -86,6 +91,7 @@ var banTenantUserSubCmd = &cobra.Command{
 	Short: "freezes a tenant user",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("user-id")
+		cmd.MarkFlagRequired("tenant-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.BanTenantAccount(cmd, args); err != nil {
@@ -100,6 +106,7 @@ var unbanTenantUserSubCmd = &cobra.Command{
 	Aliases: []string{"rm"},
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("user-id")
+		cmd.MarkFlagRequired("tenant-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.UnbanTenantAccount(cmd, args); err != nil {
@@ -114,6 +121,7 @@ var deleteTenantUserSessionsSubCmd = &cobra.Command{
 	Aliases: []string{"rm"},
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmd.MarkFlagRequired("user-id")
+		cmd.MarkFlagRequired("tenant-id")
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := action.DeleteTenantAccountSessions(cmd, args); err != nil {
@@ -126,6 +134,7 @@ var listTenantUsersSubCmd = &cobra.Command{
 	Use:   "list",
 	Short: "lists tenant users",
 	PreRun: func(cmd *cobra.Command, args []string) {
+		cmd.MarkFlagRequired("tenant-id")
 		allowedSortingKeys := []string{"id", "first_name", "last_name", "max_allowed_projects", "created_at", "deleted_at", "tenant_id"}
 		sort, _ := cmd.Flags().GetString("sort")
 
@@ -178,6 +187,5 @@ func init() {
 
 	tenantCmd.AddCommand(userCmd)
 	userCmd.PersistentFlags().String("tenant-id", "", "ID of the tenant")
-	userCmd.MarkPersistentFlagRequired("tenant-id")
 
 }