diff --git a/Makefile b/Makefile
index 91c07734..f1b73732 100644
--- a/Makefile
+++ b/Makefile
@@ -38,9 +38,7 @@ docker/Dockerfile.service: docker/Dockerfile.service.in Makefile
 	@sed -e 's/@@GIT_HASH@@/$(GIT_HASH)/g' < $< > $@.tmp && mv $@.tmp $@
 
 build/.%.done: docker/Dockerfile.%
-	mkdir -p ./build/docker/$*
-	cp -r $^ ./build/docker/$*/
-	${DOCKER} build --build-arg=revision=$(GIT_HASH) -t weaveworks/launcher-$* -t weaveworks/launcher-$*:$(IMAGE_TAG) -f build/docker/$*/Dockerfile.$* ./build/docker/$*
+	${DOCKER} build --build-arg=revision=$(GIT_HASH) -t weaveworks/launcher-$* -t weaveworks/launcher-$*:$(IMAGE_TAG) -f docker/Dockerfile.$* .
 	touch $@
 
 #
@@ -96,7 +94,7 @@ build/.bootstrap.done: bootstrap/*.go
 # Service
 #
 
-build/.service.done: build/service build/static
+build/.service.done: build/service service/static/* service/static/agent.yaml
 
 build/service: $(SERVICE_DEPS)
 build/service: service/*.go
@@ -113,11 +111,6 @@ service/static/agent.yaml: service/static/agent.yaml.in
 		sed -e 's|@@IMAGE_URL@@|weaveworks/build-tmp-public:launcher-agent-$(IMAGE_TAG)|g' < $< > $@.tmp && mv $@.tmp $@; \
 	fi
 
-build/static: service/static/* service/static/agent.yaml
-	mkdir -p $@
-	cp $^ $@
-
-
 #
 # Local integration tests
 #
diff --git a/docker/Dockerfile.agent b/docker/Dockerfile.agent
index bb876fbd..b04e3ce9 100644
--- a/docker/Dockerfile.agent
+++ b/docker/Dockerfile.agent
@@ -1,7 +1,7 @@
 FROM alpine:3.7
 RUN apk add --no-cache ca-certificates
-COPY ./agent /usr/bin/launcher-agent
-COPY ./kubectl /usr/bin/kubectl
+COPY ./build/agent /usr/bin/launcher-agent
+COPY ./build/kubectl /usr/bin/kubectl
 ENTRYPOINT ["/usr/bin/launcher-agent"]
 CMD ["-help"]
 
diff --git a/docker/Dockerfile.service.in b/docker/Dockerfile.service.in
index f32dbf93..2a11eb14 100644
--- a/docker/Dockerfile.service.in
+++ b/docker/Dockerfile.service.in
@@ -1,9 +1,9 @@
 FROM alpine:3.7
 WORKDIR /
-COPY service /launcher-service
+COPY build/service /launcher-service
 RUN mkdir static
-COPY static/install.sh /static/
-COPY static/agent.yaml /static/
+COPY service/static/install.sh /static/
+COPY service/static/agent.yaml /static/
 EXPOSE 80
 ENTRYPOINT ["/launcher-service", "--bootstrap-version=@@GIT_HASH@@"]