diff --git a/.circleci/config.yml b/.circleci/config.yml
index 867044a5..a7023529 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -199,7 +199,7 @@ jobs:
       - run:
           name: Publish charts
           command: |
-            if echo "${CIRCLE_TAG}" | grep -Eq "[0-9]+(\.[0-9]+)*(-[a-z]+)?$"; then
+            if echo "${CIRCLE_TAG}" | grep v; then
               REPOSITORY="https://weaveworksbot:${GITHUB_TOKEN}@github.com/weaveworks/flagger.git"
               git config user.email weaveworksbot@users.noreply.github.com
               git config user.name weaveworksbot
diff --git a/Makefile b/Makefile
index 9e2dddf3..02edad79 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,9 @@ test-fmt:
 	gofmt -l -s ./ | grep ".*\.go"; if [ "$$?" = "0" ]; then exit 1; fi
 	goimports -l ./ | grep ".*\.go"; if [ "$$?" = "0" ]; then exit 1; fi
 
+codegen:
+	./hack/update-codegen.sh
+
 test-codegen:
 	./hack/verify-codegen.sh
 
@@ -42,16 +45,16 @@ version-set:
 	echo "Version $$next set in code, deployment, chart and kustomize"
 
 release:
-	git tag $(VERSION)
-	git push origin $(VERSION)
+	git tag "v$(VERSION)"
+	git push origin "v$(VERSION)"
 
 release-notes:
 	cd /tmp && GH_REL_URL="https://github.com/buchanae/github-release-notes/releases/download/0.2.0/github-release-notes-linux-amd64-0.2.0.tar.gz" && \
     curl -sSL $${GH_REL_URL} | tar xz && sudo mv github-release-notes /usr/local/bin/
 
 loadtester-build:
-	GO111MODULE=on CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o ./bin/loadtester ./cmd/loadtester/*
+	CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o ./bin/loadtester ./cmd/loadtester/*
+	docker build -t weaveworks/flagger-loadtester:$(LT_VERSION) . -f Dockerfile.loadtester
 
 loadtester-push:
-	docker build -t weaveworks/flagger-loadtester:$(LT_VERSION) . -f Dockerfile.loadtester
 	docker push weaveworks/flagger-loadtester:$(LT_VERSION)
diff --git a/test/container-push.sh b/test/container-push.sh
index bf2a7fe1..66dec947 100755
--- a/test/container-push.sh
+++ b/test/container-push.sh
@@ -2,7 +2,6 @@
 
 set -o errexit
 
-
 push () {
     echo $DOCKER_PASS | docker login -u=$DOCKER_USER --password-stdin
 
@@ -11,8 +10,9 @@ push () {
         docker tag test/flagger:latest weaveworks/flagger:${BRANCH_COMMIT};
         docker push weaveworks/flagger:${BRANCH_COMMIT};
     else
-        docker tag test/flagger:latest weaveworks/flagger:${CIRCLE_TAG};
-        docker push weaveworks/flagger:${CIRCLE_TAG};
+        VER=${CIRCLE_TAG:1}
+        docker tag test/flagger:latest weaveworks/flagger:${VER};
+        docker push weaveworks/flagger:${VER};
     fi
 }
 
@@ -21,4 +21,3 @@ if [[ -z "$DOCKER_PASS" ]]; then
 else
     push
 fi
-