diff --git a/packages/controller/controller.ts b/packages/controller/controller.ts
index 44d92502..9787bab6 100644
--- a/packages/controller/controller.ts
+++ b/packages/controller/controller.ts
@@ -268,7 +268,7 @@ interface InitializeParameters {
 
 async function initialize(): Promise<InitializeParameters> {
 	// argument parsing
-	const args = await yargs
+	const args = await yargs(process.argv.slice(2))
 		.scriptName("controller")
 		.usage("$0 <command> [options]")
 		.option("log-level", {
@@ -340,7 +340,7 @@ async function initialize(): Promise<InitializeParameters> {
 		})
 		.demandCommand(1, "You need to specify a command to run")
 		.strict()
-		.argv
+		.parse()
 	;
 
 	// Combined log stream of the whole cluster.
diff --git a/packages/create/create.js b/packages/create/create.js
index 3d0557af..1fc26b6f 100755
--- a/packages/create/create.js
+++ b/packages/create/create.js
@@ -750,7 +750,7 @@ async function inquirerMissingArgs(args) {
 }
 
 async function main() {
-	let args = yargs
+	let yarg = yargs(process.argv.slice(2))
 		.option("log-level", {
 			nargs: 1, describe: "Log level to print to stdout", default: "info",
 			choices: ["none"].concat(Object.keys(levels)), type: "string",
@@ -805,14 +805,14 @@ async function main() {
 	;
 
 	if (process.platform === "linux") {
-		args = args
+		yarg = yarg
 			.option("allow-install-as-root", {
 				nargs: 0, describe: "(Linux only) Allow installing as root (not recommended)", type: "boolean",
 			})
 		;
 	}
 
-	args = args.argv;
+	const args = yarg.parse();
 
 	setLogLevel(args.logLevel === "none" ? -1 : levels[args.logLevel]);
 	dev = args.dev;
diff --git a/packages/host/host.ts b/packages/host/host.ts
index a2b882fb..91aeace5 100755
--- a/packages/host/host.ts
+++ b/packages/host/host.ts
@@ -82,7 +82,7 @@ export class HostConnector extends lib.WebSocketClientConnector {
 async function startHost() {
 	// argument parsing
 	// eslint-disable-next-line node/no-sync
-	const args = yargs
+	const args = yargs(process.argv.slice(2))
 		.scriptName("host")
 		.usage("$0 <command> [options]")
 		.option("log-level", {
diff --git a/packages/lib/build_mod.js b/packages/lib/build_mod.js
index 1406eeda..d89c5dfb 100644
--- a/packages/lib/build_mod.js
+++ b/packages/lib/build_mod.js
@@ -121,7 +121,7 @@ async function build(args) {
 
 
 async function main() {
-	const args = yargs
+	const args = yargs(process.argv.slice(2))
 		.scriptName("build")
 		.options({
 			"clean": { describe: "Remove previous builds", type: "boolean", default: false },
@@ -144,7 +144,7 @@ async function main() {
 			},
 		})
 		.strict()
-		.argv
+		.parse()
 	;
 
 	await build(args);