diff --git a/proxy/common.go b/proxy/common.go
index 1198ef1b..86e44a87 100644
--- a/proxy/common.go
+++ b/proxy/common.go
@@ -16,7 +16,7 @@ import (
 
 var (
 	containerIDRegexp   = regexp.MustCompile("^/v[0-9\\.]*/containers/([^/]*)/.*")
-	weaveWaitEntrypoint = []string{"/home/weavewait/weavewait"}
+	weaveWaitEntrypoint = []string{"/w/w"}
 )
 
 func callWeave(args ...string) ([]byte, error) {
diff --git a/weaveexec/Dockerfile b/weaveexec/Dockerfile
index 65b0f47a..8d8c3eff 100644
--- a/weaveexec/Dockerfile
+++ b/weaveexec/Dockerfile
@@ -16,9 +16,9 @@ WORKDIR /home/weave
 ADD ./weave /home/weave/
 ADD ./sigproxy /home/weave/
 ADD ./weaveproxy /home/weave/
-ADD ./weavewait /home/weavewait/weavewait
+ADD ./weavewait /w/w
 ADD ./docker.tgz /
 
-VOLUME /home/weavewait
+VOLUME /w
 
 ENTRYPOINT ["/home/weave/sigproxy", "/home/weave/weave"]