diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 69c4738e6..a6e50cd90 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -33,10 +33,10 @@ while true; do
             APP_ARGS="$APP_ARGS -log.level=debug"
             PROBE_ARGS="$PROBE_ARGS -log.level=debug"
             ;;
-        --no-app|--app-only)
+        --no-app|--probe-only)
             touch /etc/service/app/down
             ;;
-        --no-probe|--probe-only)
+        --no-probe|--app-only)
             touch /etc/service/probe/down
             ;;
         --weave.hostname*)
diff --git a/prog/probe.go b/prog/probe.go
index be2ccef7a..27d4be384 100644
--- a/prog/probe.go
+++ b/prog/probe.go
@@ -81,8 +81,8 @@ func probeMain() {
 		kubernetesAPI      = flag.String("kubernetes.api", "", "Address of kubernetes master api")
 		kubernetesInterval = flag.Duration("kubernetes.interval", 10*time.Second, "how often to do a full resync of the kubernetes data")
 
-		weaveRouterAddr = flag.String("weave.router.addr", "127.0.0.1:6784", "IP address & port of the Weave router")
-		weaveDNSTarget  = flag.String("weave.hostname", fmt.Sprintf("scope.weave.local:%d", xfer.AppPort), "Hostname to lookup in weaveDNS")
+		weaveAddr      = flag.String("weave.addr", "127.0.0.1:6784", "IP address & port of the Weave router")
+		weaveDNSTarget = flag.String("weave.hostname", fmt.Sprintf("scope.weave.local:%d", xfer.AppPort), "Hostname to lookup in weaveDNS")
 	)
 	flag.Parse()
 
@@ -169,8 +169,8 @@ func probeMain() {
 		}
 	}
 
-	if *weaveRouterAddr != "" {
-		client := weave.NewClient(sanitize.URL("http://", 6784, "")(*weaveRouterAddr))
+	if *weaveAddr != "" {
+		client := weave.NewClient(sanitize.URL("http://", 6784, "")(*weaveAddr))
 		weave := overlay.NewWeave(hostID, client)
 		defer weave.Stop()
 		p.AddTagger(weave)