diff --git a/components/cli/cli/command/orchestrator.go b/components/cli/cli/command/orchestrator.go
index 4efe623c29..d27bd6c1fa 100644
--- a/components/cli/cli/command/orchestrator.go
+++ b/components/cli/cli/command/orchestrator.go
@@ -21,9 +21,9 @@ const (
 
 func normalize(flag string) Orchestrator {
 	switch flag {
-	case "kubernetes", "k8s":
+	case "kubernetes":
 		return OrchestratorKubernetes
-	case "swarm", "swarmkit":
+	case "swarm":
 		return OrchestratorSwarm
 	default:
 		return orchestratorUnset