diff --git a/cloud/apigw/BUILD.bazel b/cloud/apigw/BUILD.bazel
index c0488f1..ee3b409 100644
--- a/cloud/apigw/BUILD.bazel
+++ b/cloud/apigw/BUILD.bazel
@@ -7,7 +7,10 @@
     srcs = ["main.go"],
     importpath = "source.monogon.dev/cloud/apigw",
     visibility = ["//visibility:private"],
-    deps = ["//cloud/apigw/server"],
+    deps = [
+        "//cloud/apigw/server",
+        "@io_k8s_klog_v2//:klog",
+    ],
 )
 
 go_binary(
diff --git a/cloud/apigw/main.go b/cloud/apigw/main.go
index d560c0c..9c0ebff 100644
--- a/cloud/apigw/main.go
+++ b/cloud/apigw/main.go
@@ -4,6 +4,8 @@
 	"context"
 	"flag"
 
+	"k8s.io/klog/v2"
+
 	"source.monogon.dev/cloud/apigw/server"
 )
 
@@ -11,6 +13,9 @@
 	s := &server.Server{}
 	s.Config.RegisterFlags()
 	flag.Parse()
+	if flag.NArg() > 0 {
+		klog.Exitf("unexpected positional arguments: %v", flag.Args())
+	}
 
 	ctx, ctxC := context.WithCancel(context.Background())
 	// TODO: context cancel on interrupt.
diff --git a/cloud/bmaas/server/cmd/BUILD.bazel b/cloud/bmaas/server/cmd/BUILD.bazel
index 3988426..50184b9 100644
--- a/cloud/bmaas/server/cmd/BUILD.bazel
+++ b/cloud/bmaas/server/cmd/BUILD.bazel
@@ -10,6 +10,7 @@
     deps = [
         "//cloud/bmaas/server",
         "//metropolis/cli/pkg/context",
+        "@io_k8s_klog_v2//:klog",
     ],
 )
 
diff --git a/cloud/bmaas/server/cmd/main.go b/cloud/bmaas/server/cmd/main.go
index 2d04841..dd99205 100644
--- a/cloud/bmaas/server/cmd/main.go
+++ b/cloud/bmaas/server/cmd/main.go
@@ -4,6 +4,8 @@
 	"context"
 	"flag"
 
+	"k8s.io/klog/v2"
+
 	"source.monogon.dev/cloud/bmaas/server"
 	clicontext "source.monogon.dev/metropolis/cli/pkg/context"
 )
@@ -12,6 +14,9 @@
 	s := &server.Server{}
 	s.Config.RegisterFlags()
 	flag.Parse()
+	if flag.NArg() > 0 {
+		klog.Exitf("unexpected positional arguments: %v", flag.Args())
+	}
 
 	ctx := clicontext.WithInterrupt(context.Background())
 	s.Start(ctx)
diff --git a/cloud/shepherd/equinix/manager/server/BUILD.bazel b/cloud/shepherd/equinix/manager/server/BUILD.bazel
index 173a294..55172bd 100644
--- a/cloud/shepherd/equinix/manager/server/BUILD.bazel
+++ b/cloud/shepherd/equinix/manager/server/BUILD.bazel
@@ -14,7 +14,7 @@
         "//cloud/shepherd/equinix/manager",
         "//cloud/shepherd/equinix/wrapngo",
         "//metropolis/cli/pkg/context",
-        "@io_k8s_klog//:klog",
+        "@io_k8s_klog_v2//:klog",
     ],
 )
 
diff --git a/cloud/shepherd/equinix/manager/server/main.go b/cloud/shepherd/equinix/manager/server/main.go
index 984d96f..38735db 100644
--- a/cloud/shepherd/equinix/manager/server/main.go
+++ b/cloud/shepherd/equinix/manager/server/main.go
@@ -7,7 +7,7 @@
 	"os"
 	"strings"
 
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"source.monogon.dev/cloud/bmaas/bmdb"
 	"source.monogon.dev/cloud/bmaas/bmdb/webug"
@@ -58,6 +58,9 @@
 	c := &Config{}
 	c.RegisterFlags()
 	flag.Parse()
+	if flag.NArg() > 0 {
+		klog.Exitf("unexpected positional arguments: %v", flag.Args())
+	}
 
 	registry := c.Component.PrometheusRegistry()
 	c.BMDB.EnableMetrics(registry)