diff --git a/Makefile b/Makefile
index 6d91237b87..71320a6ae6 100644
--- a/Makefile
+++ b/Makefile
@@ -84,6 +84,7 @@ $(WEAVEWAIT_EXE) $(SIGPROXY_EXE) $(COVER_EXE) $(RUNNER_EXE):
 
 $(WEAVER_UPTODATE): prog/weaver/Dockerfile $(WEAVER_EXE)
 	$(SUDO) docker build -t $(WEAVER_IMAGE) prog/weaver
+	$(SUDO) docker tag -f $(WEAVER_IMAGE) $(WEAVER_IMAGE):$(WEAVE_VERSION)
 	touch $@
 
 $(WEAVEEXEC_UPTODATE): prog/weaveexec/Dockerfile $(DOCKER_DISTRIB) weave $(SIGPROXY_EXE) $(WEAVEPROXY_EXE) $(WEAVEWAIT_EXE) $(NETCHECK_EXE)
@@ -94,6 +95,7 @@ $(WEAVEEXEC_UPTODATE): prog/weaveexec/Dockerfile $(DOCKER_DISTRIB) weave $(SIGPR
 	cp $(NETCHECK_EXE) prog/weaveexec/netcheck
 	cp $(DOCKER_DISTRIB) prog/weaveexec/docker.tgz
 	$(SUDO) docker build -t $(WEAVEEXEC_IMAGE) prog/weaveexec
+	$(SUDO) docker tag -f $(WEAVEEXEC_IMAGE) $(WEAVEEXEC_IMAGE):$(WEAVE_VERSION)
 	touch $@
 
 $(WEAVE_EXPORT): $(IMAGES_UPTODATE)
@@ -106,7 +108,6 @@ tests: $(COVER_EXE)
 	@test/units.sh
 
 $(PUBLISH): publish_%:
-	$(SUDO) docker tag -f $(DOCKERHUB_USER)/$* $(DOCKERHUB_USER)/$*:$(WEAVE_VERSION)
 	$(SUDO) docker push   $(DOCKERHUB_USER)/$*:$(WEAVE_VERSION)
 	$(SUDO) docker push   $(DOCKERHUB_USER)/$*:latest
 
diff --git a/circle.yml b/circle.yml
index 553ebb1ed6..893129a045 100644
--- a/circle.yml
+++ b/circle.yml
@@ -66,5 +66,4 @@ deployment:
     owner: weaveworks
     commands:
       - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
-      - docker push weaveworks/weave
-      - docker push weaveworks/weaveexec
+      - make publish