diff --git a/.gitignore b/.gitignore
index a1e77f671..f335a357d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # Build artifacts
 /sonobuoy
+build/
 
 # we output results to this directory by default
 /archive
diff --git a/.travis.yml b/.travis.yml
index ad3dafb5b..9d9bdf8a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,6 @@ services:
 
 install: true
 
-
 script: VERBOSE=true make test int
 
 before_install:
@@ -14,6 +13,8 @@ before_install:
 - if [ ! -d ${HOME}/google-cloud-sdk ]; then
     curl https://sdk.cloud.google.com | bash /dev/stdin --disable-prompts;
   fi
+# go get doesn't seem to work in deploy step, so fetch it here instead
+- go get -u github.com/estesp/manifest-tool
 
 deploy:
 - provider: script
diff --git a/Makefile b/Makefile
index 965c831bd..04f22c62b 100644
--- a/Makefile
+++ b/Makefile
@@ -28,8 +28,9 @@ LINUX_ARCH := amd64 arm64
 DOCKERFILE :=
 PLATFORMS := $(subst $(SPACE),$(COMMA),$(foreach arch,$(LINUX_ARCH),linux/$(arch)))
 
-GIT_VERSION ?= $(shell git describe --always --dirty)
-IMAGE_VERSION ?= $(shell git describe --always --dirty)
+# --tags allows detecting non-annotated tags as well as annotated ones
+GIT_VERSION ?= $(shell git describe --always --dirty --tags)
+IMAGE_VERSION ?= $(shell git describe --always --dirty --tags)
 IMAGE_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD | sed 's/\///g')
 GIT_REF = $(shell git rev-parse --short=8 --verify HEAD)
 
diff --git a/heptio-images-ee4b0474b93e.json.enc b/heptio-images-ee4b0474b93e.json.enc
index f65c02977..f05461fb2 100644
Binary files a/heptio-images-ee4b0474b93e.json.enc and b/heptio-images-ee4b0474b93e.json.enc differ
diff --git a/travis-deploy.sh b/travis-deploy.sh
index 12757021d..d136131e4 100755
--- a/travis-deploy.sh
+++ b/travis-deploy.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Don't fail silently when a step doesn't succeed
+set -e
 
 if [ -z "$TRAVIS" ]; then
     echo "this script is intended to be run only on travis" >&2