diff --git a/prog/weaveexec/Dockerfile.template b/prog/weaveexec/Dockerfile.template
index 09d76848..6e6b0c99 100644
--- a/prog/weaveexec/Dockerfile.template
+++ b/prog/weaveexec/Dockerfile.template
@@ -12,7 +12,6 @@ LABEL works.weave.role=system \
       org.label-schema.vcs-url="https://github.com/weaveworks/weave" \
       org.label-schema.vendor="Weaveworks"
 
-WORKDIR /home/weave
 ENTRYPOINT ["/home/weave/sigproxy", "/home/weave/weave"]
 
 RUN apk add --update \
@@ -32,3 +31,4 @@ ADD ./weavewait /w/w
 ADD ./weavewait_noop /w-noop/w
 ADD ./weavewait_nomcast /w-nomcast/w
 ADD ./docker /usr/bin/
+WORKDIR /home/weave
diff --git a/prog/weaver/Dockerfile.template b/prog/weaver/Dockerfile.template
index 8d60a095..78b95c36 100644
--- a/prog/weaver/Dockerfile.template
+++ b/prog/weaver/Dockerfile.template
@@ -1,5 +1,4 @@
 FROM DOCKERHUB_USER/weaveexecARCH_EXT
-WORKDIR /home/weave
 ADD ./weaver /home/weave/
 ADD weavedata.db /weavedb/
 COPY ca-certificates.crt /etc/ssl/certs/