diff --git a/CHANGELOG.md b/CHANGELOG.md
index 507654b67e48318d89967f7d6a775bf824ba6e91..92392c182bb57a4bbe79deef7281a976837bcd93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@ All notable changes to this project are documented below.
 
 The format is based on [keep a changelog](http://keepachangelog.com) and this project uses [semantic versioning](http://semver.org).
 
+## [Unreleased]
+
+
 ## [2.1.0] - 2018-10-08
 ### Added
 - New Go code runtime for custom functions and authoritative match handlers.
diff --git a/build/README.md b/build/README.md
index 8c500115b8061aeeefe650f78a3545df1b61aed5..206744aea2fc2be0c12715d4f7b856abefae8f8c 100644
--- a/build/README.md
+++ b/build/README.md
@@ -39,7 +39,7 @@ These steps are run for each new release.
 3. Execute the cross-compiled build helper.
 
    ```
-   xgo --targets=darwin/amd64,linux/amd64,linux/arm64,windows/amd64 --ldflags "-s -w -X main.version=2.1.0 -X main.commitID=$(git rev-parse --short HEAD 2>/dev/null)" --branch v2.1.0 github.com/heroiclabs/nakama
+   xgo --targets=darwin/amd64,linux/amd64,linux/arm64,windows/amd64 --ldflags "-s -w -X main.version=2.1.0 -X main.commitID=$(git rev-parse --short HEAD 2>/dev/null)" github.com/heroiclabs/nakama
    ```
 
    This will build binaries for all target platforms supported officially by Heroic Labs.
@@ -60,13 +60,15 @@ With the release generated we can create the official container image.
 
    ```
    cd build
-   docker build "$PWD" --file ./Dockerfile --build-arg commit="$(git rev-parse --short HEAD 2>/dev/null)" --build-arg version=v2.1.0 -t heroiclabs/nakama:2.1.0
+   docker build "$PWD" --file ./Dockerfile --build-arg commit="$(git rev-parse --short HEAD 2>/dev/null)" --build-arg version=2.1.0 -t heroiclabs/nakama:2.1.0
    ```
 
 2. Push the image to the container registry.
 
    ```
+   docker tag <CONTAINERID> heroiclabs/nakama:latest
    docker push heroiclabs/nakama:2.1.0
+   docker push heroiclabs/nakama:latest
    ```
 
 ## Build Plugin Builder Image
@@ -77,11 +79,13 @@ With the official release image generated we can create a container image to hel
 
    ```
    cd build/pluginbuilder
-   docker build "$PWD" --file ./Dockerfile --build-arg commit="$(git rev-parse --short HEAD 2>/dev/null)" --build-arg version=v2.1.0 -t heroiclabs/nakama-pluginbuilder:2.1.0
+   docker build "$PWD" --file ./Dockerfile --build-arg commit="$(git rev-parse --short HEAD 2>/dev/null)" --build-arg version=2.1.0 -t heroiclabs/nakama-pluginbuilder:2.1.0
    ```
 
 2. Push the image to the container registry.
 
    ```
+   docker tag <CONTAINERID> heroiclabs/nakama-pluginbuilder:latest
    docker push heroiclabs/nakama-pluginbuilder:2.1.0
+   docker push heroiclabs/nakama-pluginbuilder:latest
    ```
diff --git a/build/pluginbuilder/Dockerfile b/build/pluginbuilder/Dockerfile
index dff260cd5f3e426d068d775da3a15bb793a65af9..e5052fc5c3a6bb1e930e743669c996b5b0b83fb3 100644
--- a/build/pluginbuilder/Dockerfile
+++ b/build/pluginbuilder/Dockerfile
@@ -31,8 +31,10 @@ ENV CGO_ENABLED 1
 
 RUN apk --no-cache add ca-certificates gcc musl-dev git && \
     git config --global advice.detachedHead false && \
-    git clone --quiet --no-checkout https://github.com/heroiclabs/nakama.git /go/src/github.com/heroiclabs/nakama && \
-    git checkout --quiet "$commit"
+    git clone --quiet --no-checkout https://github.com/heroiclabs/nakama.git /go/src/github.com/heroiclabs/nakama
+
+WORKDIR /go/src/github.com/heroiclabs/nakama
+RUN git checkout --quiet "$commit"
 
 WORKDIR /go/src/tempbuild/