diff --git a/.goreleaser.yml b/.goreleaser.yml
index 55b5c3aff..3673e11d3 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -9,16 +9,13 @@ builds:
       - CGO_ENABLED=0
     ldflags: >
       -X github.com/ohsu-comp-bio/funnel/version.BuildDate={{.Date}}
-      -X github.com/ohsu-comp-bio/funnel/version.GitCommit={{.Commit}}
+      -X github.com/ohsu-comp-bio/funnel/version.GitCommit={{.ShortCommit}}
       -X github.com/ohsu-comp-bio/funnel/version.GitBranch={{.Env.GIT_BRANCH}}
       -X github.com/ohsu-comp-bio/funnel/version.GitUpstream={{.Env.GIT_UPSTREAM}}
       -X github.com/ohsu-comp-bio/funnel/version.Version={{.Version}}
 
 dist: build/release
 
-git:
-  short_hash: true
-
 release:
   draft: true
 
@@ -29,10 +26,9 @@ archive:
   name_template: "{{.ProjectName}}-{{.Os}}-{{.Arch}}-{{.Version}}"
 
 dockers:
-  - image: ohsucompbio/funnel
+  - image_templates: 
+      - "ohsucompbio/funnel:{{.Version}}"
     dockerfile: ./docker/Dockerfile
-    tag_templates:
-      - "{{ .Version }}"
 
 brew:
   github:
diff --git a/Makefile b/Makefile
index 6749abdbc..e834e28d6 100644
--- a/Makefile
+++ b/Makefile
@@ -11,11 +11,11 @@ git_upstream := $(shell git remote get-url $(shell git config branch.$(shell git
 export GIT_BRANCH = $(git_branch)
 export GIT_UPSTREAM = $(git_upstream)
 
-export FUNNEL_VERSION=0.8.0
+export FUNNEL_VERSION=0.9.0
 
 # LAST_PR_NUMBER is used by the release notes builder to generate notes
 # based on pull requests (PR) up until the last release.
-export LAST_PR_NUMBER = 546
+export LAST_PR_NUMBER = 591
 
 VERSION_LDFLAGS=\
  -X "github.com/ohsu-comp-bio/funnel/version.BuildDate=$(shell date)" \