diff --git a/.goreleaser.yml b/.goreleaser.yml
index 0c0e26d8..3e9e61d0 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -14,7 +14,7 @@ builds:
 - main: ./nats-streaming-server.go
   binary: nats-streaming-server
   ldflags:
-    - -s -w -X github.com/nats-io/nats-streaming-server/server.gitCommit={{.ShortCommit}} -X github.com/nats-io/nats-streaming-server/vendor/github.com/nats-io/nats-server/v2/server.gitCommit=c8ca58e
+    - -s -w -X github.com/nats-io/nats-streaming-server/server.gitCommit={{.ShortCommit}} -X github.com/nats-io/nats-streaming-server/vendor/github.com/nats-io/nats-server/v2/server.gitCommit=fb009af
   env:
     - GO111MODULE=off
     - CGO_ENABLED=0
diff --git a/.travis.yml b/.travis.yml
index 3d4cdd9d..4a8fea98 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,4 +40,4 @@ deploy:
   verbose: true
   on:
     tags: true
-    condition: $TRAVIS_GO_VERSION =~ 1.12
+    condition: $TRAVIS_GO_VERSION =~ 1.13
diff --git a/Dockerfile b/Dockerfile
index 7c80729f..74cbb516 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.11.13
+FROM golang:1.13.7
 
 MAINTAINER Ivan Kozlovic <ivan@synadia.com>
 
@@ -8,7 +8,7 @@ WORKDIR /go/src/github.com/nats-io/nats-streaming-server
 # Set the NATS Server git commit based on the rev that
 # we actually vendor. This can be found in the
 # vendor/manifest file.
-ARG NATS_GIT_COMMIT='github.com/nats-io/nats-streaming-server/vendor/github.com/nats-io/nats-server/v2/server.gitCommit=c8ca58e'
+ARG NATS_GIT_COMMIT='github.com/nats-io/nats-streaming-server/vendor/github.com/nats-io/nats-server/v2/server.gitCommit=fb009af'
 
 RUN CGO_ENABLED=0 GO111MODULE=off GOOS=linux   GOARCH=amd64         go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/nats-streaming-server/server.gitCommit=`git rev-parse --short HEAD` -X ${NATS_GIT_COMMIT}" -o pkg/linux-amd64/nats-streaming-server
 RUN CGO_ENABLED=0 GO111MODULE=off GOOS=linux   GOARCH=arm   GOARM=6 go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/nats-streaming-server/server.gitCommit=`git rev-parse --short HEAD` -X ${NATS_GIT_COMMIT}" -o pkg/linux-arm6/nats-streaming-server
diff --git a/README.md b/README.md
index 0b953c3d..c1cde5c7 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,6 @@ under the Apache Version 2.0 license found in the LICENSE file.
 [Coverage-image]: https://coveralls.io/repos/github/nats-io/nats-streaming-server/badge.svg?branch=master&t=kIxrDE
 [ReportCard-Url]: http://goreportcard.com/report/nats-io/nats-streaming-server
 [ReportCard-Image]: http://goreportcard.com/badge/github.com/nats-io/nats-streaming-server
-[Release-Url]: https://github.com/nats-io/nats-streaming-server/releases/tag/v0.16.2
-[Release-image]: https://img.shields.io/badge/release-v0.16.2-1eb0fc.svg
+[Release-Url]: https://github.com/nats-io/nats-streaming-server/releases/tag/v0.17.0
+[Release-image]: https://img.shields.io/badge/release-v0.17.0-1eb0fc.svg
 [github-release]: https://github.com/nats-io/nats-streaming-server/releases/
diff --git a/server/server.go b/server/server.go
index e959430f..adabfb58 100644
--- a/server/server.go
+++ b/server/server.go
@@ -47,7 +47,7 @@ import (
 // Server defaults.
 const (
 	// VERSION is the current version for the NATS Streaming server.
-	VERSION = "0.16.2"
+	VERSION = "0.17.0"
 
 	DefaultClusterID      = "test-cluster"
 	DefaultDiscoverPrefix = "_STAN.discover"