diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5ac863b890861a98141a3b0b263e386c7f5b7be7..404baac960bd8f962b81727b29838549dc9b2fc5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -59,10 +59,10 @@ workflows:
   test_and_release:
     jobs:
       - checkout_code:
-          # Rather annoyingly we need this boilerplate on all transitive
+          # Rather annoyingly we need to include tags_filters on all transitive
           # dependencies if we want the deploy job to build against a version
           # tag.
-          # Also note jobs build against all branches by default
+          # In contract jobs build against all branches by default
           filters:
             <<: *tags_filters
       - test:
@@ -82,11 +82,10 @@ workflows:
             - test
             - test_integration
           filters:
+            # tags filters and branch filters are applied disjunctively, so we
+            # will still build tags not on develop (i.e. including tagged
+            # releases on master that we specifically want to build)
             <<: *tags_filters
             branches:
-              # Although we seem to exclude the master branch below, since
-              # matching on tags is independent we will still build tags that
-              # happen to point to a commit on master
-              # We push dev pre-release images for every commit on develop
               only: develop
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a78b5febf846c4d6823bc4a8b07e9784de5a677..59ce4188ec8e94f34d15eec5c5b8050a3ee7ea27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # burrow changelog
+## v0.17.1
+Minor tweaks to docker build file
+
 ## v0.17.0
 This is a service release with some significant ethereum/solidity compatibility improvements and new logging features. It includes:
 
diff --git a/Dockerfile b/Dockerfile
index 033acdbb92b2a466c2261bebbd89331cdbdd2c8e..f4850d4866559b8a47d15588e818ff24e85a6569 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ MAINTAINER Monax <support@monax.io>
 RUN apk add --no-cache --update git
 RUN go get github.com/Masterminds/glide
 
-ENV REPO $GOPATH/src/github.com/hyperledger/burrow
+ARG REPO=$GOPATH/src/github.com/hyperledger/burrow
 COPY . $REPO
 WORKDIR $REPO
 RUN glide install
@@ -17,13 +17,9 @@ RUN go build --ldflags '-extldflags "-static"' -o bin/burrow-client ./client/cmd
 # This will be our base container image
 FROM alpine:3.6
 
-# There does not appear to be a way to share environment variables between stages
-ENV REPO /go/src/github.com/hyperledger/burrow
-
 ENV USER monax
 ENV MONAX_PATH /home/$USER/.monax
 RUN addgroup -g 101 -S $USER && adduser -S -D -u 1000 $USER $USER
-VOLUME $MONAX_PATH
 WORKDIR $MONAX_PATH
 USER $USER:$USER