diff --git a/cli/commands.go b/cli/commands.go
index a7b505cd..8533475d 100644
--- a/cli/commands.go
+++ b/cli/commands.go
@@ -161,10 +161,6 @@ func CreateCluster(c *cli.Context) error {
 		return err
 	}
 
-	if c.IsSet("timeout") {
-		log.Println("[Warning] The --timeout flag is deprecated. use '--wait <timeout>' instead")
-	}
-
 	// Wait for k3s to be up and running if wanted.
 	// We're simply scanning the container logs for a line that tells us that everything's up and running
 	// TODO: also wait for worker nodes
diff --git a/main.go b/main.go
index e706c2c7..1f94ee60 100644
--- a/main.go
+++ b/main.go
@@ -103,12 +103,7 @@ func main() {
 					Usage: "Specify the Kubernetes cluster API server port (Format: `[host:]port` (Note: --port/-p will be used for arbitrary port mapping as of v2.0.0, use --api-port/-a instead for setting the api port)",
 				},
 				cli.IntFlag{
-					Name:  "timeout, t",
-					Value: 0,
-					Usage: "Set the timeout value when --wait flag is set (deprecated, use --wait <timeout> instead)",
-				},
-				cli.IntFlag{
-					Name:  "wait, w",
+					Name:  "wait, t",
 					Value: 0, // timeout
 					Usage: "Wait for the cluster to come up before returning until timoout (in seconds). Use --wait 0 to wait forever",
 				},
@@ -126,7 +121,7 @@ func main() {
 					Usage: "Pass an additional environment variable (new flag per variable)",
 				},
 				cli.IntFlag{
-					Name:  "workers",
+					Name:  "workers, w",
 					Value: 0,
 					Usage: "Specify how many worker nodes you want to spawn",
 				},